From 59959b51180c06840960157dca60077963293278 Mon Sep 17 00:00:00 2001
From: temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Thu, 10 Jul 2008 02:12:20 +0000
Subject: [PATCH 001/525] Initial checkin.


From dd24b8b9ae5f822409ff30c75a368234ebaedc29 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Mon, 18 Jan 2010 22:18:18 -0800
Subject: [PATCH 002/525] initial commit

---
 .gitignore                                    |   2 +
 README                                        |   0
 src/clj/protobuf.clj                          |  10 +
 .../protobuf/PersistentProtocolBufferMap.java | 267 ++++++++++++++++++
 4 files changed, 279 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 README
 create mode 100644 src/clj/protobuf.clj
 create mode 100644 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cb290e3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.class
+*.jar
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
new file mode 100644
index 0000000..f6a0042
--- /dev/null
+++ b/src/clj/protobuf.clj
@@ -0,0 +1,10 @@
+(ns protobuf)
+
+(defmacro defprotobuf [sym & args]
+  (let [class (symbol (apply str (interpose "$" (map name args))))]
+    `(def ~sym (. ~class  getDescriptor))))
+
+(defn protobuf [desc & args]
+  (if (= (count args) 1)
+    (clojure.protobuf.PersistentProtocolBufferMap/create desc (first args))
+    (clojure.protobuf.PersistentProtocolBufferMap/construct desc (apply hash-map args))))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
new file mode 100644
index 0000000..b91ffdd
--- /dev/null
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -0,0 +1,267 @@
+/**
+ *   Copyright (c) Justin Balthrop. All rights reserved.
+ *   The use and distribution terms for this software are covered by the
+ *   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+ *   which can be found in the file epl-v10.html at the root of this distribution.
+ *   By using this software in any fashion, you are agreeing to be bound by
+ * 	 the terms of this license.
+ *   You must not remove this notice, or any other, from this software.
+ **/
+
+/* Based on rhickey's clojure.lang.PersistentStructMap - Jan 17, 2010 */
+
+package clojure.protobuf;
+
+import clojure.lang.*;
+import java.util.*;
+import java.io.InputStream;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.Descriptors;
+
+public class PersistentProtocolBufferMap extends APersistentMap {
+  final Descriptors.Descriptor type;
+  final DynamicMessage         message;
+  final DynamicMessage.Builder builder;
+
+  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, byte[] bytes)
+    throws com.google.protobuf.InvalidProtocolBufferException
+  {
+    DynamicMessage message = DynamicMessage.parseFrom(type, bytes);
+    return new PersistentProtocolBufferMap(null, type, message, null);
+  }
+  
+  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, String string)
+    throws com.google.protobuf.InvalidProtocolBufferException
+  {
+    return create(type, string.getBytes());
+  }
+  
+  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, InputStream input)
+    throws com.google.protobuf.InvalidProtocolBufferException, java.io.IOException
+  {
+    DynamicMessage message = DynamicMessage.parseFrom(type, input);
+    return new PersistentProtocolBufferMap(null, type, message, null);
+  }
+  
+  static public PersistentProtocolBufferMap construct(Descriptors.Descriptor type, IPersistentMap keyvals){
+    DynamicMessage.Builder builder = DynamicMessage.newBuilder(type);
+    PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, type, null, builder);
+    return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
+  }
+  
+  protected PersistentProtocolBufferMap(IPersistentMap meta, Descriptors.Descriptor type,
+                                        DynamicMessage message, DynamicMessage.Builder builder) {
+    super(meta);
+    this.type    = type;
+    this.message = message;
+    this.builder = builder;
+  }
+  
+  protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Descriptors.Descriptor type,
+                                                DynamicMessage message, DynamicMessage.Builder builder) {
+    return new PersistentProtocolBufferMap(meta, type, message, builder);
+  }
+  
+  protected DynamicMessage message() {
+    if (message == null) {
+      return builder.build();
+    } else {
+      return message;
+    }
+  }
+  
+  protected DynamicMessage.Builder builder() {
+    if (builder == null) {
+      return message.toBuilder();
+    } else {
+      return builder.clone();
+    }
+  }
+  
+  protected Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
+    return type.findFieldByName(key.getName());
+  }
+  
+  protected Object fromFieldValue(Descriptors.FieldDescriptor.JavaType type, Object value) {
+    switch (type) {
+    case ENUM:
+      break;
+    case MESSAGE:
+      break;
+    default:
+      return value;
+    }
+    return null;
+  }
+  
+  protected Object toFieldValue(Descriptors.FieldDescriptor.JavaType type, Object value) {
+    switch (type) {
+    case LONG:
+      if (value instanceof Long) return value;
+      Integer i = (Integer) value;
+      return new Long(i.longValue());      
+    case INT:
+      return (Integer)value;
+    case ENUM:
+      break;
+    case MESSAGE:
+      break;
+    default:
+      return value;
+    }
+    return null;
+  }
+  
+  protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
+    if (field == null) return;
+
+    if (field.isRepeated()) {
+      builder.clearField(field);
+      for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+        Object value = toFieldValue(field.getJavaType(), s.first());
+        builder.addRepeatedField(field, value);
+      }
+    } else {
+      Object value = toFieldValue(field.getJavaType(), val);
+      builder.setField(field, value);
+    }
+  }
+  
+  public Obj withMeta(IPersistentMap meta) {
+    if (meta == meta()) return this;
+    return makeNew(meta, type, message, builder);
+  }
+  
+  public boolean containsKey(Object key) {
+    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    return message().hasField(field);
+  }
+  
+  public IMapEntry entryAt(Object key) {
+    Object value = valAt(key);
+    return (value == null) ? null : new MapEntry(key, value);
+  }
+  
+  public Object valAt(Object key) {
+    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    if (field == null) return null;
+    
+    DynamicMessage message = message();
+    
+    if (field.isRepeated()) {
+      int num_items = message.getRepeatedFieldCount(field);
+      List<Object> items = new ArrayList<Object>(num_items);
+      
+      for (int i = 0; i < num_items; i++) {
+        Object value = fromFieldValue(field.getJavaType(), message.getRepeatedField(field, i));
+        items.add(value);
+      }
+      return PersistentVector.create(items);
+    } else {
+      return fromFieldValue(field.getJavaType(), message.getField(field));
+    }
+  }
+  
+  public Object valAt(Object key, Object notFound) {
+    Object val = valAt(key);
+    return (val == null) ? notFound : val;
+  }
+  
+  public IPersistentMap assoc(Object key, Object val) {
+    DynamicMessage.Builder builder = builder();
+    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    
+    if (field == null) return this;
+    setField(builder, field, val);
+    return makeNew(meta(), type, null, builder);
+  }
+  
+  public IPersistentMap assocEx(Object key, Object val) throws Exception {
+    if(containsKey(key)) throw new Exception("Key already present");
+    return assoc(key, val);
+  }
+  
+  public IPersistentCollection cons(Object o) {
+    if (o instanceof Map.Entry) {
+      Map.Entry e = (Map.Entry) o;
+      return assoc(e.getKey(), e.getValue());
+    }	else if (o instanceof IPersistentVector) {
+      IPersistentVector v = (IPersistentVector) o;
+      if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
+      return assoc(v.nth(0), v.nth(1));
+    }
+    
+    DynamicMessage.Builder builder = builder();
+    
+    for(ISeq s = RT.seq(o); s != null; s = s.next()) {
+      Map.Entry e = (Map.Entry) s.first();
+      Keyword key = (Keyword) e.getKey();
+      setField(builder, fieldDescriptor(key), e.getValue());
+    }
+    return makeNew(meta(), type, null, builder);
+  }
+  
+  public IPersistentMap without(Object key) throws Exception {
+    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    if (field == null) return this;
+    if (field.isRequired()) throw new Exception("Can't remove required field");
+    
+    DynamicMessage.Builder builder = builder();
+    builder.clearField(field);
+    return makeNew(meta(), type, null, builder);
+  }
+  
+  public Iterator iterator() {
+    return new SeqIterator(seq());
+  }
+  
+  public int count() {
+    return message().getAllFields().size();
+  }
+  
+  public ISeq seq() {
+    return new Seq(null, message());
+  }
+  
+  public IPersistentCollection empty() {
+    DynamicMessage.Builder builder = builder();
+    builder.clear();
+    return makeNew(meta(), type, null, builder);
+  }
+  
+  static class Seq extends ASeq {
+    final Map<Descriptors.FieldDescriptor, Object> map;
+    final Descriptors.FieldDescriptor[] fields;
+    final int i;
+    
+    public Seq(IPersistentMap meta, DynamicMessage message) {    
+      super(meta);
+      this.map    = message.getAllFields();
+      this.fields = (Descriptors.FieldDescriptor[])map.keySet().toArray(new Descriptors.FieldDescriptor[map.size()]);
+      this.i      = 0;
+    }
+    
+    protected Seq(IPersistentMap meta, Map<Descriptors.FieldDescriptor, Object> map, Descriptors.FieldDescriptor[] fields, int i){
+      super(meta);
+      this.map    = map;
+      this.fields = fields;
+      this.i      = i;
+    }
+    
+    public Obj withMeta(IPersistentMap meta) {
+      if(meta != meta()) return new Seq(meta, map, fields, i);
+      return this;
+    }
+    
+    public Object first() {
+      Descriptors.FieldDescriptor field = fields[i];
+      Keyword key = Keyword.intern(Symbol.intern(field.getName()));
+      return new MapEntry(key, map.get(field));
+    }
+    
+    public ISeq next() {
+      if (i + 1 < fields.length) return new Seq(meta(), map, fields, i + 1);
+      return null;
+    }
+  }
+}
\ No newline at end of file

From 429785712d46d3274cc4e859bac99d23db98ce09 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 19 Jan 2010 20:10:32 -0800
Subject: [PATCH 003/525] getting closer

---
 src/clj/protobuf.clj                          |  18 +-
 .../protobuf/PersistentProtocolBufferMap.java | 223 ++++++++++++------
 2 files changed, 158 insertions(+), 83 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index f6a0042..fdbeabd 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,10 +1,16 @@
 (ns protobuf)
 
+(set! *warn-on-reflection* true)
+
 (defmacro defprotobuf [sym & args]
-  (let [class (symbol (apply str (interpose "$" (map name args))))]
-    `(def ~sym (. ~class  getDescriptor))))
+  (let [class (apply str (interpose "$" (map name args)))]
+    `(def ~sym (clojure.protobuf.PersistentProtocolBufferMap$Def/create ~class))))
+
+(defn protobuf 
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
+     (clojure.protobuf.PersistentProtocolBufferMap/create type data))
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
+     (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply hash-map k v kvs))))
 
-(defn protobuf [desc & args]
-  (if (= (count args) 1)
-    (clojure.protobuf.PersistentProtocolBufferMap/create desc (first args))
-    (clojure.protobuf.PersistentProtocolBufferMap/construct desc (apply hash-map args))))
\ No newline at end of file
+(defn dump-protobuf [#^clojure.protobuf.PersistentProtocolBufferMap p]
+  (.toByteArray p))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index b91ffdd..503144a 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -15,56 +15,109 @@
 import clojure.lang.*;
 import java.util.*;
 import java.io.InputStream;
+import java.io.IOException; 
+import java.util.concurrent.ConcurrentHashMap;
+import java.lang.reflect.InvocationTargetException;
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Descriptors;
 
 public class PersistentProtocolBufferMap extends APersistentMap {
-  final Descriptors.Descriptor type;
+  public static class Def {
+    final Descriptors.Descriptor type;
+    ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
+    static ConcurrentHashMap<Descriptors.Descriptor, Def> type_to_def = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
+    
+    public static Def create(String class_name) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, ClassNotFoundException {
+      Class<?> c = Class.forName(class_name);
+      Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
+      return create(type);
+    }
+
+    public static Def create(Descriptors.Descriptor type) {
+      Def def = type_to_def.get(type);
+      if (def == null) {
+        def = new Def(type);
+        type_to_def.putIfAbsent(type, def);
+      }
+      return def;
+    }
+
+    protected Def(Descriptors.Descriptor type) {
+      this.type             = type;
+      this.keyword_to_field = new ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor>();
+    }
+
+    public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferException {
+      return DynamicMessage.parseFrom(type, bytes);
+    } 
+
+    public DynamicMessage.Builder newBuilder() {
+      return DynamicMessage.newBuilder(type);
+    }
+
+    public Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
+      Descriptors.FieldDescriptor field = keyword_to_field.get(key);
+      if (field == null) {
+        field = type.findFieldByName(key.getName());
+        if (field != null) keyword_to_field.putIfAbsent(key, field);
+      }
+      return field;
+    }
+    
+    public String getName() {
+      return type.getName();
+    }
+
+    public String getFullName() {
+      return type.getFullName();
+    }
+
+    public Descriptors.Descriptor getMessageType() {
+      return type;
+    }
+  }
+
+  final Def                    def;
   final DynamicMessage         message;
   final DynamicMessage.Builder builder;
 
-  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, byte[] bytes)
-    throws com.google.protobuf.InvalidProtocolBufferException
-  {
-    DynamicMessage message = DynamicMessage.parseFrom(type, bytes);
-    return new PersistentProtocolBufferMap(null, type, message, null);
-  }
-  
-  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, String string)
-    throws com.google.protobuf.InvalidProtocolBufferException
-  {
-    return create(type, string.getBytes());
-  }
-  
-  static public PersistentProtocolBufferMap create(Descriptors.Descriptor type, InputStream input)
-    throws com.google.protobuf.InvalidProtocolBufferException, java.io.IOException
-  {
-    DynamicMessage message = DynamicMessage.parseFrom(type, input);
-    return new PersistentProtocolBufferMap(null, type, message, null);
+  DynamicMessage built_message;
+
+  static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws InvalidProtocolBufferException {
+    DynamicMessage message = def.parseFrom(bytes);
+    return new PersistentProtocolBufferMap(null, def, message, null);
   }
-  
-  static public PersistentProtocolBufferMap construct(Descriptors.Descriptor type, IPersistentMap keyvals){
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(type);
-    PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, type, null, builder);
+    
+  static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
+    DynamicMessage.Builder builder = def.newBuilder();
+    PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def, null, builder);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
   }
   
-  protected PersistentProtocolBufferMap(IPersistentMap meta, Descriptors.Descriptor type,
-                                        DynamicMessage message, DynamicMessage.Builder builder) {
+  protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
     super(meta);
-    this.type    = type;
+    this.def     = def;
     this.message = message;
     this.builder = builder;
   }
   
-  protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Descriptors.Descriptor type,
-                                                DynamicMessage message, DynamicMessage.Builder builder) {
-    return new PersistentProtocolBufferMap(meta, type, message, builder);
+  protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
+    return new PersistentProtocolBufferMap(meta, def, message, builder);
   }
   
+  public byte[] toByteArray() {
+    return message().toByteArray();
+  }
+
+  public Descriptors.Descriptor getMessageType() {
+    return def.getMessageType();
+  }
+
   protected DynamicMessage message() {
     if (message == null) {
-      return builder.build();
+      if (built_message == null) built_message = builder.build();
+      return built_message;
     } else {
       return message;
     }
@@ -77,39 +130,68 @@ protected DynamicMessage.Builder builder() {
       return builder.clone();
     }
   }
-  
-  protected Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
-    return type.findFieldByName(key.getName());
+
+  static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword = new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
+
+  static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor e) {
+    Keyword k = enum_to_keyword.get(e);
+    if (k == null) {
+      k = Keyword.intern(Symbol.intern(e.getName().toLowerCase()));
+    }
+    return k;
   }
-  
-  protected Object fromFieldValue(Descriptors.FieldDescriptor.JavaType type, Object value) {
-    switch (type) {
-    case ENUM:
-      break;
-    case MESSAGE:
-      break;
-    default:
-      return value;
+
+  static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
+    if (value instanceof List) {
+      List values = (List) value;
+
+      List<Object> items = new ArrayList<Object>(values.size());
+      Iterator iterator = values.iterator();
+      
+      while (iterator.hasNext()) {
+        items.add(fromProtoValue(field, iterator.next()));
+      }
+      return PersistentVector.create(items);
+    } else {
+      switch (field.getJavaType()) {
+      case ENUM:
+        Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor) value;
+        return enumToKeyword(e);
+      case MESSAGE:
+        
+        break;
+      default:
+        return value;
+      }
+      return null;
     }
-    return null;
   }
   
-  protected Object toFieldValue(Descriptors.FieldDescriptor.JavaType type, Object value) {
-    switch (type) {
+  static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
+    switch (field.getJavaType()) {
     case LONG:
       if (value instanceof Long) return value;
       Integer i = (Integer) value;
       return new Long(i.longValue());      
     case INT:
-      return (Integer)value;
+      if (value instanceof Integer) return value;
+      Long l = (Long) value;
+      return new Integer(l.intValue());      
     case ENUM:
-      break;
+      Descriptors.EnumDescriptor e = field.getEnumType();
+      Keyword key = (Keyword) value;
+      return e.findValueByName(key.getName().toUpperCase());
     case MESSAGE:
-      break;
+      Descriptors.Descriptor d = field.getMessageType();
+      if (value instanceof PersistentProtocolBufferMap) {
+        PersistentProtocolBufferMap m = (PersistentProtocolBufferMap) value;
+        if (m.getMessageType() == d) return m.message();          
+      }
+      Def def = PersistentProtocolBufferMap.Def.create(d);
+      return PersistentProtocolBufferMap.construct(def, (IPersistentMap) value);
     default:
       return value;
     }
-    return null;
   }
   
   protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
@@ -118,22 +200,22 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
     if (field.isRepeated()) {
       builder.clearField(field);
       for (ISeq s = RT.seq(val); s != null; s = s.next()) {
-        Object value = toFieldValue(field.getJavaType(), s.first());
+        Object value = toProtoValue(field, s.first());
         builder.addRepeatedField(field, value);
       }
     } else {
-      Object value = toFieldValue(field.getJavaType(), val);
+      Object value = toProtoValue(field, val);
       builder.setField(field, value);
     }
   }
   
   public Obj withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
-    return makeNew(meta, type, message, builder);
+    return makeNew(meta, def, message, builder);
   }
   
   public boolean containsKey(Object key) {
-    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     return message().hasField(field);
   }
   
@@ -143,23 +225,9 @@ public IMapEntry entryAt(Object key) {
   }
   
   public Object valAt(Object key) {
-    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     if (field == null) return null;
-    
-    DynamicMessage message = message();
-    
-    if (field.isRepeated()) {
-      int num_items = message.getRepeatedFieldCount(field);
-      List<Object> items = new ArrayList<Object>(num_items);
-      
-      for (int i = 0; i < num_items; i++) {
-        Object value = fromFieldValue(field.getJavaType(), message.getRepeatedField(field, i));
-        items.add(value);
-      }
-      return PersistentVector.create(items);
-    } else {
-      return fromFieldValue(field.getJavaType(), message.getField(field));
-    }
+    return fromProtoValue(field, message().getField(field));
   }
   
   public Object valAt(Object key, Object notFound) {
@@ -169,11 +237,11 @@ public Object valAt(Object key, Object notFound) {
   
   public IPersistentMap assoc(Object key, Object val) {
     DynamicMessage.Builder builder = builder();
-    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     
     if (field == null) return this;
     setField(builder, field, val);
-    return makeNew(meta(), type, null, builder);
+    return makeNew(meta(), def, null, builder);
   }
   
   public IPersistentMap assocEx(Object key, Object val) throws Exception {
@@ -196,19 +264,19 @@ public IPersistentCollection cons(Object o) {
     for(ISeq s = RT.seq(o); s != null; s = s.next()) {
       Map.Entry e = (Map.Entry) s.first();
       Keyword key = (Keyword) e.getKey();
-      setField(builder, fieldDescriptor(key), e.getValue());
+      setField(builder, def.fieldDescriptor(key), e.getValue());
     }
-    return makeNew(meta(), type, null, builder);
+    return makeNew(meta(), def, null, builder);
   }
   
   public IPersistentMap without(Object key) throws Exception {
-    Descriptors.FieldDescriptor field = fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     if (field == null) return this;
     if (field.isRequired()) throw new Exception("Can't remove required field");
     
     DynamicMessage.Builder builder = builder();
     builder.clearField(field);
-    return makeNew(meta(), type, null, builder);
+    return makeNew(meta(), def, null, builder);
   }
   
   public Iterator iterator() {
@@ -226,7 +294,7 @@ public ISeq seq() {
   public IPersistentCollection empty() {
     DynamicMessage.Builder builder = builder();
     builder.clear();
-    return makeNew(meta(), type, null, builder);
+    return makeNew(meta(), def, null, builder);
   }
   
   static class Seq extends ASeq {
@@ -256,7 +324,8 @@ public Obj withMeta(IPersistentMap meta) {
     public Object first() {
       Descriptors.FieldDescriptor field = fields[i];
       Keyword key = Keyword.intern(Symbol.intern(field.getName()));
-      return new MapEntry(key, map.get(field));
+      Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));
+      return new MapEntry(key, val);
     }
     
     public ISeq next() {

From b5f865e7fa468f25a6c8f6b3f6a8c5ab3ce6a1b6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 20 Jan 2010 10:08:26 -0800
Subject: [PATCH 004/525] add support for nested messages

---
 .../protobuf/PersistentProtocolBufferMap.java | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 503144a..bc85d8d 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -8,8 +8,6 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-/* Based on rhickey's clojure.lang.PersistentStructMap - Jan 17, 2010 */
-
 package clojure.protobuf;
 
 import clojure.lang.*;
@@ -102,7 +100,7 @@ protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessa
     this.builder = builder;
   }
   
-  protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
+  static protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
     return new PersistentProtocolBufferMap(meta, def, message, builder);
   }
   
@@ -158,12 +156,12 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor) value;
         return enumToKeyword(e);
       case MESSAGE:
-        
-        break;
+        Def def  = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        DynamicMessage message = (DynamicMessage) value;
+        return PersistentProtocolBufferMap.makeNew(null, def, message, null);
       default:
         return value;
       }
-      return null;
     }
   }
   
@@ -182,13 +180,14 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       Keyword key = (Keyword) value;
       return e.findValueByName(key.getName().toUpperCase());
     case MESSAGE:
-      Descriptors.Descriptor d = field.getMessageType();
+      PersistentProtocolBufferMap protobuf;
       if (value instanceof PersistentProtocolBufferMap) {
-        PersistentProtocolBufferMap m = (PersistentProtocolBufferMap) value;
-        if (m.getMessageType() == d) return m.message();          
+        protobuf = (PersistentProtocolBufferMap) value;
+      } else {
+        Def def  = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        protobuf = PersistentProtocolBufferMap.construct(def, (IPersistentMap) value);
       }
-      Def def = PersistentProtocolBufferMap.Def.create(d);
-      return PersistentProtocolBufferMap.construct(def, (IPersistentMap) value);
+      return protobuf.message();
     default:
       return value;
     }
@@ -288,7 +287,7 @@ public int count() {
   }
   
   public ISeq seq() {
-    return new Seq(null, message());
+    return Seq.create(message());
   }
   
   public IPersistentCollection empty() {
@@ -302,11 +301,13 @@ static class Seq extends ASeq {
     final Descriptors.FieldDescriptor[] fields;
     final int i;
     
-    public Seq(IPersistentMap meta, DynamicMessage message) {    
-      super(meta);
-      this.map    = message.getAllFields();
-      this.fields = (Descriptors.FieldDescriptor[])map.keySet().toArray(new Descriptors.FieldDescriptor[map.size()]);
-      this.i      = 0;
+    static public Seq create(DynamicMessage message) {
+      Map<Descriptors.FieldDescriptor, Object> map = message.getAllFields();
+      if (map.size() == 0) return null;
+
+      Descriptors.FieldDescriptor[] fields = new Descriptors.FieldDescriptor[map.size()];
+      fields = (Descriptors.FieldDescriptor[]) map.keySet().toArray(fields);
+      return new Seq(null, map, fields, 0);
     }
     
     protected Seq(IPersistentMap meta, Map<Descriptors.FieldDescriptor, Object> map, Descriptors.FieldDescriptor[] fields, int i){
@@ -322,6 +323,7 @@ public Obj withMeta(IPersistentMap meta) {
     }
     
     public Object first() {
+      if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
       Keyword key = Keyword.intern(Symbol.intern(field.getName()));
       Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));

From a5a3a4bc4ed14688b44fb8c5bbf46d07b6cec5f2 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 20 Jan 2010 19:00:25 -0800
Subject: [PATCH 005/525] improvements and bugfixes to support nested messages
 and enums

---
 src/clj/protobuf.clj                          |  5 +-
 .../protobuf/PersistentProtocolBufferMap.java | 86 ++++++++++++-------
 2 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index fdbeabd..5145d46 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -6,11 +6,14 @@
   (let [class (apply str (interpose "$" (map name args)))]
     `(def ~sym (clojure.protobuf.PersistentProtocolBufferMap$Def/create ~class))))
 
-(defn protobuf 
+(defn protobuf
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
+     (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
      (clojure.protobuf.PersistentProtocolBufferMap/create type data))
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply hash-map k v kvs))))
 
+
 (defn dump-protobuf [#^clojure.protobuf.PersistentProtocolBufferMap p]
   (.toByteArray p))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index bc85d8d..26a6953 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -13,7 +13,8 @@
 import clojure.lang.*;
 import java.util.*;
 import java.io.InputStream;
-import java.io.IOException; 
+import java.io.PrintWriter;
+import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.lang.reflect.InvocationTargetException;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -55,9 +56,11 @@ public DynamicMessage.Builder newBuilder() {
     }
 
     public Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
+      if (key == null) return null;
       Descriptors.FieldDescriptor field = keyword_to_field.get(key);
       if (field == null) {
-        field = type.findFieldByName(key.getName());
+        String name = key.getName().replaceAll("-","_");
+        field = type.findFieldByName(name);
         if (field != null) keyword_to_field.putIfAbsent(key, field);
       }
       return field;
@@ -76,32 +79,37 @@ public Descriptors.Descriptor getMessageType() {
     }
   }
 
-  final Def                    def;
-  final DynamicMessage         message;
-  final DynamicMessage.Builder builder;
+  final Def            def;
+  final DynamicMessage message;
 
   DynamicMessage built_message;
 
   static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws InvalidProtocolBufferException {
     DynamicMessage message = def.parseFrom(bytes);
-    return new PersistentProtocolBufferMap(null, def, message, null);
+    return new PersistentProtocolBufferMap(null, def, message);
   }
     
   static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
-    DynamicMessage.Builder builder = def.newBuilder();
-    PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def, null, builder);
+    PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
   }
   
-  protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
+  protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
+    super(meta);
+    this.def     = def;
+    this.message = null;
+  }
+
+  protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message) {
     super(meta);
     this.def     = def;
     this.message = message;
-    this.builder = builder;
   }
-  
-  static protected PersistentProtocolBufferMap makeNew(IPersistentMap meta, Def def, DynamicMessage message, DynamicMessage.Builder builder) {
-    return new PersistentProtocolBufferMap(meta, def, message, builder);
+
+  protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage.Builder builder) {
+    super(meta);
+    this.def     = def;
+    this.message = builder.build();
   }
   
   public byte[] toByteArray() {
@@ -114,29 +122,30 @@ public Descriptors.Descriptor getMessageType() {
 
   protected DynamicMessage message() {
     if (message == null) {
-      if (built_message == null) built_message = builder.build();
-      return built_message;
+      return def.newBuilder().build(); // This will only work if an empty message is valid.
     } else {
       return message;
     }
   }
   
   protected DynamicMessage.Builder builder() {
-    if (builder == null) {
-      return message.toBuilder();
+    if (message == null) {
+      return def.newBuilder();
     } else {
-      return builder.clone();
+      return message.toBuilder();
     }
   }
 
   static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword = new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
 
-  static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor e) {
-    Keyword k = enum_to_keyword.get(e);
-    if (k == null) {
-      k = Keyword.intern(Symbol.intern(e.getName().toLowerCase()));
+  static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
+    Keyword keyword = enum_to_keyword.get(enum_value);
+    if (keyword == null) {
+      String name = enum_value.getName().toLowerCase().replaceAll("_","-");
+      keyword = Keyword.intern(Symbol.intern(name));
+      enum_to_keyword.putIfAbsent(enum_value, keyword);
     }
-    return k;
+    return keyword;
   }
 
   static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
@@ -158,7 +167,11 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
       case MESSAGE:
         Def def  = PersistentProtocolBufferMap.Def.create(field.getMessageType());
         DynamicMessage message = (DynamicMessage) value;
-        return PersistentProtocolBufferMap.makeNew(null, def, message, null);
+
+        // Total hack because getField() doesn't return an empty array for repeated messages.
+        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList());
+
+        return new PersistentProtocolBufferMap(null, def, message);
       default:
         return value;
       }
@@ -176,9 +189,15 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       Long l = (Long) value;
       return new Integer(l.intValue());      
     case ENUM:
-      Descriptors.EnumDescriptor e = field.getEnumType();
       Keyword key = (Keyword) value;
-      return e.findValueByName(key.getName().toUpperCase());
+      String name = key.getName().toUpperCase().replaceAll("-","_");
+      Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
+      Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
+			if (enum_value == null) {
+        PrintWriter err = (PrintWriter) RT.ERR.deref();
+        err.format("invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
+      }
+      return enum_value;
     case MESSAGE:
       PersistentProtocolBufferMap protobuf;
       if (value instanceof PersistentProtocolBufferMap) {
@@ -210,7 +229,7 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
   
   public Obj withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
-    return makeNew(meta, def, message, builder);
+    return new PersistentProtocolBufferMap(meta(), def, message);
   }
   
   public boolean containsKey(Object key) {
@@ -234,13 +253,13 @@ public Object valAt(Object key, Object notFound) {
     return (val == null) ? notFound : val;
   }
   
-  public IPersistentMap assoc(Object key, Object val) {
+  public IPersistentMap assoc(Object key, Object val) {    
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     
     if (field == null) return this;
     setField(builder, field, val);
-    return makeNew(meta(), def, null, builder);
+    return new PersistentProtocolBufferMap(meta(), def, builder);
   }
   
   public IPersistentMap assocEx(Object key, Object val) throws Exception {
@@ -265,7 +284,7 @@ public IPersistentCollection cons(Object o) {
       Keyword key = (Keyword) e.getKey();
       setField(builder, def.fieldDescriptor(key), e.getValue());
     }
-    return makeNew(meta(), def, null, builder);
+    return new PersistentProtocolBufferMap(meta(), def, builder);
   }
   
   public IPersistentMap without(Object key) throws Exception {
@@ -275,7 +294,7 @@ public IPersistentMap without(Object key) throws Exception {
     
     DynamicMessage.Builder builder = builder();
     builder.clearField(field);
-    return makeNew(meta(), def, null, builder);
+    return new PersistentProtocolBufferMap(meta(), def, builder);
   }
   
   public Iterator iterator() {
@@ -293,7 +312,7 @@ public ISeq seq() {
   public IPersistentCollection empty() {
     DynamicMessage.Builder builder = builder();
     builder.clear();
-    return makeNew(meta(), def, null, builder);
+    return new PersistentProtocolBufferMap(meta(), def, builder);
   }
   
   static class Seq extends ASeq {
@@ -325,7 +344,8 @@ public Obj withMeta(IPersistentMap meta) {
     public Object first() {
       if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
-      Keyword key = Keyword.intern(Symbol.intern(field.getName()));
+      String name = field.getName().replaceAll("_","-");
+      Keyword key = Keyword.intern(Symbol.intern(name));
       Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));
       return new MapEntry(key, val);
     }

From 7cb5b83b067800333f646795d23cd026040ceb2b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 27 Jan 2010 17:54:13 -0800
Subject: [PATCH 006/525] add ant tasks for building

---
 .gitignore           |  3 +-
 build.xml            | 66 ++++++++++++++++++++++++++++++++++++++++++++
 src/clj/protobuf.clj |  5 ++--
 3 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 build.xml

diff --git a/.gitignore b/.gitignore
index cb290e3..e666a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-*.class
+lib
+classes
 *.jar
\ No newline at end of file
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..257ded2
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,66 @@
+<project name="clojure-protobuf" default="package">
+
+  <property name="repository.protobuf" value="http://protobuf.googlecode.com/files"/>
+  <property name="dep.protobuf" value="protobuf-2.3.0"/>
+ 
+  <target name="init">
+    <mkdir dir="lib"/>
+    <mkdir dir="classes"/>
+  </target>
+
+  <target name="distclean" depends="clean">
+    <delete dir="lib"/>
+  </target>
+
+  <target name="clean">
+    <delete>
+      <fileset dir="." includes="*.jar"/>
+    </delete>
+    <delete dir="classes"/>
+  </target>
+
+  <available file="lib/${dep.protobuf}" property="protobuf.present"/>
+  <target name="protobuf.fetch" depends="init" unless="protobuf.present">
+    <get src="${repository.protobuf}/${dep.protobuf}.tar.gz"
+         dest="lib/${dep.protobuf}.tar.gz" usetimestamp="true"/>
+    <gunzip src="lib/${dep.protobuf}.tar.gz"/>
+    <untar src="lib/${dep.protobuf}.tar" dest="lib"/>
+    <delete file="lib/${dep.protobuf}.tar"/>
+    <chmod file="lib/${dep.protobuf}/configure" perm="+x"/>
+  </target>
+
+  <available file="lib/${dep.protobuf}/Makefile" property="protobuf.makefile.present"/>
+  <target name="protobuf.configure" depends="protobuf.fetch" unless="protobuf.makefile.present">
+    <exec dir="lib/${dep.protobuf}" executable="./configure"/>
+  </target>
+
+  <path id="classpath">
+    <fileset dir="${user.home}/lib/java" includes="*.jar"/>
+    <pathelement location="${clojure_jar}"/>
+    <pathelement location="src/clj"/>
+    <pathelement location="classes"/>
+  </path>
+
+  <target name="protobuf.make" depends="protobuf.configure">
+    <exec dir="lib/${dep.protobuf}" executable="make"/>
+    <exec dir="lib/${dep.protobuf}/java" executable="../src/protoc">
+      <arg value="--java_out=src/main/java"/>
+      <arg value="-I../src"/>
+      <arg value="../src/google/protobuf/descriptor.proto"/>
+    </exec>
+    <javac srcdir="lib/${dep.protobuf}/java/src/main/java" destdir="classes"/>
+  </target>
+
+  <target name="compile" depends="protobuf.make">
+    <javac srcdir="src/jvm" destdir="classes" classpathref="classpath"/>
+    <java classname="clojure.lang.Compile" classpathref="classpath">
+      <sysproperty key="clojure.compile.path" value="classes"/>
+      <arg value="protobuf"/>
+    </java>
+  </target>
+
+  <target name="package" depends="compile">
+    <jar destfile="clojure-protobuf.jar" basedir="classes"/>
+  </target>
+
+</project>
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 5145d46..b400743 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -10,10 +10,9 @@
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
-     (clojure.protobuf.PersistentProtocolBufferMap/create type data))
+     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data)))
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply hash-map k v kvs))))
 
-
-(defn dump-protobuf [#^clojure.protobuf.PersistentProtocolBufferMap p]
+(defn protobuf-bytes [#^clojure.protobuf.PersistentProtocolBufferMap p]
   (.toByteArray p))
\ No newline at end of file

From 5923d6179699a39fc997995b80dfe5a625910099 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 27 Jan 2010 18:23:31 -0800
Subject: [PATCH 007/525] add readme and example

---
 README                 |  0
 README.md              | 45 ++++++++++++++++++++++++++++++++++++++++++
 examples/.gitignore    |  2 ++
 examples/example.proto |  5 +++++
 4 files changed, 52 insertions(+)
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 examples/.gitignore
 create mode 100644 examples/example.proto

diff --git a/README b/README
deleted file mode 100644
index e69de29..0000000
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7f4023c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,45 @@
+Clojure-protobuf provides a clojure interface to Google's protocol buffers (http://code.google.com/p/protobuf).
+
+## Build
+
+  ant
+
+## Usage
+
+Write a `.proto` file:
+
+  message Person {
+    required int32 id = 1;
+    required string name = 2;
+    optional string email = 3;
+    repeated string nicknames = 4;
+  }
+
+Compile the file to Java:
+
+  protoc --java_out=. example.proto
+
+Now you can use the protocol buffer in clojure:
+
+  (use 'protobuf)
+  (defprotobuf person Example Person)
+
+  (def p (protobuf person :id 4 :name "Bob" :email "bob@example.com"))
+  => {:id 4, :name "Bob", :email "bob@example.com"}
+
+  (assoc p :name "Bill"))
+  => {:id 4, :name "Bill", :email "bob@example.com"}
+
+  (def b (protobuf-bytes p))
+  => #<byte[] [B@7cbe41ec>
+
+  (protobuf person b)
+  => {:id 4, :name "Bob", :email "bob@example.com"}
+
+A protocol buffer map is immutable just like other clojure objects. It is similar to a
+struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
+
+## Motivation
+
+So why would you want to do this? Because it is WAY faster to serialize and deserialize
+protocol buffers than standard clojure objects.
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..6a70a53
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1,2 @@
+*.class
+*.java
\ No newline at end of file
diff --git a/examples/example.proto b/examples/example.proto
new file mode 100644
index 0000000..56b85e2
--- /dev/null
+++ b/examples/example.proto
@@ -0,0 +1,5 @@
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+}

From 19a12bc426881da45da01864b75b3f5465170731 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 27 Jan 2010 18:24:51 -0800
Subject: [PATCH 008/525] update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7f4023c..f684fa0 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 Clojure-protobuf provides a clojure interface to Google's protocol buffers (http://code.google.com/p/protobuf).
 
-## Build
-
-  ant
-
 ## Usage
 
 Write a `.proto` file:
@@ -43,3 +39,7 @@ struct-map, except you cannot insert fields that aren't specified in the `.proto
 
 So why would you want to do this? Because it is WAY faster to serialize and deserialize
 protocol buffers than standard clojure objects.
+
+## Build
+
+  ant package
\ No newline at end of file

From 7109d585cfe23c7fee5128a9f3895b7bcd5fb61b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 27 Jan 2010 18:25:50 -0800
Subject: [PATCH 009/525] update readme

---
 README.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index f684fa0..02ff81e 100644
--- a/README.md
+++ b/README.md
@@ -4,33 +4,33 @@ Clojure-protobuf provides a clojure interface to Google's protocol buffers (http
 
 Write a `.proto` file:
 
-  message Person {
-    required int32 id = 1;
-    required string name = 2;
-    optional string email = 3;
-    repeated string nicknames = 4;
-  }
+    message Person {
+      required int32 id = 1;
+      required string name = 2;
+      optional string email = 3;
+      repeated string nicknames = 4;
+    }
 
 Compile the file to Java:
 
-  protoc --java_out=. example.proto
+    protoc --java_out=. example.proto
 
 Now you can use the protocol buffer in clojure:
 
-  (use 'protobuf)
-  (defprotobuf person Example Person)
+    (use 'protobuf)
+    (defprotobuf person Example Person)
 
-  (def p (protobuf person :id 4 :name "Bob" :email "bob@example.com"))
-  => {:id 4, :name "Bob", :email "bob@example.com"}
+    (def p (protobuf person :id 4 :name "Bob" :email "bob@example.com"))
+    => {:id 4, :name "Bob", :email "bob@example.com"}
 
-  (assoc p :name "Bill"))
-  => {:id 4, :name "Bill", :email "bob@example.com"}
+    (assoc p :name "Bill"))
+    => {:id 4, :name "Bill", :email "bob@example.com"}
 
-  (def b (protobuf-bytes p))
-  => #<byte[] [B@7cbe41ec>
+    (def b (protobuf-bytes p))
+    => #<byte[] [B@7cbe41ec>
 
-  (protobuf person b)
-  => {:id 4, :name "Bob", :email "bob@example.com"}
+    (protobuf person b)
+    => {:id 4, :name "Bob", :email "bob@example.com"}
 
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
@@ -42,4 +42,4 @@ protocol buffers than standard clojure objects.
 
 ## Build
 
-  ant package
\ No newline at end of file
+    ant package
\ No newline at end of file

From 1b01173dc3cc09c5406ab851479bcf5d32940738 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 27 Jan 2010 18:27:49 -0800
Subject: [PATCH 010/525] update readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 02ff81e..614c9d0 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,8 @@ struct-map, except you cannot insert fields that aren't specified in the `.proto
 ## Motivation
 
 So why would you want to do this? Because it is WAY faster to serialize and deserialize
-protocol buffers than standard clojure objects.
+protocol buffers than standard clojure objects. Protocol buffers are also a great way to
+communicate with other languages over the network.
 
 ## Build
 

From 341a12f5ec469abb6fe73dc20e751c36eb1144ae Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 28 Jan 2010 16:18:42 -0800
Subject: [PATCH 011/525] fix ant to fail if clojure.jar is not specified

---
 README.md | 10 +++-------
 build.xml | 33 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 614c9d0..1041b3d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 Clojure-protobuf provides a clojure interface to Google's protocol buffers (http://code.google.com/p/protobuf).
+Protocol buffers can be used to communicate with other languages over the network, and
+they are WAY faster to serialize and deserialize than standard Clojure objects.
 
 ## Usage
 
@@ -35,12 +37,6 @@ Now you can use the protocol buffer in clojure:
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
 
-## Motivation
-
-So why would you want to do this? Because it is WAY faster to serialize and deserialize
-protocol buffers than standard clojure objects. Protocol buffers are also a great way to
-communicate with other languages over the network.
-
 ## Build
 
-    ant package
\ No newline at end of file
+    ant package -Dclojure.jar=<path>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 257ded2..73c59de 100644
--- a/build.xml
+++ b/build.xml
@@ -19,29 +19,18 @@
     <delete dir="classes"/>
   </target>
 
-  <available file="lib/${dep.protobuf}" property="protobuf.present"/>
-  <target name="protobuf.fetch" depends="init" unless="protobuf.present">
+  <available file="lib/${dep.protobuf}/Makefile" property="hasprotobuf"/>
+  <target name="fetch_protobuf" depends="init" unless="hasprotobuf">
     <get src="${repository.protobuf}/${dep.protobuf}.tar.gz"
          dest="lib/${dep.protobuf}.tar.gz" usetimestamp="true"/>
     <gunzip src="lib/${dep.protobuf}.tar.gz"/>
     <untar src="lib/${dep.protobuf}.tar" dest="lib"/>
     <delete file="lib/${dep.protobuf}.tar"/>
     <chmod file="lib/${dep.protobuf}/configure" perm="+x"/>
-  </target>
-
-  <available file="lib/${dep.protobuf}/Makefile" property="protobuf.makefile.present"/>
-  <target name="protobuf.configure" depends="protobuf.fetch" unless="protobuf.makefile.present">
     <exec dir="lib/${dep.protobuf}" executable="./configure"/>
   </target>
 
-  <path id="classpath">
-    <fileset dir="${user.home}/lib/java" includes="*.jar"/>
-    <pathelement location="${clojure_jar}"/>
-    <pathelement location="src/clj"/>
-    <pathelement location="classes"/>
-  </path>
-
-  <target name="protobuf.make" depends="protobuf.configure">
+  <target name="make_protobuf" depends="fetch_protobuf">
     <exec dir="lib/${dep.protobuf}" executable="make"/>
     <exec dir="lib/${dep.protobuf}/java" executable="../src/protoc">
       <arg value="--java_out=src/main/java"/>
@@ -51,7 +40,21 @@
     <javac srcdir="lib/${dep.protobuf}/java/src/main/java" destdir="classes"/>
   </target>
 
-  <target name="compile" depends="protobuf.make">
+  <available property="hasclojure" file="${clojure.jar}"/>
+  <target name="check_clojure" unless="hasclojure">
+    <fail>
+      You have not defined a path to clojure.jar so I can't compile files.
+      To enable compiling, run "ant -Dclojure.jar=&lt;...path to clojure.jar..&gt;"
+    </fail>
+  </target>
+
+  <path id="classpath">
+    <pathelement location="${clojure.jar}"/>
+    <pathelement location="src/clj"/>
+    <pathelement location="classes"/>
+  </path>
+
+  <target name="compile" depends="check_clojure,make_protobuf">
     <javac srcdir="src/jvm" destdir="classes" classpathref="classpath"/>
     <java classname="clojure.lang.Compile" classpathref="classpath">
       <sysproperty key="clojure.compile.path" value="classes"/>

From 8a65e8c8d983c1e9d0c31fe8584610198f5d7a1c Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 29 Jan 2010 14:31:36 -0800
Subject: [PATCH 012/525] improved installation

---
 README.md | 15 +++++++++++--
 build.xml | 65 ++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 1041b3d..2a2df9b 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,17 @@ Now you can use the protocol buffer in clojure:
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
 
-## Build
+## Installation
 
-    ant package -Dclojure.jar=<path>
\ No newline at end of file
+To download clojure.jar and google's protobuf source automatically and install protoc:
+    ant package
+    ant install
+
+You can specify options to configure (like the install prefix):
+    ant package -Dconfigure='--prefix=/opt/local'
+    ant install
+
+You can also specify a specific location for clojure.jar or the protobuf source:
+    ant package -Dclojure.jar=$HOME/lib/java/clojure-1.1.0.jar -Dprotobuf=$HOME/Downloads/protobuf-2.3.0
+
+This code has been tested with clojure version 1.1.0 and protobuf version 2.3.0.
diff --git a/build.xml b/build.xml
index 73c59de..738bc87 100644
--- a/build.xml
+++ b/build.xml
@@ -2,50 +2,75 @@
 
   <property name="repository.protobuf" value="http://protobuf.googlecode.com/files"/>
   <property name="dep.protobuf" value="protobuf-2.3.0"/>
- 
+  <property name="protobuf" value="lib/${dep.protobuf}"/>  
+
+  <property name="repository.clojure" value="http://clojure.googlecode.com/files"/>
+  <property name="dep.clojure" value="clojure-1.1.0"/>
+  <property name="clojure.jar" value="lib/clojure.jar"/>
+
   <target name="init">
     <mkdir dir="lib"/>
     <mkdir dir="classes"/>
   </target>
 
-  <target name="distclean" depends="clean">
-    <delete dir="lib"/>
-  </target>
-
   <target name="clean">
     <delete>
       <fileset dir="." includes="*.jar"/>
     </delete>
+    <delete dir="lib"/>
     <delete dir="classes"/>
   </target>
 
-  <available file="lib/${dep.protobuf}/Makefile" property="hasprotobuf"/>
+  <available file="${protobuf}" property="hasprotobuf"/>
   <target name="fetch_protobuf" depends="init" unless="hasprotobuf">
     <get src="${repository.protobuf}/${dep.protobuf}.tar.gz"
          dest="lib/${dep.protobuf}.tar.gz" usetimestamp="true"/>
     <gunzip src="lib/${dep.protobuf}.tar.gz"/>
     <untar src="lib/${dep.protobuf}.tar" dest="lib"/>
     <delete file="lib/${dep.protobuf}.tar"/>
-    <chmod file="lib/${dep.protobuf}/configure" perm="+x"/>
-    <exec dir="lib/${dep.protobuf}" executable="./configure"/>
   </target>
 
-  <target name="make_protobuf" depends="fetch_protobuf">
-    <exec dir="lib/${dep.protobuf}" executable="make"/>
-    <exec dir="lib/${dep.protobuf}/java" executable="../src/protoc">
+  <target name="exec_configure" if="configure">
+    <chmod file="${protobuf}/configure" perm="+x"/>
+    <exec dir="${protobuf}" executable="./configure">
+      <arg line="${configure}"/>
+    </exec>
+  </target>
+
+  <target name="config_protobuf" depends="fetch_protobuf">
+    <condition property="configure" value="">
+      <not><available file="${protobuf}/Makefile"/></not>
+    </condition>
+    <antcall target="exec_configure"/>
+  </target>
+
+  <available file="${protobuf}/src/protoc" property="hasprotoc"/>
+  <target name="make_protobuf" depends="config_protobuf" unless="hasprotoc">
+    <exec dir="${protobuf}" executable="make"/>
+  </target>
+
+  <target name="install" depends="config_protobuf">
+    <chmod file="${protobuf}/install-sh" perm="+x"/>
+    <exec dir="${protobuf}" executable="make">
+      <arg value="install"/>
+    </exec>
+  </target>
+
+  <target name="compile_protobuf" depends="make_protobuf">
+    <exec dir="${protobuf}/java" executable="../src/protoc">
       <arg value="--java_out=src/main/java"/>
       <arg value="-I../src"/>
       <arg value="../src/google/protobuf/descriptor.proto"/>
     </exec>
-    <javac srcdir="lib/${dep.protobuf}/java/src/main/java" destdir="classes"/>
+    <javac srcdir="${protobuf}/java/src/main/java" destdir="classes"/>
   </target>
 
-  <available property="hasclojure" file="${clojure.jar}"/>
-  <target name="check_clojure" unless="hasclojure">
-    <fail>
-      You have not defined a path to clojure.jar so I can't compile files.
-      To enable compiling, run "ant -Dclojure.jar=&lt;...path to clojure.jar..&gt;"
-    </fail>
+  <available file="${clojure.jar}" property="hasclojure"/>
+  <target name="fetch_clojure" depends="init" unless="hasclojure">
+    <get src="${repository.clojure}/${dep.clojure}.zip"
+         dest="lib/${dep.clojure}.zip" usetimestamp="true"/>
+    <unzip src="lib/${dep.clojure}.zip" dest="lib"/>
+    <copy file="lib/${dep.clojure}/clojure.jar" todir="lib"/>
   </target>
 
   <path id="classpath">
@@ -54,9 +79,9 @@
     <pathelement location="classes"/>
   </path>
 
-  <target name="compile" depends="check_clojure,make_protobuf">
+  <target name="compile" depends="compile_protobuf,fetch_clojure">
     <javac srcdir="src/jvm" destdir="classes" classpathref="classpath"/>
-    <java classname="clojure.lang.Compile" classpathref="classpath">
+    <java classname="clojure.lang.Compile" classpathref="classpath" failonerror="true">
       <sysproperty key="clojure.compile.path" value="classes"/>
       <arg value="protobuf"/>
     </java>

From 901c2ca299ad3fa05c3b2374c603f91fe3b781a5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 29 Jan 2010 14:33:47 -0800
Subject: [PATCH 013/525] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2a2df9b..6511666 100644
--- a/README.md
+++ b/README.md
@@ -43,11 +43,11 @@ To download clojure.jar and google's protobuf source automatically and install p
     ant package
     ant install
 
-You can specify options to configure (like the install prefix):
+You can also specify options to configure (like the install prefix):
     ant package -Dconfigure='--prefix=/opt/local'
     ant install
 
-You can also specify a specific location for clojure.jar or the protobuf source:
+Or you can specify a specific location for clojure.jar or the protobuf source:
     ant package -Dclojure.jar=$HOME/lib/java/clojure-1.1.0.jar -Dprotobuf=$HOME/Downloads/protobuf-2.3.0
 
 This code has been tested with clojure version 1.1.0 and protobuf version 2.3.0.

From 3b834050b2188250037a1c56f5ccd96b18d5bcf6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Mon, 1 Feb 2010 13:54:03 -0800
Subject: [PATCH 014/525] improved build.xml

---
 build.xml | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index 738bc87..17554cd 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,16 @@
 <project name="clojure-protobuf" default="package">
 
+  <property name="repository.clojure" value="http://clojure.googlecode.com/files"/>
+  <property name="dep.clojure" value="clojure-1.1.0"/>
+  <property name="clojure.jar" value="lib/clojure.jar"/>
+
   <property name="repository.protobuf" value="http://protobuf.googlecode.com/files"/>
   <property name="dep.protobuf" value="protobuf-2.3.0"/>
   <property name="protobuf" value="lib/${dep.protobuf}"/>  
 
-  <property name="repository.clojure" value="http://clojure.googlecode.com/files"/>
-  <property name="dep.clojure" value="clojure-1.1.0"/>
-  <property name="clojure.jar" value="lib/clojure.jar"/>
+  <condition property="configure" value="">
+    <not><available file="${protobuf}/Makefile"/></not>
+  </condition>
 
   <target name="init">
     <mkdir dir="lib"/>
@@ -21,8 +25,8 @@
     <delete dir="classes"/>
   </target>
 
-  <available file="${protobuf}" property="hasprotobuf"/>
-  <target name="fetch_protobuf" depends="init" unless="hasprotobuf">
+  <available file="${protobuf}" property="has_protobuf"/>
+  <target name="fetch_protobuf" depends="init" unless="has_protobuf">
     <get src="${repository.protobuf}/${dep.protobuf}.tar.gz"
          dest="lib/${dep.protobuf}.tar.gz" usetimestamp="true"/>
     <gunzip src="lib/${dep.protobuf}.tar.gz"/>
@@ -30,28 +34,21 @@
     <delete file="lib/${dep.protobuf}.tar"/>
   </target>
 
-  <target name="exec_configure" if="configure">
+  <target name="config_protobuf" depends="fetch_protobuf" if="configure">
     <chmod file="${protobuf}/configure" perm="+x"/>
     <exec dir="${protobuf}" executable="./configure">
       <arg line="${configure}"/>
     </exec>
   </target>
 
-  <target name="config_protobuf" depends="fetch_protobuf">
-    <condition property="configure" value="">
-      <not><available file="${protobuf}/Makefile"/></not>
-    </condition>
-    <antcall target="exec_configure"/>
-  </target>
-
-  <available file="${protobuf}/src/protoc" property="hasprotoc"/>
-  <target name="make_protobuf" depends="config_protobuf" unless="hasprotoc">
-    <exec dir="${protobuf}" executable="make"/>
+  <available file="${protobuf}/src/protoc" property="has_protoc"/>
+  <target name="make_protobuf" depends="config_protobuf" unless="has_protoc">
+    <exec dir="${protobuf}" executable="make" failonerror="true"/>
   </target>
 
-  <target name="install" depends="config_protobuf">
+  <target name="install" depends="make_protobuf">
     <chmod file="${protobuf}/install-sh" perm="+x"/>
-    <exec dir="${protobuf}" executable="make">
+    <exec dir="${protobuf}" executable="make" failonerror="true">
       <arg value="install"/>
     </exec>
   </target>
@@ -65,8 +62,8 @@
     <javac srcdir="${protobuf}/java/src/main/java" destdir="classes"/>
   </target>
 
-  <available file="${clojure.jar}" property="hasclojure"/>
-  <target name="fetch_clojure" depends="init" unless="hasclojure">
+  <available file="${clojure.jar}" property="has_clojure"/>
+  <target name="fetch_clojure" depends="init" unless="has_clojure">
     <get src="${repository.clojure}/${dep.clojure}.zip"
          dest="lib/${dep.clojure}.zip" usetimestamp="true"/>
     <unzip src="lib/${dep.clojure}.zip" dest="lib"/>

From 7bee6936f0eb6aa3522c0279df00f2986ecb0ed6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 3 Feb 2010 21:23:56 -0800
Subject: [PATCH 015/525] stage install into lib/install

---
 build.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 17554cd..c9ce185 100644
--- a/build.xml
+++ b/build.xml
@@ -8,15 +8,17 @@
   <property name="dep.protobuf" value="protobuf-2.3.0"/>
   <property name="protobuf" value="lib/${dep.protobuf}"/>  
 
-  <condition property="configure" value="">
-    <not><available file="${protobuf}/Makefile"/></not>
-  </condition>
+  <property name="install_prefix" value="/usr/local"/>
 
   <target name="init">
     <mkdir dir="lib"/>
     <mkdir dir="classes"/>
   </target>
 
+  <target name="distclean">
+    <delete file="${protobuf}/Makefile"/>
+  </target>
+
   <target name="clean">
     <delete>
       <fileset dir="." includes="*.jar"/>
@@ -34,22 +36,27 @@
     <delete file="lib/${dep.protobuf}.tar"/>
   </target>
 
-  <target name="config_protobuf" depends="fetch_protobuf" if="configure">
+  <available file="${protobuf}/Makefile" property="configured_protobuf"/>
+  <target name="config_protobuf" depends="fetch_protobuf" unless="configured_protobuf">
     <chmod file="${protobuf}/configure" perm="+x"/>
     <exec dir="${protobuf}" executable="./configure">
-      <arg line="${configure}"/>
+      <arg value="--prefix=${basedir}/lib/install"/>
     </exec>
   </target>
 
   <available file="${protobuf}/src/protoc" property="has_protoc"/>
   <target name="make_protobuf" depends="config_protobuf" unless="has_protoc">
+    <chmod file="${protobuf}/install-sh" perm="+x"/>
     <exec dir="${protobuf}" executable="make" failonerror="true"/>
+    <exec dir="${protobuf}" executable="make" failonerror="true">
+      <arg value="install"/>
+    </exec>
   </target>
 
   <target name="install" depends="make_protobuf">
-    <chmod file="${protobuf}/install-sh" perm="+x"/>
-    <exec dir="${protobuf}" executable="make" failonerror="true">
-      <arg value="install"/>
+    <echo message="Installing to ${install_prefix}/"/>
+    <exec executable="cp">
+      <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
     </exec>
   </target>
 

From 62f7f9387a250e987ee2e7294efd6c54108f9ddd Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 4 Feb 2010 02:42:31 -0800
Subject: [PATCH 016/525] fail on install error

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c9ce185..ebeb9e6 100644
--- a/build.xml
+++ b/build.xml
@@ -55,7 +55,7 @@
 
   <target name="install" depends="make_protobuf">
     <echo message="Installing to ${install_prefix}/"/>
-    <exec executable="cp">
+    <exec executable="cp" failonerror="true">
       <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
     </exec>
   </target>

From 6dc5cce3ee782e3c192032838d60fb78524d2611 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 9 Feb 2010 11:52:40 -0800
Subject: [PATCH 017/525] add protobuf? and protodef? methods

---
 src/clj/protobuf.clj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index b400743..4157089 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -6,6 +6,12 @@
   (let [class (apply str (interpose "$" (map name args)))]
     `(def ~sym (clojure.protobuf.PersistentProtocolBufferMap$Def/create ~class))))
 
+(defn protobuf? [obj]
+  (instance? clojure.protobuf.PersistentProtocolBufferMap obj))
+
+(defn protodef? [obj]
+  (instance? clojure.protobuf.PersistentProtocolBufferMap$Def obj))
+
 (defn protobuf
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))

From c30d542f0f0ab1e9e625a2035f60fd6d79df651e Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Feb 2010 13:05:39 -0800
Subject: [PATCH 018/525] add protodef method

---
 src/clj/protobuf.clj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 4157089..46bfe2a 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -2,9 +2,12 @@
 
 (set! *warn-on-reflection* true)
 
+(defn protodef [class]
+  (clojure.protobuf.PersistentProtocolBufferMap$Def/create class))
+
 (defmacro defprotobuf [sym & args]
   (let [class (apply str (interpose "$" (map name args)))]
-    `(def ~sym (clojure.protobuf.PersistentProtocolBufferMap$Def/create ~class))))
+    `(def ~sym (protodef ~class))))
 
 (defn protobuf? [obj]
   (instance? clojure.protobuf.PersistentProtocolBufferMap obj))

From fe4be5d11bec70c404f9c64a45f9e15280b93630 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Feb 2010 13:06:31 -0800
Subject: [PATCH 019/525] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6511666..2e235ce 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Clojure-protobuf provides a clojure interface to Google's protocol buffers (http://code.google.com/p/protobuf).
+Clojure-protobuf provides a clojure interface to Google's [protocol buffers](http://code.google.com/p/protobuf).
 Protocol buffers can be used to communicate with other languages over the network, and
 they are WAY faster to serialize and deserialize than standard Clojure objects.
 

From 75fc03718e3ec7382917a3341fa539103b54acab Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Feb 2010 14:07:41 -0800
Subject: [PATCH 020/525] support protodef creation with string or class

---
 .../protobuf/PersistentProtocolBufferMap.java | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 26a6953..8b714b9 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -26,9 +26,13 @@ public static class Def {
     final Descriptors.Descriptor type;
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
     static ConcurrentHashMap<Descriptors.Descriptor, Def> type_to_def = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
-    
+
     public static Def create(String class_name) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, ClassNotFoundException {
       Class<?> c = Class.forName(class_name);
+      return create(c);
+    }
+
+   public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
       Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
       return create(type);
     }
@@ -49,7 +53,7 @@ protected Def(Descriptors.Descriptor type) {
 
     public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferException {
       return DynamicMessage.parseFrom(type, bytes);
-    } 
+    }
 
     public DynamicMessage.Builder newBuilder() {
       return DynamicMessage.newBuilder(type);
@@ -65,7 +69,7 @@ public Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
       }
       return field;
     }
-    
+
     public String getName() {
       return type.getName();
     }
@@ -88,12 +92,12 @@ static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws I
     DynamicMessage message = def.parseFrom(bytes);
     return new PersistentProtocolBufferMap(null, def, message);
   }
-    
+
   static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
   }
-  
+
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
     super(meta);
     this.def     = def;
@@ -111,7 +115,7 @@ protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessa
     this.def     = def;
     this.message = builder.build();
   }
-  
+
   public byte[] toByteArray() {
     return message().toByteArray();
   }
@@ -127,7 +131,7 @@ protected DynamicMessage message() {
       return message;
     }
   }
-  
+
   protected DynamicMessage.Builder builder() {
     if (message == null) {
       return def.newBuilder();
@@ -154,7 +158,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
 
       List<Object> items = new ArrayList<Object>(values.size());
       Iterator iterator = values.iterator();
-      
+
       while (iterator.hasNext()) {
         items.add(fromProtoValue(field, iterator.next()));
       }
@@ -177,17 +181,17 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
       }
     }
   }
-  
+
   static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
     switch (field.getJavaType()) {
     case LONG:
       if (value instanceof Long) return value;
       Integer i = (Integer) value;
-      return new Long(i.longValue());      
+      return new Long(i.longValue());
     case INT:
       if (value instanceof Integer) return value;
       Long l = (Long) value;
-      return new Integer(l.intValue());      
+      return new Integer(l.intValue());
     case ENUM:
       Keyword key = (Keyword) value;
       String name = key.getName().toUpperCase().replaceAll("-","_");
@@ -211,7 +215,7 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       return value;
     }
   }
-  
+
   protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
     if (field == null) return;
 
@@ -226,47 +230,47 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
       builder.setField(field, value);
     }
   }
-  
+
   public Obj withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
     return new PersistentProtocolBufferMap(meta(), def, message);
   }
-  
+
   public boolean containsKey(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     return message().hasField(field);
   }
-  
+
   public IMapEntry entryAt(Object key) {
     Object value = valAt(key);
     return (value == null) ? null : new MapEntry(key, value);
   }
-  
+
   public Object valAt(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     if (field == null) return null;
     return fromProtoValue(field, message().getField(field));
   }
-  
+
   public Object valAt(Object key, Object notFound) {
     Object val = valAt(key);
     return (val == null) ? notFound : val;
   }
-  
-  public IPersistentMap assoc(Object key, Object val) {    
+
+  public IPersistentMap assoc(Object key, Object val) {
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
-    
+
     if (field == null) return this;
     setField(builder, field, val);
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
-  
+
   public IPersistentMap assocEx(Object key, Object val) throws Exception {
     if(containsKey(key)) throw new Exception("Key already present");
     return assoc(key, val);
   }
-  
+
   public IPersistentCollection cons(Object o) {
     if (o instanceof Map.Entry) {
       Map.Entry e = (Map.Entry) o;
@@ -276,9 +280,9 @@ public IPersistentCollection cons(Object o) {
       if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
       return assoc(v.nth(0), v.nth(1));
     }
-    
+
     DynamicMessage.Builder builder = builder();
-    
+
     for(ISeq s = RT.seq(o); s != null; s = s.next()) {
       Map.Entry e = (Map.Entry) s.first();
       Keyword key = (Keyword) e.getKey();
@@ -286,40 +290,40 @@ public IPersistentCollection cons(Object o) {
     }
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
-  
+
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
     if (field == null) return this;
     if (field.isRequired()) throw new Exception("Can't remove required field");
-    
+
     DynamicMessage.Builder builder = builder();
     builder.clearField(field);
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
-  
+
   public Iterator iterator() {
     return new SeqIterator(seq());
   }
-  
+
   public int count() {
     return message().getAllFields().size();
   }
-  
+
   public ISeq seq() {
     return Seq.create(message());
   }
-  
+
   public IPersistentCollection empty() {
     DynamicMessage.Builder builder = builder();
     builder.clear();
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
-  
+
   static class Seq extends ASeq {
     final Map<Descriptors.FieldDescriptor, Object> map;
     final Descriptors.FieldDescriptor[] fields;
     final int i;
-    
+
     static public Seq create(DynamicMessage message) {
       Map<Descriptors.FieldDescriptor, Object> map = message.getAllFields();
       if (map.size() == 0) return null;
@@ -328,19 +332,19 @@ static public Seq create(DynamicMessage message) {
       fields = (Descriptors.FieldDescriptor[]) map.keySet().toArray(fields);
       return new Seq(null, map, fields, 0);
     }
-    
+
     protected Seq(IPersistentMap meta, Map<Descriptors.FieldDescriptor, Object> map, Descriptors.FieldDescriptor[] fields, int i){
       super(meta);
       this.map    = map;
       this.fields = fields;
       this.i      = i;
     }
-    
+
     public Obj withMeta(IPersistentMap meta) {
       if(meta != meta()) return new Seq(meta, map, fields, i);
       return this;
     }
-    
+
     public Object first() {
       if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
@@ -349,7 +353,7 @@ public Object first() {
       Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));
       return new MapEntry(key, val);
     }
-    
+
     public ISeq next() {
       if (i + 1 < fields.length) return new Seq(meta(), map, fields, i + 1);
       return null;

From be55c4d33d796392f83bd17ae5f27b99cd1b7690 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Feb 2010 14:08:09 -0800
Subject: [PATCH 021/525] remove warn-on-reflection

---
 src/clj/protobuf.clj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 46bfe2a..3cb1f3f 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,7 +1,5 @@
 (ns protobuf)
 
-(set! *warn-on-reflection* true)
-
 (defn protodef [class]
   (clojure.protobuf.PersistentProtocolBufferMap$Def/create class))
 

From 9c6afc7bb2be2781a6e7cfbcdb2429b9337936bd Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Feb 2010 17:15:31 -0800
Subject: [PATCH 022/525] fix function order

---
 src/clj/protobuf.clj | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 3cb1f3f..31a1df2 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,11 +1,6 @@
 (ns protobuf)
 
-(defn protodef [class]
-  (clojure.protobuf.PersistentProtocolBufferMap$Def/create class))
-
-(defmacro defprotobuf [sym & args]
-  (let [class (apply str (interpose "$" (map name args)))]
-    `(def ~sym (protodef ~class))))
+;(set! *warn-on-reflection* true)
 
 (defn protobuf? [obj]
   (instance? clojure.protobuf.PersistentProtocolBufferMap obj))
@@ -13,6 +8,15 @@
 (defn protodef? [obj]
   (instance? clojure.protobuf.PersistentProtocolBufferMap$Def obj))
 
+(defn protodef [class]
+  (if (or (protodef? class) (nil? class))
+    class
+    (clojure.protobuf.PersistentProtocolBufferMap$Def/create class)))
+
+(defmacro defprotobuf [sym & args]
+  (let [class (apply str (interpose "$" (map name args)))]
+    `(def ~sym (protodef ~class))))
+
 (defn protobuf
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))

From 959a127a173530405913154462a68126d14cf5a0 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 12 Mar 2010 16:35:27 -0800
Subject: [PATCH 023/525] make conj work the same as appending two protobufs,
 accept strings in the place of keywords for keys and enums, support loading
 truncated protobufs with CodedInputStream

---
 src/clj/protobuf.clj                          |  14 +-
 .../protobuf/PersistentProtocolBufferMap.java | 124 +++++++++++++-----
 2 files changed, 100 insertions(+), 38 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 31a1df2..f940df9 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,7 +1,5 @@
 (ns protobuf)
 
-;(set! *warn-on-reflection* true)
-
 (defn protobuf? [obj]
   (instance? clojure.protobuf.PersistentProtocolBufferMap obj))
 
@@ -20,10 +18,16 @@
 (defn protobuf
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type m]
+     (clojure.protobuf.PersistentProtocolBufferMap/construct type m))
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
+     (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
+
+(defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
      (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data)))
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
-     (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply hash-map k v kvs))))
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data #^Integer length]
+     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data length))))
 
-(defn protobuf-bytes [#^clojure.protobuf.PersistentProtocolBufferMap p]
+(defn protobuf-dump [#^clojure.protobuf.PersistentProtocolBufferMap p]
   (.toByteArray p))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 8b714b9..1e97ff7 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -20,8 +20,9 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Descriptors;
+import com.google.protobuf.CodedInputStream;
 
-public class PersistentProtocolBufferMap extends APersistentMap {
+public class PersistentProtocolBufferMap extends APersistentMap { //implements IPersistentSet{
   public static class Def {
     final Descriptors.Descriptor type;
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
@@ -32,7 +33,7 @@ public static Def create(String class_name) throws NoSuchMethodException, Illega
       return create(c);
     }
 
-   public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+    public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
       Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
       return create(type);
     }
@@ -55,19 +56,29 @@ public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferExcept
       return DynamicMessage.parseFrom(type, bytes);
     }
 
+    public DynamicMessage parseFrom(CodedInputStream input) throws IOException {
+      return DynamicMessage.parseFrom(type, input);
+    }
+
     public DynamicMessage.Builder newBuilder() {
       return DynamicMessage.newBuilder(type);
     }
 
-    public Descriptors.FieldDescriptor fieldDescriptor(Keyword key) {
+    public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
       if (key == null) return null;
-      Descriptors.FieldDescriptor field = keyword_to_field.get(key);
-      if (field == null) {
-        String name = key.getName().replaceAll("-","_");
-        field = type.findFieldByName(name);
-        if (field != null) keyword_to_field.putIfAbsent(key, field);
+
+      if (key instanceof Keyword) {
+        Keyword keyword = (Keyword) key;
+        Descriptors.FieldDescriptor field = keyword_to_field.get(keyword);
+        if (field == null) {
+          field = fieldDescriptor(keyword.getName());
+          if (field != null) keyword_to_field.putIfAbsent(keyword, field);
+        }
+        return field;
+      } else {
+        String name = ((String) key).replaceAll("-","_");
+        return type.findFieldByName(name);
       }
-      return field;
     }
 
     public String getName() {
@@ -93,6 +104,12 @@ static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws I
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
+  static public PersistentProtocolBufferMap create(Def def, byte[] bytes, Integer length) throws IOException {
+    CodedInputStream input = CodedInputStream.newInstance(bytes, 0, length.intValue());
+    DynamicMessage message = def.parseFrom(input);
+    return new PersistentProtocolBufferMap(null, def, message);
+  }
+
   static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
@@ -155,10 +172,9 @@ static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_valu
   static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
     if (value instanceof List) {
       List values = (List) value;
-
-      List<Object> items = new ArrayList<Object>(values.size());
       Iterator iterator = values.iterator();
 
+      List<Object> items = new ArrayList<Object>(values.size());
       while (iterator.hasNext()) {
         items.add(fromProtoValue(field, iterator.next()));
       }
@@ -193,8 +209,8 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       Long l = (Long) value;
       return new Integer(l.intValue());
     case ENUM:
-      Keyword key = (Keyword) value;
-      String name = key.getName().toUpperCase().replaceAll("-","_");
+      String name = (value instanceof Keyword) ? ((Keyword) value).getName() : (String) value;
+      name = name.toUpperCase().replaceAll("-","_");
       Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
       Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
 			if (enum_value == null) {
@@ -216,13 +232,21 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
     }
   }
 
-  protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
+  protected void addField(DynamicMessage.Builder builder, Keyword key, Object val) {
+    addField(builder, def.fieldDescriptor(key), val);
+  }
+
+  protected void addField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
     if (field == null) return;
 
     if (field.isRepeated()) {
-      builder.clearField(field);
-      for (ISeq s = RT.seq(val); s != null; s = s.next()) {
-        Object value = toProtoValue(field, s.first());
+      if (val instanceof Sequential) {
+        for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+          Object value = toProtoValue(field, s.first());
+          builder.addRepeatedField(field, value);
+        }
+      } else {
+        Object value = toProtoValue(field, val);
         builder.addRepeatedField(field, value);
       }
     } else {
@@ -236,9 +260,42 @@ public Obj withMeta(IPersistentMap meta) {
     return new PersistentProtocolBufferMap(meta(), def, message);
   }
 
+  public boolean contains(Object key){
+    if (key instanceof IPersistentMap) {
+      for (ISeq s = RT.seq(key); s != null; s = s.next()) {
+        Map.Entry e = (Map.Entry) s.first();
+        Object v = e.getValue();
+        Object value = valAt(e.getKey());
+
+        if (value instanceof APersistentVector) {
+          APersistentVector vec = (APersistentVector) value;
+          if (!vec.contains(v)) return false;
+        } else if (value instanceof IPersistentSet) {
+          IPersistentSet set = (IPersistentSet) value;
+          if (!set.contains(v)) return false;
+        } else {
+          if (value != v) return false;
+        }
+      }
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   public boolean containsKey(Object key) {
-    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
-    return message().hasField(field);
+    if (key instanceof IPersistentMap) {
+      return contains(key);
+    } else {
+      Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+      if (field == null) {
+        return false;
+      } else if (field.isRepeated()) {
+        return message().getRepeatedFieldCount(field) > 0;
+      } else {
+        return message().hasField(field);
+      }
+    }
   }
 
   public IMapEntry entryAt(Object key) {
@@ -247,7 +304,7 @@ public IMapEntry entryAt(Object key) {
   }
 
   public Object valAt(Object key) {
-    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return null;
     return fromProtoValue(field, message().getField(field));
   }
@@ -259,10 +316,12 @@ public Object valAt(Object key, Object notFound) {
 
   public IPersistentMap assoc(Object key, Object val) {
     DynamicMessage.Builder builder = builder();
-    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
     if (field == null) return this;
-    setField(builder, field, val);
+    if (field.isRepeated()) builder.clearField(field);
+    addField(builder, field, val);
+
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
@@ -272,27 +331,26 @@ public IPersistentMap assocEx(Object key, Object val) throws Exception {
   }
 
   public IPersistentCollection cons(Object o) {
+    DynamicMessage.Builder builder = builder();
+
     if (o instanceof Map.Entry) {
       Map.Entry e = (Map.Entry) o;
-      return assoc(e.getKey(), e.getValue());
+      addField(builder, (Keyword) e.getKey(), e.getValue());
     }	else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector) o;
       if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
-      return assoc(v.nth(0), v.nth(1));
-    }
-
-    DynamicMessage.Builder builder = builder();
-
-    for(ISeq s = RT.seq(o); s != null; s = s.next()) {
-      Map.Entry e = (Map.Entry) s.first();
-      Keyword key = (Keyword) e.getKey();
-      setField(builder, def.fieldDescriptor(key), e.getValue());
+      addField(builder, (Keyword) v.nth(0), v.nth(1));
+    } else {
+      for (ISeq s = RT.seq(o); s != null; s = s.next()) {
+        Map.Entry e = (Map.Entry) s.first();
+        addField(builder, (Keyword) e.getKey(), e.getValue());
+      }
     }
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
   public IPersistentMap without(Object key) throws Exception {
-    Descriptors.FieldDescriptor field = def.fieldDescriptor((Keyword) key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return this;
     if (field.isRequired()) throw new Exception("Can't remove required field");
 

From 06170b26c1f678b06fed860d00c86842469950db Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Mon, 15 Mar 2010 16:48:40 -0700
Subject: [PATCH 024/525] add tests

---
 .gitignore            |  3 ++-
 src/test.clj          | 14 +++++++++++++
 src/test/.gitignore   |  1 +
 src/test/protobuf.clj | 49 +++++++++++++++++++++++++++++++++++++++++++
 src/test/test.proto   | 22 +++++++++++++++++++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 src/test.clj
 create mode 100644 src/test/.gitignore
 create mode 100644 src/test/protobuf.clj
 create mode 100644 src/test/test.proto

diff --git a/.gitignore b/.gitignore
index e666a96..c2a5519 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 lib
 classes
-*.jar
\ No newline at end of file
+*.jar
+*.class
\ No newline at end of file
diff --git a/src/test.clj b/src/test.clj
new file mode 100644
index 0000000..ff560d4
--- /dev/null
+++ b/src/test.clj
@@ -0,0 +1,14 @@
+(use 'clojure.test)
+
+(def test-names [:protobuf])
+
+(def test-namespaces
+     (map #(symbol (str "test." (name %)))
+          test-names))
+
+(defn run []
+  (println "Loading tests...")
+  (apply require :reload-all test-namespaces)
+  (apply run-tests test-namespaces))
+
+(run)
\ No newline at end of file
diff --git a/src/test/.gitignore b/src/test/.gitignore
new file mode 100644
index 0000000..289500b
--- /dev/null
+++ b/src/test/.gitignore
@@ -0,0 +1 @@
+Proto.java
\ No newline at end of file
diff --git a/src/test/protobuf.clj b/src/test/protobuf.clj
new file mode 100644
index 0000000..05327ed
--- /dev/null
+++ b/src/test/protobuf.clj
@@ -0,0 +1,49 @@
+(ns test.protobuf
+  (:use protobuf)
+  (:use clojure.test))
+
+(defprotobuf Foo test.protobuf.Proto Foo)
+(defprotobuf Bar test.protobuf.Proto Bar)
+
+(deftest protobuf-methods
+  (testing "conj"
+    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
+      (let [p (conj p {:info "bar"})]
+        (is (= 5     (:num p)))
+        (is (= "bar" (:info p)))
+        (is (= ["little" "yellow"] (:tags p))))
+      (let [p (conj p {:tags ["different"]})]
+        (is (= ["little" "yellow" "different"] (:tags p))))
+      (let [p (conj p {:tags ["different"] :info "very"})]
+        (is (= ["little" "yellow" "different"] (:tags p)))
+        (is (= "very" (:info p))))
+      ))
+  (testing "assoc"
+    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
+      (let [p (assoc p :info "baz" :tags ["nuprin"])]
+        (is (= ["nuprin"] (:tags p)))
+        (is (= "baz"      (:info p))))
+      (let [p (assoc p "responses" [:yes :no :maybe :no "yes"])]
+        (is (= [:yes :no :maybe :no :yes] (:responses p))))
+      (let [p (assoc p :tags "aspirin")]
+        (is (= ["aspirin"] (:tags p))))
+      ))
+  (testing "dissoc"
+    (let [p (protobuf Foo :num 5 :tags ["fast" "shiny"])]
+      (let [p (dissoc p :info :tags)]
+        (is (= [] (:tags p)))
+        (is (= "" (:info p))))
+      ))
+  (testing "contains?"
+    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
+      (is (contains? p :num))
+      (is (contains? p :tags))
+      (is (contains? p {:num 5}))
+      (is (contains? p {:tags "yellow"}))
+      (is (not (contains? p {:info "nuprin"})))
+      (is (not (contains? p :sdsfsdfd)))
+      (is (not (contains? p {:num 6})))
+      (is (not (contains? p {:tags "big"})))
+      ))
+
+  )
diff --git a/src/test/test.proto b/src/test/test.proto
new file mode 100644
index 0000000..b105e79
--- /dev/null
+++ b/src/test/test.proto
@@ -0,0 +1,22 @@
+package test.protobuf;
+
+option java_outer_classname = "Proto";
+
+message Foo {
+  required uint32 num  = 1;
+  optional string info = 2;
+  repeated string tags = 3;
+  repeated Response responses = 4;
+
+  enum Response {
+    YES   = 0;
+    NO    = 1;
+    MAYBE = 1;
+  }
+}
+
+message Bar {
+  repeated string tags = 1;
+  optional string type = 2;
+  optional string data = 3;
+}
\ No newline at end of file

From cdb6a27a022e19f11dd9e9d65d1ca60195775362 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 26 Mar 2010 17:35:52 -0700
Subject: [PATCH 025/525] first pass at clojure protobuf type extensions

---
 build.xml                                     | 19 ++++--
 proto/.gitignore                              |  2 +
 proto/collections.proto                       | 10 ++++
 .../protobuf/PersistentProtocolBufferMap.java | 59 ++++++++++++++++---
 src/test/test.proto                           |  4 +-
 5 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 proto/.gitignore
 create mode 100644 proto/collections.proto

diff --git a/build.xml b/build.xml
index ebeb9e6..3511238 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
 
   <property name="repository.protobuf" value="http://protobuf.googlecode.com/files"/>
   <property name="dep.protobuf" value="protobuf-2.3.0"/>
-  <property name="protobuf" value="lib/${dep.protobuf}"/>  
+  <property name="protobuf" value="lib/${dep.protobuf}"/>
 
   <property name="install_prefix" value="/usr/local"/>
 
@@ -61,12 +61,19 @@
   </target>
 
   <target name="compile_protobuf" depends="make_protobuf">
-    <exec dir="${protobuf}/java" executable="../src/protoc">
-      <arg value="--java_out=src/main/java"/>
-      <arg value="-I../src"/>
-      <arg value="../src/google/protobuf/descriptor.proto"/>
+    <exec executable="mkdir" failonerror="true">
+      <arg value="-p"/>
+      <arg line="proto/google/protobuf proto/src"/>
     </exec>
-    <javac srcdir="${protobuf}/java/src/main/java" destdir="classes"/>
+    <exec executable="cp" failonerror="true">
+      <arg line="${protobuf}/src/google/protobuf/descriptor.proto proto/google/protobuf"/>
+    </exec>
+    <exec dir="proto" executable="../${protobuf}/src/protoc">
+      <arg value="--java_out=src"/>
+      <arg value="google/protobuf/descriptor.proto"/>
+      <arg value="collections.proto"/>
+    </exec>
+    <javac srcdir="proto/src" destdir="classes"/>
   </target>
 
   <available file="${clojure.jar}" property="has_clojure"/>
diff --git a/proto/.gitignore b/proto/.gitignore
new file mode 100644
index 0000000..9387755
--- /dev/null
+++ b/proto/.gitignore
@@ -0,0 +1,2 @@
+descriptor.proto
+*.java
\ No newline at end of file
diff --git a/proto/collections.proto b/proto/collections.proto
new file mode 100644
index 0000000..49f0cb2
--- /dev/null
+++ b/proto/collections.proto
@@ -0,0 +1,10 @@
+import "google/protobuf/descriptor.proto";
+
+option java_package = "clojure.protobuf";
+option java_outer_classname = "Collections";
+
+extend google.protobuf.FieldOptions {
+  optional bool   set    = 52001;
+  optional bool   map    = 52002;
+  optional string map_by = 52003;
+}
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 1e97ff7..204d1a6 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -20,6 +20,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Descriptors;
+import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.CodedInputStream;
 
 public class PersistentProtocolBufferMap extends APersistentMap { //implements IPersistentSet{
@@ -157,8 +158,8 @@ protected DynamicMessage.Builder builder() {
     }
   }
 
-  static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword = new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
-
+  static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword =
+     new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
   static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
     Keyword keyword = enum_to_keyword.get(enum_value);
     if (keyword == null) {
@@ -169,23 +170,67 @@ static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_valu
     return keyword;
   }
 
+
+  static Keyword k_null = Keyword.intern(Symbol.intern(""));
+  static ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword> map_field_by =
+     new ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword>();
+  static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
+    Keyword keyword = map_field_by.get(field);
+    if (keyword == null) {
+      String name = field.getOptions().getExtension(Collections.mapBy);
+
+      name = name.toLowerCase().replaceAll("_","-");
+      keyword = Keyword.intern(Symbol.intern(name));
+      map_field_by.putIfAbsent(field, keyword);
+    }
+    return keyword == k_null ? null : keyword;
+  }
+
+  static Keyword k_key = Keyword.intern(Symbol.intern("key"));
+  static Keyword k_val = Keyword.intern(Symbol.intern("val"));
   static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
     if (value instanceof List) {
       List values = (List) value;
       Iterator iterator = values.iterator();
+      List<Object> items;
+
+      Keyword map_field_by = mapFieldBy(field);
+      DescriptorProtos.FieldOptions options = field.getOptions();
+      if (map_field_by != null) {
+        items = new ArrayList<Object>(values.size() * 2);
 
-      List<Object> items = new ArrayList<Object>(values.size());
-      while (iterator.hasNext()) {
-        items.add(fromProtoValue(field, iterator.next()));
+        while (iterator.hasNext()) {
+          PersistentProtocolBufferMap protobuf = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
+          items.add(protobuf.valAt(map_field_by));
+          items.add(protobuf);
+        }
+        return PersistentHashMap.create(items);
+      } else if (options.getExtension(Collections.map)) {
+        items = new ArrayList<Object>(values.size() * 2);
+        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        Descriptors.FieldDescriptor key = def.fieldDescriptor(k_key);
+        Descriptors.FieldDescriptor val = def.fieldDescriptor(k_val);
+
+        while (iterator.hasNext()) {
+          DynamicMessage message = (DynamicMessage) iterator.next();
+          items.add(fromProtoValue(key, message.getField(key)));
+          items.add(fromProtoValue(val, message.getField(val)));
+        }
+        return PersistentHashMap.create(items);
+      } else {
+        items = new ArrayList<Object>(values.size());
+        while (iterator.hasNext()) {
+          items.add(fromProtoValue(field, iterator.next()));
+        }
+        return options.getExtension(Collections.set) ? PersistentHashSet.create(items) : PersistentVector.create(items);
       }
-      return PersistentVector.create(items);
     } else {
       switch (field.getJavaType()) {
       case ENUM:
         Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor) value;
         return enumToKeyword(e);
       case MESSAGE:
-        Def def  = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
         DynamicMessage message = (DynamicMessage) value;
 
         // Total hack because getField() doesn't return an empty array for repeated messages.
diff --git a/src/test/test.proto b/src/test/test.proto
index b105e79..3f1a392 100644
--- a/src/test/test.proto
+++ b/src/test/test.proto
@@ -1,4 +1,5 @@
 package test.protobuf;
+import "collections.proto";
 
 option java_outer_classname = "Proto";
 
@@ -6,7 +7,8 @@ message Foo {
   required uint32 num  = 1;
   optional string info = 2;
   repeated string tags = 3;
-  repeated Response responses = 4;
+  repeated string tag_set = 4 [(set) = true];
+  repeated Response responses = 5;
 
   enum Response {
     YES   = 0;

From 4fbb4b330644d40199aa85012076a6d7bb9713c6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Mon, 29 Mar 2010 18:17:59 -0700
Subject: [PATCH 026/525] collection extensions are working

---
 README.md                                     |  40 ++++++-
 build.xml                                     |   2 +-
 .../protobuf/PersistentProtocolBufferMap.java | 108 +++++++++---------
 src/test/protobuf.clj                         |  62 ++++++----
 src/test/test.proto                           |  27 +++--
 5 files changed, 148 insertions(+), 91 deletions(-)

diff --git a/README.md b/README.md
index 2e235ce..ecf6448 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ they are WAY faster to serialize and deserialize than standard Clojure objects.
 Write a `.proto` file:
 
     message Person {
-      required int32 id = 1;
-      required string name = 2;
+      required int32  id    = 1;
+      required string name  = 2;
       optional string email = 3;
-      repeated string nicknames = 4;
+      repeated string likes = 4;
     }
 
 Compile the file to Java:
@@ -28,6 +28,9 @@ Now you can use the protocol buffer in clojure:
     (assoc p :name "Bill"))
     => {:id 4, :name "Bill", :email "bob@example.com"}
 
+    (assoc p :likes ["climbing" "running" "jumping"])
+    => {:id 4, name "Bob", :email "bob@example.com", :likes ["climbing" "running" "jumping"]}
+
     (def b (protobuf-bytes p))
     => #<byte[] [B@7cbe41ec>
 
@@ -37,6 +40,37 @@ Now you can use the protocol buffer in clojure:
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
 
+## Collection extensions
+
+Clojure-protobuf supports extensions to protocol buffers which provide sets and maps using
+repeated fields. To use these, you must import the extension file and include it when compiling. For example:
+
+    import "collections.proto";
+    message Photo {
+      required int32  id     = 1;
+      required string path   = 2;
+      repeated string labels = 3 [(set)    = true];
+      repeated Attr   attrs  = 4 [(map)    = true];
+      repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+      message Attr {
+        required string key = 1;
+        optional string val = 2;
+      }
+
+      message Tag {
+        required int32 person_id = 1;
+        optional int32 x_coord   = 2;
+        optional int32 y_coord   = 3;
+        optional int32 width     = 4;
+        optional int32 height    = 5;
+      }
+    }
+
+Compile the file to Java:
+
+     protoc --java_out=. -I<clojure-protobuf-path>/proto/ -I. example.proto
+
 ## Installation
 
 To download clojure.jar and google's protobuf source automatically and install protoc:
diff --git a/build.xml b/build.xml
index 3511238..3bed496 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@
   </path>
 
   <target name="compile" depends="compile_protobuf,fetch_clojure">
-    <javac srcdir="src/jvm" destdir="classes" classpathref="classpath"/>
+    <javac srcdir="src/jvm" destdir="classes" classpathref="classpath" debug="true"/>
     <java classname="clojure.lang.Compile" classpathref="classpath" failonerror="true">
       <sysproperty key="clojure.compile.path" value="classes"/>
       <arg value="protobuf"/>
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 204d1a6..0677724 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -23,7 +23,7 @@
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.CodedInputStream;
 
-public class PersistentProtocolBufferMap extends APersistentMap { //implements IPersistentSet{
+public class PersistentProtocolBufferMap extends APersistentMap {
   public static class Def {
     final Descriptors.Descriptor type;
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
@@ -192,37 +192,46 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
     if (value instanceof List) {
       List values = (List) value;
       Iterator iterator = values.iterator();
-      List<Object> items;
 
       Keyword map_field_by = mapFieldBy(field);
       DescriptorProtos.FieldOptions options = field.getOptions();
       if (map_field_by != null) {
-        items = new ArrayList<Object>(values.size() * 2);
-
+        ITransientMap map = PersistentHashMap.EMPTY.asTransient();
         while (iterator.hasNext()) {
-          PersistentProtocolBufferMap protobuf = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
-          items.add(protobuf.valAt(map_field_by));
-          items.add(protobuf);
+          PersistentProtocolBufferMap val = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
+          Object key = val.valAt(map_field_by);
+          PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(key);
+          if (existing != null) {
+            map.assoc(key, existing.cons(val));
+          } else {
+            map.assoc(key, val);
+          }
         }
-        return PersistentHashMap.create(items);
+        return map.persistent();
       } else if (options.getExtension(Collections.map)) {
-        items = new ArrayList<Object>(values.size() * 2);
         Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-        Descriptors.FieldDescriptor key = def.fieldDescriptor(k_key);
-        Descriptors.FieldDescriptor val = def.fieldDescriptor(k_val);
+        Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
+        Descriptors.FieldDescriptor val_field = def.fieldDescriptor(k_val);
 
+        ITransientMap map = PersistentHashMap.EMPTY.asTransient();
         while (iterator.hasNext()) {
           DynamicMessage message = (DynamicMessage) iterator.next();
-          items.add(fromProtoValue(key, message.getField(key)));
-          items.add(fromProtoValue(val, message.getField(val)));
+          Object key = fromProtoValue(key_field, message.getField(key_field));
+          Object val = fromProtoValue(val_field, message.getField(val_field));
+          Object existing = map.valAt(key);
+          if (existing != null && existing instanceof IPersistentCollection) {
+            map.assoc(key, ((IPersistentCollection) existing).cons(val));
+          } else {
+            map.assoc(key, val);
+          }
         }
-        return PersistentHashMap.create(items);
+        return map.persistent();
       } else {
-        items = new ArrayList<Object>(values.size());
+        List<Object> list = new ArrayList<Object>(values.size());
         while (iterator.hasNext()) {
-          items.add(fromProtoValue(field, iterator.next()));
+          list.add(fromProtoValue(field, iterator.next()));
         }
-        return options.getExtension(Collections.set) ? PersistentHashSet.create(items) : PersistentVector.create(items);
+        return options.getExtension(Collections.set) ? PersistentHashSet.create(list) : PersistentVector.create(list);
       }
     } else {
       switch (field.getJavaType()) {
@@ -285,17 +294,37 @@ protected void addField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
     if (field == null) return;
 
     if (field.isRepeated()) {
-      if (val instanceof Sequential) {
+      if (val instanceof Sequential || val instanceof IPersistentSet) {
         for (ISeq s = RT.seq(val); s != null; s = s.next()) {
           Object value = toProtoValue(field, s.first());
           builder.addRepeatedField(field, value);
         }
       } else {
-        Object value = toProtoValue(field, val);
-        builder.addRepeatedField(field, value);
+        Keyword map_field_by = mapFieldBy(field);
+        if (map_field_by != null) {
+          for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+            Map.Entry e = (Map.Entry) s.first();
+            IPersistentMap map = (IPersistentMap) e.getValue();
+            Object value = toProtoValue(field, map.assoc(map_field_by, e.getKey()));
+            builder.addRepeatedField(field, value);
+          }
+        } else if (field.getOptions().getExtension(Collections.map)) {
+          for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+            Map.Entry e = (Map.Entry) s.first();
+            Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
+            Object value = toProtoValue(field, new PersistentArrayMap(map));
+            builder.addRepeatedField(field, value);
+          }
+        } else {
+          Object value = toProtoValue(field, val);
+          builder.addRepeatedField(field, value);
+        }
       }
     } else {
       Object value = toProtoValue(field, val);
+      if (value instanceof DynamicMessage) {
+        value = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) value);
+      }
       builder.setField(field, value);
     }
   }
@@ -305,41 +334,14 @@ public Obj withMeta(IPersistentMap meta) {
     return new PersistentProtocolBufferMap(meta(), def, message);
   }
 
-  public boolean contains(Object key){
-    if (key instanceof IPersistentMap) {
-      for (ISeq s = RT.seq(key); s != null; s = s.next()) {
-        Map.Entry e = (Map.Entry) s.first();
-        Object v = e.getValue();
-        Object value = valAt(e.getKey());
-
-        if (value instanceof APersistentVector) {
-          APersistentVector vec = (APersistentVector) value;
-          if (!vec.contains(v)) return false;
-        } else if (value instanceof IPersistentSet) {
-          IPersistentSet set = (IPersistentSet) value;
-          if (!set.contains(v)) return false;
-        } else {
-          if (value != v) return false;
-        }
-      }
-      return true;
-    } else {
-      return false;
-    }
-  }
-
   public boolean containsKey(Object key) {
-    if (key instanceof IPersistentMap) {
-      return contains(key);
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+    if (field == null) {
+      return false;
+    } else if (field.isRepeated()) {
+      return message().getRepeatedFieldCount(field) > 0;
     } else {
-      Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-      if (field == null) {
-        return false;
-      } else if (field.isRepeated()) {
-        return message().getRepeatedFieldCount(field) > 0;
-      } else {
-        return message().hasField(field);
-      }
+      return message().hasField(field);
     }
   }
 
diff --git a/src/test/protobuf.clj b/src/test/protobuf.clj
index 05327ed..3062c3f 100644
--- a/src/test/protobuf.clj
+++ b/src/test/protobuf.clj
@@ -3,47 +3,59 @@
   (:use clojure.test))
 
 (defprotobuf Foo test.protobuf.Proto Foo)
-(defprotobuf Bar test.protobuf.Proto Bar)
 
-(deftest protobuf-methods
+(deftest protobuf-simple
   (testing "conj"
-    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
-      (let [p (conj p {:info "bar"})]
-        (is (= 5     (:num p)))
-        (is (= "bar" (:info p)))
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+      (let [p (conj p {:label "bar"})]
+        (is (= 5     (:id p)))
+        (is (= "bar" (:label p)))
         (is (= ["little" "yellow"] (:tags p))))
       (let [p (conj p {:tags ["different"]})]
         (is (= ["little" "yellow" "different"] (:tags p))))
-      (let [p (conj p {:tags ["different"] :info "very"})]
+      (let [p (conj p {:tags ["different"] :label "very"})]
         (is (= ["little" "yellow" "different"] (:tags p)))
-        (is (= "very" (:info p))))
+        (is (= "very" (:label p))))
       ))
   (testing "assoc"
-    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
-      (let [p (assoc p :info "baz" :tags ["nuprin"])]
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+      (let [p (assoc p :label "baz" :tags ["nuprin"])]
         (is (= ["nuprin"] (:tags p)))
-        (is (= "baz"      (:info p))))
+        (is (= "baz"      (:label p))))
       (let [p (assoc p "responses" [:yes :no :maybe :no "yes"])]
         (is (= [:yes :no :maybe :no :yes] (:responses p))))
       (let [p (assoc p :tags "aspirin")]
         (is (= ["aspirin"] (:tags p))))
       ))
   (testing "dissoc"
-    (let [p (protobuf Foo :num 5 :tags ["fast" "shiny"])]
-      (let [p (dissoc p :info :tags)]
+    (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"])]
+      (let [p (dissoc p :label :tags)]
         (is (= [] (:tags p)))
-        (is (= "" (:info p))))
+        (is (= "" (:label p))))
       ))
-  (testing "contains?"
-    (let [p (protobuf Foo :num 5 :tags ["little" "yellow"])]
-      (is (contains? p :num))
-      (is (contains? p :tags))
-      (is (contains? p {:num 5}))
-      (is (contains? p {:tags "yellow"}))
-      (is (not (contains? p {:info "nuprin"})))
-      (is (not (contains? p :sdsfsdfd)))
-      (is (not (contains? p {:num 6})))
-      (is (not (contains? p {:tags "big"})))
+  )
+
+(deftest protobuf-extended
+  (testing "create"
+    (let [p (protobuf Foo :id 5 :tag-set ["little" "yellow"] :attr-map {"size" "little", "color" "yellow", "style" "different"})]
+      (is (= #{"little" "yellow"} (:tag-set p)))
+      (is (associative? (:attr-map p)))
+      (is (= "different" (get-in p [:attr-map "style"])))
+      (is (= "little"    (get-in p [:attr-map "size" ])))
+      (is (= "yellow"    (get-in p [:attr-map "color"])))
+      )
+    (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
+      (let [five ((p :foo-by-id) 5)
+            six  ((p :foo-by-id) 6)]
+        (is (= 5      (five :id)))
+        (is (= "five" (five :label)))
+        (is (= 6      (six  :id)))
+        (is (= "six"  (six  :label))))
       ))
+  (testing "conj"
+    (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
+      (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["even"]}}})]
+        (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
+        (is (= ["even" "even"]  (get-in p [:foo-by-id 6 :tags]))))
+      )))
 
-  )
diff --git a/src/test/test.proto b/src/test/test.proto
index 3f1a392..b526634 100644
--- a/src/test/test.proto
+++ b/src/test/test.proto
@@ -4,10 +4,10 @@ import "collections.proto";
 option java_outer_classname = "Proto";
 
 message Foo {
-  required uint32 num  = 1;
-  optional string info = 2;
-  repeated string tags = 3;
-  repeated string tag_set = 4 [(set) = true];
+  required uint32   id        = 1;
+  optional string   label     = 2;
+  repeated string   tags      = 3;
+  optional Foo      parent    = 4;
   repeated Response responses = 5;
 
   enum Response {
@@ -15,10 +15,19 @@ message Foo {
     NO    = 1;
     MAYBE = 1;
   }
+
+  repeated string tag_set   = 10 [(set)    = true];
+  repeated Pair   attr_map  = 11 [(map)    = true];
+  repeated Foo    foo_by_id = 12 [(map_by) = "id"];
+  repeated Group  groups    = 13 [(map)    = true];
+}
+
+message Pair {
+  required string key = 1;
+  required string val = 2;
 }
 
-message Bar {
-  repeated string tags = 1;
-  optional string type = 2;
-  optional string data = 3;
-}
\ No newline at end of file
+message Group {
+  required string key = 1;
+  repeated Foo    val = 2;
+}

From 72a3411e71c1eb8ab76f8ea80d91f944d0356a28 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 30 Mar 2010 15:11:58 -0700
Subject: [PATCH 027/525] add protoclj compiler and ant task for tests

---
 build.xml                        | 50 +++++++++++++++++++++++++++-----
 proto/.gitignore                 |  2 --
 {proto => src}/collections.proto |  2 +-
 src/protoclj                     | 16 ++++++++++
 src/test/test.proto              |  2 +-
 5 files changed, 61 insertions(+), 11 deletions(-)
 delete mode 100644 proto/.gitignore
 rename {proto => src}/collections.proto (99%)
 create mode 100755 src/protoclj

diff --git a/build.xml b/build.xml
index 3bed496..1834117 100644
--- a/build.xml
+++ b/build.xml
@@ -55,25 +55,43 @@
 
   <target name="install" depends="make_protobuf">
     <echo message="Installing to ${install_prefix}/"/>
+    <exec executable="mkdir" failonerror="true">
+      <arg value="-p"/>
+      <arg line="lib/install/var/java lib/install/include/clojure/protobuf"/>
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg line="src/protoclj lib/install/bin"/>
+    </exec>
+    <chmod file="${install_prefix}/bin/protoclj" perm="+x"/>
+    <exec executable="cp" failonerror="true">
+      <arg line="src/collections.proto lib/install/include/clojure/protobuf"/>
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg line="clojure-protobuf.jar lib/install/var/java"/>
+    </exec>
     <exec executable="cp" failonerror="true">
       <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
     </exec>
   </target>
 
-  <target name="compile_protobuf" depends="make_protobuf">
+  <available file="${protobuf}/src/clojure/protobuf/Collections.java" property="proto_compiled"/>
+  <target name="compile_protobuf" depends="make_protobuf" unless="proto_compiled">
     <exec executable="mkdir" failonerror="true">
       <arg value="-p"/>
-      <arg line="proto/google/protobuf proto/src"/>
+      <arg line="${protobuf}/src/clojure/protobuf"/>
     </exec>
     <exec executable="cp" failonerror="true">
-      <arg line="${protobuf}/src/google/protobuf/descriptor.proto proto/google/protobuf"/>
+      <arg line="src/collections.proto ${protobuf}/src/clojure/protobuf"/>
     </exec>
-    <exec dir="proto" executable="../${protobuf}/src/protoc">
-      <arg value="--java_out=src"/>
+    <exec dir="${protobuf}/src" executable="protoc">
+      <arg value="--java_out=."/>
       <arg value="google/protobuf/descriptor.proto"/>
-      <arg value="collections.proto"/>
+      <arg value="clojure/protobuf/collections.proto"/>
     </exec>
-    <javac srcdir="proto/src" destdir="classes"/>
+    <javac srcdir="${protobuf}/src" destdir="classes">
+      <include name="com/google/protobuf/DescriptorProtos.java"/>
+      <include name="clojure/protobuf/Collections.java"/>
+    </javac>
   </target>
 
   <available file="${clojure.jar}" property="has_clojure"/>
@@ -87,6 +105,7 @@
   <path id="classpath">
     <pathelement location="${clojure.jar}"/>
     <pathelement location="src/clj"/>
+    <pathelement location="src"/>
     <pathelement location="classes"/>
   </path>
 
@@ -102,4 +121,21 @@
     <jar destfile="clojure-protobuf.jar" basedir="classes"/>
   </target>
 
+  <target name="compile_test_proto" depends="compile">
+    <exec dir="src" executable="protoc">
+      <arg value="--java_out=."/>
+      <arg value="-I."/>
+      <arg value="-I../${protobuf}/src"/>
+      <arg value="test/test.proto"/>
+    </exec>
+    <javac srcdir="src" classpathref="classpath">
+      <include name="test/protobuf/Proto.java"/>
+    </javac>
+  </target>
+
+  <target name="test" depends="compile_test_proto">
+    <java classname="clojure.main" classpathref="classpath" failonerror="true" fork="true">
+      <arg value="src/test.clj"/>
+    </java>
+  </target>
 </project>
diff --git a/proto/.gitignore b/proto/.gitignore
deleted file mode 100644
index 9387755..0000000
--- a/proto/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-descriptor.proto
-*.java
\ No newline at end of file
diff --git a/proto/collections.proto b/src/collections.proto
similarity index 99%
rename from proto/collections.proto
rename to src/collections.proto
index 49f0cb2..9883606 100644
--- a/proto/collections.proto
+++ b/src/collections.proto
@@ -7,4 +7,4 @@ extend google.protobuf.FieldOptions {
   optional bool   set    = 52001;
   optional bool   map    = 52002;
   optional string map_by = 52003;
-}
\ No newline at end of file
+}
diff --git a/src/protoclj b/src/protoclj
new file mode 100755
index 0000000..c5d905f
--- /dev/null
+++ b/src/protoclj
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ -L $0 ]; then
+  FILE=`readlink $0`
+else
+  FILE=$0
+fi
+DIR=`dirname $FILE`
+TMP_DIR="/tmp/protoclj-`date +%s`"
+SRC_DIR=${2:-'.'}
+CLASS_DIR=${2:-$SRC_DIR}
+
+mkdir -p $TMP_DIR $SRC_DIR $CLASS_DIR
+protoc $1 -I$DIR/../include -I. --java_out=$TMP_DIR
+cp -Rf $TMP_DIR/ $SRC_DIR
+javac -d $CLASS_DIR -cp $DIR/../var/java/clojure-protobuf.jar `find $TMP_DIR -name *.java`
\ No newline at end of file
diff --git a/src/test/test.proto b/src/test/test.proto
index b526634..05a65e0 100644
--- a/src/test/test.proto
+++ b/src/test/test.proto
@@ -1,5 +1,5 @@
 package test.protobuf;
-import "collections.proto";
+import "clojure/protobuf/collections.proto";
 
 option java_outer_classname = "Proto";
 

From 48f24ab02d74c35b13d54aae81fdb3cb1217b505 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 30 Mar 2010 16:56:58 -0700
Subject: [PATCH 028/525] fix install sudo problem

---
 build.xml | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index 1834117..a717c76 100644
--- a/build.xml
+++ b/build.xml
@@ -53,27 +53,6 @@
     </exec>
   </target>
 
-  <target name="install" depends="make_protobuf">
-    <echo message="Installing to ${install_prefix}/"/>
-    <exec executable="mkdir" failonerror="true">
-      <arg value="-p"/>
-      <arg line="lib/install/var/java lib/install/include/clojure/protobuf"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="src/protoclj lib/install/bin"/>
-    </exec>
-    <chmod file="${install_prefix}/bin/protoclj" perm="+x"/>
-    <exec executable="cp" failonerror="true">
-      <arg line="src/collections.proto lib/install/include/clojure/protobuf"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="clojure-protobuf.jar lib/install/var/java"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
-    </exec>
-  </target>
-
   <available file="${protobuf}/src/clojure/protobuf/Collections.java" property="proto_compiled"/>
   <target name="compile_protobuf" depends="make_protobuf" unless="proto_compiled">
     <exec executable="mkdir" failonerror="true">
@@ -119,6 +98,28 @@
 
   <target name="package" depends="compile">
     <jar destfile="clojure-protobuf.jar" basedir="classes"/>
+
+    <exec executable="mkdir" failonerror="true">
+      <arg value="-p"/>
+      <arg line="lib/install/var/java lib/install/include/clojure/protobuf"/>
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg line="src/protoclj lib/install/bin"/>
+    </exec>
+    <chmod file="${install_prefix}/bin/protoclj" perm="+x"/>
+    <exec executable="cp" failonerror="true">
+      <arg line="src/collections.proto lib/install/include/clojure/protobuf"/>
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg line="clojure-protobuf.jar lib/install/var/java"/>
+    </exec>
+  </target>
+
+  <target name="install" depends="package">
+    <echo message="Installing to ${install_prefix}/"/>
+    <exec executable="cp" failonerror="true">
+      <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
+    </exec>
   </target>
 
   <target name="compile_test_proto" depends="compile">

From d423ab9dd19a78a9c45c95d388ec76604a607d5e Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 30 Mar 2010 17:45:31 -0700
Subject: [PATCH 029/525] fun with ant

---
 build.xml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index a717c76..7f9a5f2 100644
--- a/build.xml
+++ b/build.xml
@@ -53,24 +53,31 @@
     </exec>
   </target>
 
-  <available file="${protobuf}/src/clojure/protobuf/Collections.java" property="proto_compiled"/>
+  <path id="classpath">
+    <pathelement location="${clojure.jar}"/>
+    <pathelement location="src/clj"/>
+    <pathelement location="src"/>
+    <pathelement location="classes"/>
+  </path>
+
+  <available file="classes/com/google/protobuf/DescriptorProtos.class" property="proto_compiled"/>
   <target name="compile_protobuf" depends="make_protobuf" unless="proto_compiled">
-    <exec executable="mkdir" failonerror="true">
-      <arg value="-p"/>
-      <arg line="${protobuf}/src/clojure/protobuf"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="src/collections.proto ${protobuf}/src/clojure/protobuf"/>
+    <exec dir="${protobuf}/java" executable="protoc">
+      <arg value="--java_out=src/main/java"/>
+      <arg value="-I../src"/>
+      <arg value="../src/google/protobuf/descriptor.proto"/>
     </exec>
-    <exec dir="${protobuf}/src" executable="protoc">
-      <arg value="--java_out=."/>
-      <arg value="google/protobuf/descriptor.proto"/>
-      <arg value="clojure/protobuf/collections.proto"/>
+    <javac srcdir="${protobuf}/java/src/main" destdir="classes"/>
+  </target>
+
+  <available file="src/jvm/clojure/protobuf/Collections.java" property="collections_proto_compiled"/>
+  <target name="compile_collections_proto" depends="compile_protobuf" unless="collections_proto_compiled">
+    <exec dir="src" executable="protoc">
+      <arg value="--java_out=jvm"/>
+      <arg value="-I."/>
+      <arg value="-I../${protobuf}/src"/>
+      <arg value="collections.proto"/>
     </exec>
-    <javac srcdir="${protobuf}/src" destdir="classes">
-      <include name="com/google/protobuf/DescriptorProtos.java"/>
-      <include name="clojure/protobuf/Collections.java"/>
-    </javac>
   </target>
 
   <available file="${clojure.jar}" property="has_clojure"/>
@@ -81,14 +88,7 @@
     <copy file="lib/${dep.clojure}/clojure.jar" todir="lib"/>
   </target>
 
-  <path id="classpath">
-    <pathelement location="${clojure.jar}"/>
-    <pathelement location="src/clj"/>
-    <pathelement location="src"/>
-    <pathelement location="classes"/>
-  </path>
-
-  <target name="compile" depends="compile_protobuf,fetch_clojure">
+  <target name="compile" depends="compile_protobuf,compile_collections_proto,fetch_clojure">
     <javac srcdir="src/jvm" destdir="classes" classpathref="classpath" debug="true"/>
     <java classname="clojure.lang.Compile" classpathref="classpath" failonerror="true">
       <sysproperty key="clojure.compile.path" value="classes"/>

From d94b2b5828391c3984a4e61e725d932363385be2 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 1 Apr 2010 11:19:49 -0700
Subject: [PATCH 030/525] fix build.xml

---
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 7f9a5f2..c2aa14f 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
 
   <available file="classes/com/google/protobuf/DescriptorProtos.class" property="proto_compiled"/>
   <target name="compile_protobuf" depends="make_protobuf" unless="proto_compiled">
-    <exec dir="${protobuf}/java" executable="protoc">
+    <exec dir="${protobuf}/java" executable="../src/protoc">
       <arg value="--java_out=src/main/java"/>
       <arg value="-I../src"/>
       <arg value="../src/google/protobuf/descriptor.proto"/>
@@ -72,7 +72,7 @@
 
   <available file="src/jvm/clojure/protobuf/Collections.java" property="collections_proto_compiled"/>
   <target name="compile_collections_proto" depends="compile_protobuf" unless="collections_proto_compiled">
-    <exec dir="src" executable="protoc">
+    <exec dir="src" executable="../${protobuf}/src/protoc">
       <arg value="--java_out=jvm"/>
       <arg value="-I."/>
       <arg value="-I../${protobuf}/src"/>
@@ -123,7 +123,7 @@
   </target>
 
   <target name="compile_test_proto" depends="compile">
-    <exec dir="src" executable="protoc">
+    <exec dir="src" executable="../${protobuf}/src/protoc">
       <arg value="--java_out=."/>
       <arg value="-I."/>
       <arg value="-I../${protobuf}/src"/>

From e7e80062e10289cb8d0cb3b69aa1224e44a02809 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 2 Apr 2010 19:11:52 -0700
Subject: [PATCH 031/525] gitignore

---
 src/jvm/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/jvm/.gitignore

diff --git a/src/jvm/.gitignore b/src/jvm/.gitignore
new file mode 100644
index 0000000..e2cb692
--- /dev/null
+++ b/src/jvm/.gitignore
@@ -0,0 +1 @@
+Collections.java
\ No newline at end of file

From dc2aaee05cf8df06f6c624dcbcd43ac11d88b534 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 2 Apr 2010 21:38:21 -0700
Subject: [PATCH 032/525] fix Dependencies passed to FileDescriptor.buildFrom()
 don't match those listed in the

---
 .gitignore                                       |  1 +
 build.xml                                        | 10 +++++-----
 src/{ => jvm/clojure/protobuf}/collections.proto |  0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{ => jvm/clojure/protobuf}/collections.proto (100%)

diff --git a/.gitignore b/.gitignore
index c2a5519..c21b997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 lib
 classes
 *.jar
diff --git a/build.xml b/build.xml
index c2aa14f..7dd67d9 100644
--- a/build.xml
+++ b/build.xml
@@ -72,11 +72,11 @@
 
   <available file="src/jvm/clojure/protobuf/Collections.java" property="collections_proto_compiled"/>
   <target name="compile_collections_proto" depends="compile_protobuf" unless="collections_proto_compiled">
-    <exec dir="src" executable="../${protobuf}/src/protoc">
-      <arg value="--java_out=jvm"/>
+    <exec dir="src/jvm" executable="../../${protobuf}/src/protoc">
+      <arg value="--java_out=."/>
       <arg value="-I."/>
-      <arg value="-I../${protobuf}/src"/>
-      <arg value="collections.proto"/>
+      <arg value="-I../../${protobuf}/src"/>
+      <arg value="clojure/protobuf/collections.proto"/>
     </exec>
   </target>
 
@@ -108,7 +108,7 @@
     </exec>
     <chmod file="${install_prefix}/bin/protoclj" perm="+x"/>
     <exec executable="cp" failonerror="true">
-      <arg line="src/collections.proto lib/install/include/clojure/protobuf"/>
+      <arg line="src/jvm/clojure/protobuf/collections.proto lib/install/include/clojure/protobuf"/>
     </exec>
     <exec executable="cp" failonerror="true">
       <arg line="clojure-protobuf.jar lib/install/var/java"/>
diff --git a/src/collections.proto b/src/jvm/clojure/protobuf/collections.proto
similarity index 100%
rename from src/collections.proto
rename to src/jvm/clojure/protobuf/collections.proto

From a71f69557b8c9d6ae02789a9102b96e92c22358e Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 6 Apr 2010 13:39:31 -0700
Subject: [PATCH 033/525] allow strings for keys in cons

---
 build.xml                                     |  3 ++-
 .../protobuf/PersistentProtocolBufferMap.java | 19 +++++++++----------
 src/test/protobuf.clj                         | 10 ++++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 7dd67d9..c09c8b0 100644
--- a/build.xml
+++ b/build.xml
@@ -126,7 +126,8 @@
     <exec dir="src" executable="../${protobuf}/src/protoc">
       <arg value="--java_out=."/>
       <arg value="-I."/>
-      <arg value="-I../${protobuf}/src"/>
+      <arg value="-Ijvm/"/>
+      <arg value="-I../${protobuf}/src/"/>
       <arg value="test/test.proto"/>
     </exec>
     <javac srcdir="src" classpathref="classpath">
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 0677724..6a8ca6f 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -68,7 +68,9 @@ public DynamicMessage.Builder newBuilder() {
     public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
       if (key == null) return null;
 
-      if (key instanceof Keyword) {
+      if (key instanceof Descriptors.FieldDescriptor) {
+        return (Descriptors.FieldDescriptor) key;
+      } else if (key instanceof Keyword) {
         Keyword keyword = (Keyword) key;
         Descriptors.FieldDescriptor field = keyword_to_field.get(keyword);
         if (field == null) {
@@ -286,12 +288,9 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
     }
   }
 
-  protected void addField(DynamicMessage.Builder builder, Keyword key, Object val) {
-    addField(builder, def.fieldDescriptor(key), val);
-  }
-
-  protected void addField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object val) {
-    if (field == null) return;
+  protected void addField(DynamicMessage.Builder builder, Object key, Object val) {
+    if (key == null) return;
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
     if (field.isRepeated()) {
       if (val instanceof Sequential || val instanceof IPersistentSet) {
@@ -382,15 +381,15 @@ public IPersistentCollection cons(Object o) {
 
     if (o instanceof Map.Entry) {
       Map.Entry e = (Map.Entry) o;
-      addField(builder, (Keyword) e.getKey(), e.getValue());
+      addField(builder, e.getKey(), e.getValue());
     }	else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector) o;
       if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
-      addField(builder, (Keyword) v.nth(0), v.nth(1));
+      addField(builder, v.nth(0), v.nth(1));
     } else {
       for (ISeq s = RT.seq(o); s != null; s = s.next()) {
         Map.Entry e = (Map.Entry) s.first();
-        addField(builder, (Keyword) e.getKey(), e.getValue());
+        addField(builder, e.getKey(), e.getValue());
       }
     }
     return new PersistentProtocolBufferMap(meta(), def, builder);
diff --git a/src/test/protobuf.clj b/src/test/protobuf.clj
index 3062c3f..7f13c91 100644
--- a/src/test/protobuf.clj
+++ b/src/test/protobuf.clj
@@ -33,6 +33,16 @@
         (is (= [] (:tags p)))
         (is (= "" (:label p))))
       ))
+  (testing "string keys"
+    (let [p (protobuf Foo "id" 5 "label" "rad")]
+      (is (= 5 (p :id)))
+      (is (= 5 (p "id")))
+      (is (= "rad" (p :label)))
+      (is (= "rad" (p "label")))
+      (let [p (conj p {"tags" ["check" "it" "out"]})]
+        (is (= ["check" "it" "out"] (p :tags)))
+        (is (= ["check" "it" "out"] (p "tags"))))
+      ))
   )
 
 (deftest protobuf-extended

From 023d915dc72995ef210cf3dd751f3fed1635d367 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 14 Apr 2010 18:37:06 -0700
Subject: [PATCH 034/525] add protodefaults and protofields methods

---
 src/clj/protobuf.clj                             | 10 ++++++++++
 .../protobuf/PersistentProtocolBufferMap.java    | 12 +++++++++++-
 src/test/protobuf.clj                            | 16 +++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index f940df9..ee73d55 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -23,6 +23,16 @@
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
      (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
 
+(defn protodefault [type key]
+  (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)]
+    (.defaultValue type key)))
+
+(defn protofields [type]
+  (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)
+        type #^com.google.protobuf.Descriptors$Descriptor (.getMessageType type)]
+    (map (fn [#^com.google.protobuf.Descriptors$FieldDescriptor field] (keyword (.getName field)))
+         (.getFields type))))
+
 (defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
      (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data)))
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 6a8ca6f..a649857 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -95,9 +95,19 @@ public String getFullName() {
     public Descriptors.Descriptor getMessageType() {
       return type;
     }
+
+    public Object defaultValue(Keyword key) {
+      Descriptors.FieldDescriptor field = fieldDescriptor(key);
+      if (field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE) {
+        if (!field.isRepeated()) return null;
+        return PersistentProtocolBufferMap.fromProtoValue(field, new ArrayList());
+      } else {
+        return PersistentProtocolBufferMap.fromProtoValue(field, field.getDefaultValue());
+      }
+    }
   }
 
-  final Def            def;
+  final Def def;
   final DynamicMessage message;
 
   DynamicMessage built_message;
diff --git a/src/test/protobuf.clj b/src/test/protobuf.clj
index 7f13c91..dde33a7 100644
--- a/src/test/protobuf.clj
+++ b/src/test/protobuf.clj
@@ -43,7 +43,21 @@
         (is (= ["check" "it" "out"] (p :tags)))
         (is (= ["check" "it" "out"] (p "tags"))))
       ))
-  )
+  (testing "protofields"
+    (let [fields '(:id :label :tags :parent :responses :tag_set :attr_map :foo_by_id :groups)]
+      (is (= fields (protofields Foo)))
+      (is (= fields (protofields test.protobuf.Proto$Foo)))))
+  (testing "protodefault"
+    (is (= 0   (protodefault Foo :id)))
+    (is (= ""  (protodefault Foo :label)))
+    (is (= []  (protodefault Foo :tags)))
+    (is (= nil (protodefault Foo :parent)))
+    (is (= []  (protodefault Foo :responses)))
+    (is (= #{} (protodefault Foo :tag_set)))
+    (is (= {}  (protodefault Foo :foo_by_id)))
+    (is (= {}  (protodefault Foo :groups)))
+    (is (= {}  (protodefault test.protobuf.Proto$Foo :groups)))
+  ))
 
 (deftest protobuf-extended
   (testing "create"

From 724e085ef84240eb51f4e00931ef4a7f3cee11a1 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 15 Apr 2010 16:17:11 -0700
Subject: [PATCH 035/525] add test for append with defaults

---
 src/test/protobuf.clj | 18 +++++++++++++++++-
 src/test/test.proto   |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/test/protobuf.clj b/src/test/protobuf.clj
index dde33a7..38360a0 100644
--- a/src/test/protobuf.clj
+++ b/src/test/protobuf.clj
@@ -4,6 +4,9 @@
 
 (defprotobuf Foo test.protobuf.Proto Foo)
 
+(defn catbytes [& args]
+  (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
+
 (deftest protobuf-simple
   (testing "conj"
     (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
@@ -43,12 +46,25 @@
         (is (= ["check" "it" "out"] (p :tags)))
         (is (= ["check" "it" "out"] (p "tags"))))
       ))
+  (testing "append"
+    (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"])
+          q (protobuf Foo :id 43 :tags ["savory"])
+          r (protobuf Foo :label "bad")
+          s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
+          t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
+      (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
+      (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
+      (is (= "rad" (s :label)))
+      (is (= "bad" (t :label)))
+      (is (= ["sweet"] (t :tags)))
+      (is (= ["sweet" "savory"] (s :tags)))
+    ))
   (testing "protofields"
     (let [fields '(:id :label :tags :parent :responses :tag_set :attr_map :foo_by_id :groups)]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields test.protobuf.Proto$Foo)))))
   (testing "protodefault"
-    (is (= 0   (protodefault Foo :id)))
+    (is (= 43  (protodefault Foo :id)))
     (is (= ""  (protodefault Foo :label)))
     (is (= []  (protodefault Foo :tags)))
     (is (= nil (protodefault Foo :parent)))
diff --git a/src/test/test.proto b/src/test/test.proto
index 05a65e0..419cc11 100644
--- a/src/test/test.proto
+++ b/src/test/test.proto
@@ -4,7 +4,7 @@ import "clojure/protobuf/collections.proto";
 option java_outer_classname = "Proto";
 
 message Foo {
-  required uint32   id        = 1;
+  optional uint32   id        = 1 [default = 43];
   optional string   label     = 2;
   repeated string   tags      = 3;
   optional Foo      parent    = 4;

From 0c4ada590689f7a5e7b509cf5b7e402f06b66810 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 15 Apr 2010 16:48:26 -0700
Subject: [PATCH 036/525] fix protoclj script

---
 src/protoclj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protoclj b/src/protoclj
index c5d905f..cbde80c 100755
--- a/src/protoclj
+++ b/src/protoclj
@@ -8,7 +8,7 @@ fi
 DIR=`dirname $FILE`
 TMP_DIR="/tmp/protoclj-`date +%s`"
 SRC_DIR=${2:-'.'}
-CLASS_DIR=${2:-$SRC_DIR}
+CLASS_DIR=${3:-$SRC_DIR}
 
 mkdir -p $TMP_DIR $SRC_DIR $CLASS_DIR
 protoc $1 -I$DIR/../include -I. --java_out=$TMP_DIR

From 5b0714c79cc94178100bd56bf615da05398a0643 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 28 Apr 2010 15:48:02 -0700
Subject: [PATCH 037/525] make cp work on mac and linux

---
 build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c09c8b0..9357555 100644
--- a/build.xml
+++ b/build.xml
@@ -10,6 +10,11 @@
 
   <property name="install_prefix" value="/usr/local"/>
 
+  <condition property="copy_flags" value="-Rf">
+    <and><os family="unix"/><os family="mac"/></and>
+  </condition>
+  <property name="copy_flags" value="-RTf"/>
+
   <target name="init">
     <mkdir dir="lib"/>
     <mkdir dir="classes"/>
@@ -118,7 +123,7 @@
   <target name="install" depends="package">
     <echo message="Installing to ${install_prefix}/"/>
     <exec executable="cp" failonerror="true">
-      <arg line="-Rf ${basedir}/lib/install/ ${install_prefix}"/>
+      <arg line="${copy_flags} ${basedir}/lib/install/ ${install_prefix}"/>
     </exec>
   </target>
 

From ec7ac10de6e11fcba42f8a9d1ccc4e324ced984b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 28 Apr 2010 20:28:57 -0700
Subject: [PATCH 038/525] make protoclj work on linux

---
 src/protoclj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/protoclj b/src/protoclj
index cbde80c..fb3c3a9 100755
--- a/src/protoclj
+++ b/src/protoclj
@@ -12,5 +12,6 @@ CLASS_DIR=${3:-$SRC_DIR}
 
 mkdir -p $TMP_DIR $SRC_DIR $CLASS_DIR
 protoc $1 -I$DIR/../include -I. --java_out=$TMP_DIR
-cp -Rf $TMP_DIR/ $SRC_DIR
-javac -d $CLASS_DIR -cp $DIR/../var/java/clojure-protobuf.jar `find $TMP_DIR -name *.java`
\ No newline at end of file
+cp -Rf $TMP_DIR/* $SRC_DIR
+javac -d $CLASS_DIR -cp $DIR/../var/java/clojure-protobuf.jar `find $TMP_DIR -name *.java`
+rm -rf $TMP_DIR

From 4511e6d2602b2c15e52aeda2138d2d645c0fc8e4 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 5 May 2010 13:24:01 -0700
Subject: [PATCH 039/525] update README

---
 README.md              | 24 ++++++++++++++++++++----
 examples/example.proto | 23 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ecf6448..210b1dc 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ Compile the file to Java:
 Now you can use the protocol buffer in clojure:
 
     (use 'protobuf)
-    (defprotobuf person Example Person)
+    (defprotobuf Person Example$Person)
 
-    (def p (protobuf person :id 4 :name "Bob" :email "bob@example.com"))
+    (def p (protobuf Person :id 4 :name "Bob" :email "bob@example.com"))
     => {:id 4, :name "Bob", :email "bob@example.com"}
 
     (assoc p :name "Bill"))
@@ -31,10 +31,10 @@ Now you can use the protocol buffer in clojure:
     (assoc p :likes ["climbing" "running" "jumping"])
     => {:id 4, name "Bob", :email "bob@example.com", :likes ["climbing" "running" "jumping"]}
 
-    (def b (protobuf-bytes p))
+    (def b (protobuf-dump p))
     => #<byte[] [B@7cbe41ec>
 
-    (protobuf person b)
+    (protobuf-load Person b)
     => {:id 4, :name "Bob", :email "bob@example.com"}
 
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
@@ -71,6 +71,22 @@ Compile the file to Java:
 
      protoc --java_out=. -I<clojure-protobuf-path>/proto/ -I. example.proto
 
+Then you can access the maps in clojure:
+
+    (use 'protobuf)
+    (defprotobuf Photo Example$Photo)
+
+    (def p (protobuf Photo :id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
+                           :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                           :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+    => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
+
+    (def b (protobuf-dump p))
+    => #<byte[] [B@7cbe41ec>
+
+    (protobuf-load Photo b)
+    => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
+
 ## Installation
 
 To download clojure.jar and google's protobuf source automatically and install protoc:
diff --git a/examples/example.proto b/examples/example.proto
index 56b85e2..ca639ac 100644
--- a/examples/example.proto
+++ b/examples/example.proto
@@ -1,3 +1,26 @@
+import "collections.proto";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated string labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2;
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+
 message Person {
   required int32 id = 1;
   required string name = 2;

From 38a5cec472eb507c74274921d33bf300ca7ea744 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Wed, 5 May 2010 14:08:16 -0700
Subject: [PATCH 040/525] add protoclj usage info

---
 README.md    | 19 +++++++++++++++----
 src/protoclj |  6 ++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 210b1dc..84dbe20 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Write a `.proto` file:
 
 Compile the file to Java:
 
-    protoc --java_out=. example.proto
+    protoclj example.proto
 
 Now you can use the protocol buffer in clojure:
 
@@ -69,7 +69,7 @@ repeated fields. To use these, you must import the extension file and include it
 
 Compile the file to Java:
 
-     protoc --java_out=. -I<clojure-protobuf-path>/proto/ -I. example.proto
+     protoclj example.proto
 
 Then you can access the maps in clojure:
 
@@ -87,15 +87,26 @@ Then you can access the maps in clojure:
     (protobuf-load Photo b)
     => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
+## protoclj
+
+When you install clojure-protobuf, a helper script called protoclj is installed that makes
+building .proto files with clojure extensions easier. You can use it like this:
+
+  protoclj package/foo.proto [src] [classes]
+
+Note that if you are using a package in your .proto file, then the file must be in a
+directory structure that corresponds to that package and you must call protoclj from the
+package root.
+
 ## Installation
 
 To download clojure.jar and google's protobuf source automatically and install protoc:
     ant package
-    ant install
+    sudo ant install
 
 You can also specify options to configure (like the install prefix):
     ant package -Dconfigure='--prefix=/opt/local'
-    ant install
+    sudo ant install
 
 Or you can specify a specific location for clojure.jar or the protobuf source:
     ant package -Dclojure.jar=$HOME/lib/java/clojure-1.1.0.jar -Dprotobuf=$HOME/Downloads/protobuf-2.3.0
diff --git a/src/protoclj b/src/protoclj
index fb3c3a9..92f3c23 100755
--- a/src/protoclj
+++ b/src/protoclj
@@ -1,10 +1,16 @@
 #!/bin/sh
 
+if [ "$1" = "" ]; then
+  echo "usage: protoclj [protofile] [src_dir] [class_dir]"
+  exit
+fi
+
 if [ -L $0 ]; then
   FILE=`readlink $0`
 else
   FILE=$0
 fi
+
 DIR=`dirname $FILE`
 TMP_DIR="/tmp/protoclj-`date +%s`"
 SRC_DIR=${2:-'.'}

From 95d20b737e85442c63a60bc66960eb8afaf43d9d Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Thu, 13 May 2010 18:23:36 -0700
Subject: [PATCH 041/525] lein tasks for compiling protocol buffers

---
 project.clj                                   |  6 +++
 protos/.gitignore                             |  1 +
 .../clojure/protobuf/collections.proto        |  0
 src/leiningen/install_protoc.clj              | 43 +++++++++++++++++++
 src/leiningen/proto.clj                       | 40 +++++++++++++++++
 5 files changed, 90 insertions(+)
 create mode 100644 project.clj
 create mode 100644 protos/.gitignore
 rename {src/jvm => protos}/clojure/protobuf/collections.proto (100%)
 create mode 100644 src/leiningen/install_protoc.clj
 create mode 100644 src/leiningen/proto.clj

diff --git a/project.clj b/project.clj
new file mode 100644
index 0000000..b40eec5
--- /dev/null
+++ b/project.clj
@@ -0,0 +1,6 @@
+(defproject clojure-protobuf "0.0.1-SNAPSHOT"
+  :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
+  :dependencies [[org.clojure/clojure         "1.1.0"]
+                 [org.clojure/clojure-contrib "1.1.0"]
+                 [classlojure "0.0.3-SNAPSHOT"]]
+  :source-path "src/clj")
\ No newline at end of file
diff --git a/protos/.gitignore b/protos/.gitignore
new file mode 100644
index 0000000..2a9bbbd
--- /dev/null
+++ b/protos/.gitignore
@@ -0,0 +1 @@
+*.java
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/collections.proto b/protos/clojure/protobuf/collections.proto
similarity index 100%
rename from src/jvm/clojure/protobuf/collections.proto
rename to protos/clojure/protobuf/collections.proto
diff --git a/src/leiningen/install_protoc.clj b/src/leiningen/install_protoc.clj
new file mode 100644
index 0000000..d2e1ba4
--- /dev/null
+++ b/src/leiningen/install_protoc.clj
@@ -0,0 +1,43 @@
+(ns leiningen.install-protoc
+  (:use clojure.contrib.shell-out
+        clojure.contrib.str-utils
+        lancet))
+
+(def proto-version "protobuf-2.3.0")
+(def build-dir     "lib/build/")
+(def protobuf-dir  (str build-dir proto-version))
+
+(defn shell [& args]
+  (let [return (apply sh :return-map true args)]
+    (if (= 0 (return :exit))
+      (return :out)
+      (throw (Exception. (str "command failed: " (str-join " " args) "\n" (return :err)))))))
+
+(defn exists? [file]
+  (println file)
+  (.exists (java.io.File. file)))
+
+(deftarget fetch-source "fetch google protocol buffer source"
+  (let [url      (java.net.URL. (str "http://protobuf.googlecode.com/files/" proto-version ".tar.gz"))
+        tarfile  (str protobuf-dir ".tar.gz")
+        gzip     (doto (org.apache.tools.ant.taskdefs.Untar$UntarCompressionMethod.) (.setValue "gzip"))]
+    (when-not (exists? protobuf-dir)
+      (mkdir {:dir build-dir})
+      (ant-get {:src url :dest tarfile})
+      (untar   {:src tarfile :dest build-dir :compression gzip}))))
+
+(deftarget install "install google protocol buffers"
+  (when (empty? (sh "which" "protoc"))
+    (fetch-source)
+    (with-sh-dir protobuf-dir
+      (when-not (exists? (str protobuf-dir "/src/protoc"))
+        (println "building google protobuf compiler...")
+        (chmod   {:file (str protobuf-dir "/configure")  :perm "+x"})
+        (chmod   {:file (str protobuf-dir "/install-sh") :perm "+x"})
+        (shell "./configure")
+        (shell "make"))
+      (println "installing google protobuf compiler to /usr/local/lib...")
+      (shell "sudo" "make" "install"))))
+
+(defn install-protoc [project]
+  (install))
\ No newline at end of file
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
new file mode 100644
index 0000000..9fcac7d
--- /dev/null
+++ b/src/leiningen/proto.clj
@@ -0,0 +1,40 @@
+(ns leiningen.proto
+  (:use leiningen.install-protoc
+        [leiningen.classpath :only [make-path get-classpath]]
+        [classlojure :only [extract-resource]]
+        lancet))
+
+(def proto-src "protos/src")
+
+(defn proto-files [dir]
+  (for [file  (rest (file-seq (java.io.File. dir)))
+        :when (re-find #"\.proto$" (.getName file))]
+    (.getPath file)))
+
+(deftarget clojure-protos "extract collections.proto to a temporary directory and return the directory"
+  ((re-matches #"(.*)/clojure/protobuf/collections.proto"
+     (extract-resource "protos/clojure/protobuf/collections.proto")) 1))
+
+(defn protoc
+  ([file] (protoc file proto-src))
+  ([file out]
+     (println "compiling" file "to" out)
+     (mkdir {:dir out})
+     (shell "protoc" file
+            (str "--java_out=" out)
+            "-I." (str "-I" (clojure-protos)))))
+
+(defn proto [project]
+  (install)
+  (when (= "clojure-protobuf" (project :name))
+    (fetch-source)
+    (let [src (str protobuf-dir "/java/src/main/java")]
+      (protoc (str protobuf-dir "/src/google/protobuf/descriptor.proto") src)               
+      (javac {:srcdir  (make-path src)
+              :destdir (:compile-path project)})))
+  (doseq [file (proto-files "protos")]
+    (protoc file))
+  (javac {:srcdir    (make-path proto-src)
+          :destdir   (:compile-path project)
+          :classpath (apply make-path (get-classpath project))}))
+

From 3850df93cb16fd77c7feb10bb148d26c8c391fcc Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 12:00:44 -0700
Subject: [PATCH 042/525] this close to ditching lein for good

---
 project.clj                      | 29 +++++++++++++++++++++++++++--
 src/leiningen/install_protoc.clj |  2 +-
 src/leiningen/proto.clj          | 12 ++++++------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/project.clj b/project.clj
index b40eec5..836daee 100644
--- a/project.clj
+++ b/project.clj
@@ -2,5 +2,30 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure         "1.1.0"]
                  [org.clojure/clojure-contrib "1.1.0"]
-                 [classlojure "0.0.3-SNAPSHOT"]]
-  :source-path "src/clj")
\ No newline at end of file
+                 [classlojure "0.0.4-SNAPSHOT"]]
+  :source-path "src/clj"
+  :java-source-path "src/jvm")
+
+(ns leiningen.compile
+  (:require lancet)
+  (:use leiningen.compile
+        [leiningen.deps :only [deps]]
+        [leiningen.classpath :only [make-path find-lib-jars get-classpath]])
+  (:refer-clojure :exclude [compile]))
+
+(defn proto [project]
+  ; needs to happen at runtime because it will fail if "lein deps" hasn't been run
+  (use ['leiningen.proto :only ['proto]])
+  (eval '(proto project)))
+
+(def compile* compile)
+(defn compile [project]
+  (println (find-lib-jars project))
+  (when (empty? (find-lib-jars project))
+    (deps project :skip-dev))
+  (println (find-lib-jars project))
+  (proto project)
+  (lancet/javac {:srcdir    (make-path (:java-source-path project))
+                 :destdir   (:compile-path project)
+                 :classpath (apply make-path (get-classpath project))})
+  (compile* project))
diff --git a/src/leiningen/install_protoc.clj b/src/leiningen/install_protoc.clj
index d2e1ba4..230b9af 100644
--- a/src/leiningen/install_protoc.clj
+++ b/src/leiningen/install_protoc.clj
@@ -36,7 +36,7 @@
         (chmod   {:file (str protobuf-dir "/install-sh") :perm "+x"})
         (shell "./configure")
         (shell "make"))
-      (println "installing google protobuf compiler to /usr/local/lib...")
+      (println "installing google protobuf compiler...")
       (shell "sudo" "make" "install"))))
 
 (defn install-protoc [project]
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
index 9fcac7d..e1d1ecb 100644
--- a/src/leiningen/proto.clj
+++ b/src/leiningen/proto.clj
@@ -4,7 +4,7 @@
         [classlojure :only [extract-resource]]
         lancet))
 
-(def proto-src "protos/src")
+(def src-dir "classes") ; so lein clean will remove them
 
 (defn proto-files [dir]
   (for [file  (rest (file-seq (java.io.File. dir)))
@@ -16,7 +16,7 @@
      (extract-resource "protos/clojure/protobuf/collections.proto")) 1))
 
 (defn protoc
-  ([file] (protoc file proto-src))
+  ([file] (protoc file src-dir))
   ([file out]
      (println "compiling" file "to" out)
      (mkdir {:dir out})
@@ -28,13 +28,13 @@
   (install)
   (when (= "clojure-protobuf" (project :name))
     (fetch-source)
-    (let [src (str protobuf-dir "/java/src/main/java")]
-      (protoc (str protobuf-dir "/src/google/protobuf/descriptor.proto") src)               
-      (javac {:srcdir  (make-path src)
+    (let [src-dir (str protobuf-dir "/java/src/main/java")]
+;      (protoc (str protobuf-dir "/src/google/protobuf/descriptor.proto") src-dir)
+      (javac {:srcdir  (make-path src-dir)
               :destdir (:compile-path project)})))
   (doseq [file (proto-files "protos")]
     (protoc file))
-  (javac {:srcdir    (make-path proto-src)
+  (javac {:srcdir    (make-path src-dir)
           :destdir   (:compile-path project)
           :classpath (apply make-path (get-classpath project))}))
 

From bd8d98f15272a77279470358775fc53576c271a5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 17:58:11 -0700
Subject: [PATCH 043/525] ove lein tasks out into separate project

---
 project.clj                                   | 32 ++++++--------
 protos/.gitignore                             |  3 +-
 .../protobuf/PersistentProtocolBufferMap.java | 15 ++++---
 src/leiningen/install_protoc.clj              | 43 -------------------
 src/leiningen/proto.clj                       | 40 -----------------
 src/protoclj                                  | 23 ----------
 {src/test => test}/.gitignore                 |  0
 {src/test => test}/protobuf.clj               |  0
 {src/test => test}/test.proto                 |  0
 9 files changed, 26 insertions(+), 130 deletions(-)
 delete mode 100644 src/leiningen/install_protoc.clj
 delete mode 100644 src/leiningen/proto.clj
 delete mode 100755 src/protoclj
 rename {src/test => test}/.gitignore (100%)
 rename {src/test => test}/protobuf.clj (100%)
 rename {src/test => test}/test.proto (100%)

diff --git a/project.clj b/project.clj
index 836daee..65a1888 100644
--- a/project.clj
+++ b/project.clj
@@ -1,31 +1,27 @@
 (defproject clojure-protobuf "0.0.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[org.clojure/clojure         "1.1.0"]
-                 [org.clojure/clojure-contrib "1.1.0"]
-                 [classlojure "0.0.4-SNAPSHOT"]]
+  :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
+                 [clojure-contrib "1.2.0-SNAPSHOT"]]
+  :dev-dependencies [[lein-protobuf "0.0.2-SNAPSHOT"]]
   :source-path "src/clj"
   :java-source-path "src/jvm")
 
 (ns leiningen.compile
   (:require lancet)
-  (:use leiningen.compile
-        [leiningen.deps :only [deps]]
-        [leiningen.classpath :only [make-path find-lib-jars get-classpath]])
+  (:use [leiningen.classpath :only [make-path get-classpath]])
   (:refer-clojure :exclude [compile]))
 
-(defn proto [project]
-  ; needs to happen at runtime because it will fail if "lein deps" hasn't been run
-  (use ['leiningen.proto :only ['proto]])
-  (eval '(proto project)))
+(defn compile-protobuf [project]
+  (try
+   (require 'leiningen.proto)
+   ((ns-resolve 'leiningen.proto 'proto) project)
+   (catch java.io.FileNotFoundException e
+     (println "you must run 'lein deps' before compile")
+     (System/exit 1))))
 
-(def compile* compile)
 (defn compile [project]
-  (println (find-lib-jars project))
-  (when (empty? (find-lib-jars project))
-    (deps project :skip-dev))
-  (println (find-lib-jars project))
-  (proto project)
+  (println (get-classpath project))
+  (compile-protobuf project)
   (lancet/javac {:srcdir    (make-path (:java-source-path project))
                  :destdir   (:compile-path project)
-                 :classpath (apply make-path (get-classpath project))})
-  (compile* project))
+                 :classpath (apply make-path (get-classpath project))}))
\ No newline at end of file
diff --git a/protos/.gitignore b/protos/.gitignore
index 2a9bbbd..dd7c53b 100644
--- a/protos/.gitignore
+++ b/protos/.gitignore
@@ -1 +1,2 @@
-*.java
\ No newline at end of file
+*.java
+google/protobuf/descriptor.proto
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index a649857..cc210c1 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -109,6 +109,7 @@ public Object defaultValue(Keyword key) {
 
   final Def def;
   final DynamicMessage message;
+  final IPersistentMap _meta;
 
   DynamicMessage built_message;
 
@@ -129,19 +130,19 @@ static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyv
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
-    super(meta);
+    this._meta   = meta;
     this.def     = def;
     this.message = null;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message) {
-    super(meta);
+    this._meta   = meta;
     this.def     = def;
     this.message = message;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage.Builder builder) {
-    super(meta);
+    this._meta   = meta;
     this.def     = def;
     this.message = builder.build();
   }
@@ -338,11 +339,15 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
     }
   }
 
-  public Obj withMeta(IPersistentMap meta) {
+  public PersistentProtocolBufferMap withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
     return new PersistentProtocolBufferMap(meta(), def, message);
   }
 
+  public IPersistentMap meta(){
+    return _meta;
+  }
+
   public boolean containsKey(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) {
@@ -458,7 +463,7 @@ public Obj withMeta(IPersistentMap meta) {
       if(meta != meta()) return new Seq(meta, map, fields, i);
       return this;
     }
-
+    
     public Object first() {
       if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
diff --git a/src/leiningen/install_protoc.clj b/src/leiningen/install_protoc.clj
deleted file mode 100644
index 230b9af..0000000
--- a/src/leiningen/install_protoc.clj
+++ /dev/null
@@ -1,43 +0,0 @@
-(ns leiningen.install-protoc
-  (:use clojure.contrib.shell-out
-        clojure.contrib.str-utils
-        lancet))
-
-(def proto-version "protobuf-2.3.0")
-(def build-dir     "lib/build/")
-(def protobuf-dir  (str build-dir proto-version))
-
-(defn shell [& args]
-  (let [return (apply sh :return-map true args)]
-    (if (= 0 (return :exit))
-      (return :out)
-      (throw (Exception. (str "command failed: " (str-join " " args) "\n" (return :err)))))))
-
-(defn exists? [file]
-  (println file)
-  (.exists (java.io.File. file)))
-
-(deftarget fetch-source "fetch google protocol buffer source"
-  (let [url      (java.net.URL. (str "http://protobuf.googlecode.com/files/" proto-version ".tar.gz"))
-        tarfile  (str protobuf-dir ".tar.gz")
-        gzip     (doto (org.apache.tools.ant.taskdefs.Untar$UntarCompressionMethod.) (.setValue "gzip"))]
-    (when-not (exists? protobuf-dir)
-      (mkdir {:dir build-dir})
-      (ant-get {:src url :dest tarfile})
-      (untar   {:src tarfile :dest build-dir :compression gzip}))))
-
-(deftarget install "install google protocol buffers"
-  (when (empty? (sh "which" "protoc"))
-    (fetch-source)
-    (with-sh-dir protobuf-dir
-      (when-not (exists? (str protobuf-dir "/src/protoc"))
-        (println "building google protobuf compiler...")
-        (chmod   {:file (str protobuf-dir "/configure")  :perm "+x"})
-        (chmod   {:file (str protobuf-dir "/install-sh") :perm "+x"})
-        (shell "./configure")
-        (shell "make"))
-      (println "installing google protobuf compiler...")
-      (shell "sudo" "make" "install"))))
-
-(defn install-protoc [project]
-  (install))
\ No newline at end of file
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
deleted file mode 100644
index e1d1ecb..0000000
--- a/src/leiningen/proto.clj
+++ /dev/null
@@ -1,40 +0,0 @@
-(ns leiningen.proto
-  (:use leiningen.install-protoc
-        [leiningen.classpath :only [make-path get-classpath]]
-        [classlojure :only [extract-resource]]
-        lancet))
-
-(def src-dir "classes") ; so lein clean will remove them
-
-(defn proto-files [dir]
-  (for [file  (rest (file-seq (java.io.File. dir)))
-        :when (re-find #"\.proto$" (.getName file))]
-    (.getPath file)))
-
-(deftarget clojure-protos "extract collections.proto to a temporary directory and return the directory"
-  ((re-matches #"(.*)/clojure/protobuf/collections.proto"
-     (extract-resource "protos/clojure/protobuf/collections.proto")) 1))
-
-(defn protoc
-  ([file] (protoc file src-dir))
-  ([file out]
-     (println "compiling" file "to" out)
-     (mkdir {:dir out})
-     (shell "protoc" file
-            (str "--java_out=" out)
-            "-I." (str "-I" (clojure-protos)))))
-
-(defn proto [project]
-  (install)
-  (when (= "clojure-protobuf" (project :name))
-    (fetch-source)
-    (let [src-dir (str protobuf-dir "/java/src/main/java")]
-;      (protoc (str protobuf-dir "/src/google/protobuf/descriptor.proto") src-dir)
-      (javac {:srcdir  (make-path src-dir)
-              :destdir (:compile-path project)})))
-  (doseq [file (proto-files "protos")]
-    (protoc file))
-  (javac {:srcdir    (make-path src-dir)
-          :destdir   (:compile-path project)
-          :classpath (apply make-path (get-classpath project))}))
-
diff --git a/src/protoclj b/src/protoclj
deleted file mode 100755
index 92f3c23..0000000
--- a/src/protoclj
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
-  echo "usage: protoclj [protofile] [src_dir] [class_dir]"
-  exit
-fi
-
-if [ -L $0 ]; then
-  FILE=`readlink $0`
-else
-  FILE=$0
-fi
-
-DIR=`dirname $FILE`
-TMP_DIR="/tmp/protoclj-`date +%s`"
-SRC_DIR=${2:-'.'}
-CLASS_DIR=${3:-$SRC_DIR}
-
-mkdir -p $TMP_DIR $SRC_DIR $CLASS_DIR
-protoc $1 -I$DIR/../include -I. --java_out=$TMP_DIR
-cp -Rf $TMP_DIR/* $SRC_DIR
-javac -d $CLASS_DIR -cp $DIR/../var/java/clojure-protobuf.jar `find $TMP_DIR -name *.java`
-rm -rf $TMP_DIR
diff --git a/src/test/.gitignore b/test/.gitignore
similarity index 100%
rename from src/test/.gitignore
rename to test/.gitignore
diff --git a/src/test/protobuf.clj b/test/protobuf.clj
similarity index 100%
rename from src/test/protobuf.clj
rename to test/protobuf.clj
diff --git a/src/test/test.proto b/test/test.proto
similarity index 100%
rename from src/test/test.proto
rename to test/test.proto

From 0a891bb95542050d4526c24d0e5c96e1b450b327 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 18:02:18 -0700
Subject: [PATCH 044/525] remove build.xml

---
 build.xml | 148 ------------------------------------------------------
 1 file changed, 148 deletions(-)
 delete mode 100644 build.xml

diff --git a/build.xml b/build.xml
deleted file mode 100644
index 9357555..0000000
--- a/build.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<project name="clojure-protobuf" default="package">
-
-  <property name="repository.clojure" value="http://clojure.googlecode.com/files"/>
-  <property name="dep.clojure" value="clojure-1.1.0"/>
-  <property name="clojure.jar" value="lib/clojure.jar"/>
-
-  <property name="repository.protobuf" value="http://protobuf.googlecode.com/files"/>
-  <property name="dep.protobuf" value="protobuf-2.3.0"/>
-  <property name="protobuf" value="lib/${dep.protobuf}"/>
-
-  <property name="install_prefix" value="/usr/local"/>
-
-  <condition property="copy_flags" value="-Rf">
-    <and><os family="unix"/><os family="mac"/></and>
-  </condition>
-  <property name="copy_flags" value="-RTf"/>
-
-  <target name="init">
-    <mkdir dir="lib"/>
-    <mkdir dir="classes"/>
-  </target>
-
-  <target name="distclean">
-    <delete file="${protobuf}/Makefile"/>
-  </target>
-
-  <target name="clean">
-    <delete>
-      <fileset dir="." includes="*.jar"/>
-    </delete>
-    <delete dir="lib"/>
-    <delete dir="classes"/>
-  </target>
-
-  <available file="${protobuf}" property="has_protobuf"/>
-  <target name="fetch_protobuf" depends="init" unless="has_protobuf">
-    <get src="${repository.protobuf}/${dep.protobuf}.tar.gz"
-         dest="lib/${dep.protobuf}.tar.gz" usetimestamp="true"/>
-    <gunzip src="lib/${dep.protobuf}.tar.gz"/>
-    <untar src="lib/${dep.protobuf}.tar" dest="lib"/>
-    <delete file="lib/${dep.protobuf}.tar"/>
-  </target>
-
-  <available file="${protobuf}/Makefile" property="configured_protobuf"/>
-  <target name="config_protobuf" depends="fetch_protobuf" unless="configured_protobuf">
-    <chmod file="${protobuf}/configure" perm="+x"/>
-    <exec dir="${protobuf}" executable="./configure">
-      <arg value="--prefix=${basedir}/lib/install"/>
-    </exec>
-  </target>
-
-  <available file="${protobuf}/src/protoc" property="has_protoc"/>
-  <target name="make_protobuf" depends="config_protobuf" unless="has_protoc">
-    <chmod file="${protobuf}/install-sh" perm="+x"/>
-    <exec dir="${protobuf}" executable="make" failonerror="true"/>
-    <exec dir="${protobuf}" executable="make" failonerror="true">
-      <arg value="install"/>
-    </exec>
-  </target>
-
-  <path id="classpath">
-    <pathelement location="${clojure.jar}"/>
-    <pathelement location="src/clj"/>
-    <pathelement location="src"/>
-    <pathelement location="classes"/>
-  </path>
-
-  <available file="classes/com/google/protobuf/DescriptorProtos.class" property="proto_compiled"/>
-  <target name="compile_protobuf" depends="make_protobuf" unless="proto_compiled">
-    <exec dir="${protobuf}/java" executable="../src/protoc">
-      <arg value="--java_out=src/main/java"/>
-      <arg value="-I../src"/>
-      <arg value="../src/google/protobuf/descriptor.proto"/>
-    </exec>
-    <javac srcdir="${protobuf}/java/src/main" destdir="classes"/>
-  </target>
-
-  <available file="src/jvm/clojure/protobuf/Collections.java" property="collections_proto_compiled"/>
-  <target name="compile_collections_proto" depends="compile_protobuf" unless="collections_proto_compiled">
-    <exec dir="src/jvm" executable="../../${protobuf}/src/protoc">
-      <arg value="--java_out=."/>
-      <arg value="-I."/>
-      <arg value="-I../../${protobuf}/src"/>
-      <arg value="clojure/protobuf/collections.proto"/>
-    </exec>
-  </target>
-
-  <available file="${clojure.jar}" property="has_clojure"/>
-  <target name="fetch_clojure" depends="init" unless="has_clojure">
-    <get src="${repository.clojure}/${dep.clojure}.zip"
-         dest="lib/${dep.clojure}.zip" usetimestamp="true"/>
-    <unzip src="lib/${dep.clojure}.zip" dest="lib"/>
-    <copy file="lib/${dep.clojure}/clojure.jar" todir="lib"/>
-  </target>
-
-  <target name="compile" depends="compile_protobuf,compile_collections_proto,fetch_clojure">
-    <javac srcdir="src/jvm" destdir="classes" classpathref="classpath" debug="true"/>
-    <java classname="clojure.lang.Compile" classpathref="classpath" failonerror="true">
-      <sysproperty key="clojure.compile.path" value="classes"/>
-      <arg value="protobuf"/>
-    </java>
-  </target>
-
-  <target name="package" depends="compile">
-    <jar destfile="clojure-protobuf.jar" basedir="classes"/>
-
-    <exec executable="mkdir" failonerror="true">
-      <arg value="-p"/>
-      <arg line="lib/install/var/java lib/install/include/clojure/protobuf"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="src/protoclj lib/install/bin"/>
-    </exec>
-    <chmod file="${install_prefix}/bin/protoclj" perm="+x"/>
-    <exec executable="cp" failonerror="true">
-      <arg line="src/jvm/clojure/protobuf/collections.proto lib/install/include/clojure/protobuf"/>
-    </exec>
-    <exec executable="cp" failonerror="true">
-      <arg line="clojure-protobuf.jar lib/install/var/java"/>
-    </exec>
-  </target>
-
-  <target name="install" depends="package">
-    <echo message="Installing to ${install_prefix}/"/>
-    <exec executable="cp" failonerror="true">
-      <arg line="${copy_flags} ${basedir}/lib/install/ ${install_prefix}"/>
-    </exec>
-  </target>
-
-  <target name="compile_test_proto" depends="compile">
-    <exec dir="src" executable="../${protobuf}/src/protoc">
-      <arg value="--java_out=."/>
-      <arg value="-I."/>
-      <arg value="-Ijvm/"/>
-      <arg value="-I../${protobuf}/src/"/>
-      <arg value="test/test.proto"/>
-    </exec>
-    <javac srcdir="src" classpathref="classpath">
-      <include name="test/protobuf/Proto.java"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile_test_proto">
-    <java classname="clojure.main" classpathref="classpath" failonerror="true" fork="true">
-      <arg value="src/test.clj"/>
-    </java>
-  </target>
-</project>

From 0ca894cdb0f664cb10c8107dd0c15b733a08a58f Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 18:16:58 -0700
Subject: [PATCH 045/525] update readme

---
 README.md | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 84dbe20..a2bb810 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ Write a `.proto` file:
       repeated string likes = 4;
     }
 
-Compile the file to Java:
+If you put it in the protos directory of your project, you can compile it with lein:
 
-    protoclj example.proto
+    lein proto example.proto
 
 Now you can use the protocol buffer in clojure:
 
@@ -67,9 +67,9 @@ repeated fields. To use these, you must import the extension file and include it
       }
     }
 
-Compile the file to Java:
+Compile the file:
 
-     protoclj example.proto
+     lein proto example.proto
 
 Then you can access the maps in clojure:
 
@@ -87,28 +87,15 @@ Then you can access the maps in clojure:
     (protobuf-load Photo b)
     => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
-## protoclj
-
-When you install clojure-protobuf, a helper script called protoclj is installed that makes
-building .proto files with clojure extensions easier. You can use it like this:
-
-  protoclj package/foo.proto [src] [classes]
-
-Note that if you are using a package in your .proto file, then the file must be in a
-directory structure that corresponds to that package and you must call protoclj from the
-package root.
-
 ## Installation
 
-To download clojure.jar and google's protobuf source automatically and install protoc:
-    ant package
-    sudo ant install
+[Leiningen](http://github.com/technomancy/leiningen):
+
+    :dependencies [[compojure "0.4.0-SNAPSHOT"]]
 
-You can also specify options to configure (like the install prefix):
-    ant package -Dconfigure='--prefix=/opt/local'
-    sudo ant install
+Build from source:
 
-Or you can specify a specific location for clojure.jar or the protobuf source:
-    ant package -Dclojure.jar=$HOME/lib/java/clojure-1.1.0.jar -Dprotobuf=$HOME/Downloads/protobuf-2.3.0
+    lein deps
+    lein jar
 
-This code has been tested with clojure version 1.1.0 and protobuf version 2.3.0.
+This code works with Clojure 1.2. Here's the [1.1 branch](http://github.com/ninjudd/clojure-protobuf/tree/clojure-1.1).
\ No newline at end of file

From fff0f296e3db7fea47b76cf0607cfbbd66591739 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 18:18:39 -0700
Subject: [PATCH 046/525] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a2bb810..fb44024 100644
--- a/README.md
+++ b/README.md
@@ -89,9 +89,9 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-[Leiningen](http://github.com/technomancy/leiningen):
+In your [Leiningen](http://github.com/technomancy/leiningen) project.clj:
 
-    :dependencies [[compojure "0.4.0-SNAPSHOT"]]
+    :dependencies [[compojure "0.0.1-SNAPSHOT"]]
 
 Build from source:
 

From e3d1e5dbe16f9b4e3e5e8af2465baf4ee40c8d21 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 18:19:19 -0700
Subject: [PATCH 047/525] copy and paste

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb44024..358348b 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Then you can access the maps in clojure:
 
 In your [Leiningen](http://github.com/technomancy/leiningen) project.clj:
 
-    :dependencies [[compojure "0.0.1-SNAPSHOT"]]
+    :dependencies [[clojure-protobuf "0.0.1-SNAPSHOT"]]
 
 Build from source:
 

From 7769153a0de90cfaa5468eb451b06938d36a8184 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Fri, 14 May 2010 18:31:19 -0700
Subject: [PATCH 048/525] update versions

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 65a1888..7d4f983 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,8 @@
-(defproject clojure-protobuf "0.0.1-SNAPSHOT"
+(defproject clojure-protobuf "0.0.4-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
-  :dev-dependencies [[lein-protobuf "0.0.2-SNAPSHOT"]]
+  :dev-dependencies [[lein-protobuf "0.0.4-SNAPSHOT"]]
   :source-path "src/clj"
   :java-source-path "src/jvm")
 

From 8c2ee0e63263f16a2ef53ba565b45343cc2b4bc2 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Mon, 17 May 2010 15:15:51 -0700
Subject: [PATCH 049/525] add lein tasks back

---
 .gitignore  | 1 +
 project.clj | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c21b997..a269431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 lib
 classes
+pom.xml
 *.jar
 *.class
\ No newline at end of file
diff --git a/project.clj b/project.clj
index 7d4f983..508c410 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,8 @@
-(defproject clojure-protobuf "0.0.4-SNAPSHOT"
+(defproject clojure-protobuf "0.1.0-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
-                 [clojure-contrib "1.2.0-SNAPSHOT"]]
-  :dev-dependencies [[lein-protobuf "0.0.4-SNAPSHOT"]]
+                 [clojure-contrib "1.2.0-SNAPSHOT"]
+                 [classlojure     "0.0.4-SNAPSHOT"]]
   :source-path "src/clj"
   :java-source-path "src/jvm")
 
@@ -20,7 +20,6 @@
      (System/exit 1))))
 
 (defn compile [project]
-  (println (get-classpath project))
   (compile-protobuf project)
   (lancet/javac {:srcdir    (make-path (:java-source-path project))
                  :destdir   (:compile-path project)

From 3eee9ccc079e760ae924fae4c795d4ba9afaf524 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 18 May 2010 11:48:02 -0700
Subject: [PATCH 050/525] use with-ns to override compile so that jar will call
 my compile. add missing leiningen tasks

---
 README.md                        |  2 +-
 project.clj                      | 32 +++++++---------
 protos/.gitignore                |  1 -
 src/leiningen/install_protoc.clj | 42 +++++++++++++++++++++
 src/leiningen/proto.clj          | 64 ++++++++++++++++++++++++++++++++
 5 files changed, 120 insertions(+), 21 deletions(-)
 create mode 100644 src/leiningen/install_protoc.clj
 create mode 100644 src/leiningen/proto.clj

diff --git a/README.md b/README.md
index 358348b..42f908f 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Then you can access the maps in clojure:
 
 In your [Leiningen](http://github.com/technomancy/leiningen) project.clj:
 
-    :dependencies [[clojure-protobuf "0.0.1-SNAPSHOT"]]
+    :dependencies [[clojure-protobuf "0.1.0-SNAPSHOT"]]
 
 Build from source:
 
diff --git a/project.clj b/project.clj
index 508c410..74e0be4 100644
--- a/project.clj
+++ b/project.clj
@@ -3,24 +3,18 @@
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]
                  [classlojure     "0.0.4-SNAPSHOT"]]
-  :source-path "src/clj"
-  :java-source-path "src/jvm")
+  :source-path      "src/clj"
+  :java-source-path "src/jvm"
+  :resources-path   "protos")
 
-(ns leiningen.compile
-  (:require lancet)
-  (:use [leiningen.classpath :only [make-path get-classpath]])
-  (:refer-clojure :exclude [compile]))
+(use 'clojure.contrib.with-ns)
+(require 'leiningen.compile)
+(with-ns 'leiningen.compile
+  (use '[leiningen.proto :only [proto]])
 
-(defn compile-protobuf [project]
-  (try
-   (require 'leiningen.proto)
-   ((ns-resolve 'leiningen.proto 'proto) project)
-   (catch java.io.FileNotFoundException e
-     (println "you must run 'lein deps' before compile")
-     (System/exit 1))))
-
-(defn compile [project]
-  (compile-protobuf project)
-  (lancet/javac {:srcdir    (make-path (:java-source-path project))
-                 :destdir   (:compile-path project)
-                 :classpath (apply make-path (get-classpath project))}))
\ No newline at end of file
+  (defn compile [project]
+    (deps project :skip-dev)
+    (proto project)
+    (lancet/javac {:srcdir    (make-path (:java-source-path project))
+                   :destdir   (:compile-path project)
+                   :classpath (apply make-path (get-classpath project))})))
\ No newline at end of file
diff --git a/protos/.gitignore b/protos/.gitignore
index dd7c53b..576998b 100644
--- a/protos/.gitignore
+++ b/protos/.gitignore
@@ -1,2 +1 @@
-*.java
 google/protobuf/descriptor.proto
\ No newline at end of file
diff --git a/src/leiningen/install_protoc.clj b/src/leiningen/install_protoc.clj
new file mode 100644
index 0000000..1d267f1
--- /dev/null
+++ b/src/leiningen/install_protoc.clj
@@ -0,0 +1,42 @@
+(ns leiningen.install-protoc
+  (:use clojure.contrib.shell-out
+        clojure.contrib.str-utils
+        lancet))
+
+(def proto-version "protobuf-2.3.0")
+(def build-dir     "lib/build/")
+(def protobuf-dir  (str build-dir proto-version))
+
+(defn shell [& args]
+  (let [return (apply sh :return-map true args)]
+    (if (= 0 (return :exit))
+      (return :out)
+      (throw (Exception. (str "command failed: " (str-join " " args) "\n" (return :err)))))))
+
+(defn exists? [file]
+  (.exists (java.io.File. file)))
+
+(deftarget fetch-source "fetch google protocol buffer source"
+  (let [url      (java.net.URL. (str "http://protobuf.googlecode.com/files/" proto-version ".tar.gz"))
+        tarfile  (str protobuf-dir ".tar.gz")
+        gzip     (doto (org.apache.tools.ant.taskdefs.Untar$UntarCompressionMethod.) (.setValue "gzip"))]
+    (when-not (exists? protobuf-dir)
+      (mkdir {:dir build-dir})
+      (ant-get {:src url :dest tarfile})
+      (untar   {:src tarfile :dest build-dir :compression gzip}))))
+
+(deftarget install "install google protocol buffers"
+  (when (empty? (sh "which" "protoc"))
+    (fetch-source)
+    (with-sh-dir protobuf-dir
+      (when-not (exists? (str protobuf-dir "/src/protoc"))
+        (println "building google protobuf compiler...")
+        (chmod   {:file (str protobuf-dir "/configure")  :perm "+x"})
+        (chmod   {:file (str protobuf-dir "/install-sh") :perm "+x"})
+        (shell "./configure")
+        (shell "make"))
+      (println "installing google protobuf compiler...")
+      (shell "sudo" "make" "install"))))
+
+(defn install-protoc [project]
+  (install))
\ No newline at end of file
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
new file mode 100644
index 0000000..16c2aa5
--- /dev/null
+++ b/src/leiningen/proto.clj
@@ -0,0 +1,64 @@
+(ns leiningen.proto
+  (:use leiningen.install-protoc
+        [leiningen.classpath :only [make-path get-classpath]]
+        [classlojure :only [extract-resource]]
+        [clojure.contrib.io :only [file read-lines]]
+        lancet))
+
+(defn proto-files [dir]
+  (for [file (rest (file-seq (file dir))) :when (re-find #"\.proto$" (.getName file))]
+    (.substring (.getPath file) (inc (count dir)))))
+
+(defn- match [p s]
+  (when s
+    (let [p (if (string? p) (re-pattern p) p)]
+      (second (re-matches p s)))))
+
+(defn extract-proto
+  "extract proto-file to a temporary directory and return the directory"  
+  [proto-file]
+  (match (str "(.*)/" proto-file)
+         (extract-resource proto-file)))
+
+(defn proto-dependencies
+  "look for lines starting with import in proto-file"
+  [proto-file]
+  (for [line (read-lines (file "protos" proto-file)) :when (.startsWith line "import")]
+    (match #".*\"(.*)\".*" line)))
+
+(defn protoc [proto-file src-dir]
+  (println "compiling" proto-file "to" src-dir)
+  (mkdir {:dir src-dir})
+  (let [src-dir (str "../" src-dir)]
+    (apply shell :dir "protos"
+       "protoc" proto-file (str "--java_out=" src-dir) "-I."
+       (for [dir (map extract-proto (proto-dependencies proto-file)) :when dir]
+         (str "-I" dir)))))
+
+(declare proto)
+
+(defn build-protobuf [project]       
+  (fetch-source)
+  (let [src-dir    (str protobuf-dir "/java/src/main/java")
+        descriptor "google/protobuf/descriptor.proto"
+        todir      "protos/google/protobuf"]
+    (mkdir {:dir todir})
+    (copy {:file (str protobuf-dir "/src/" descriptor) :todir todir})
+    (protoc descriptor src-dir)
+    (javac {:srcdir  (make-path src-dir)
+            :destdir (:compile-path project)}) 
+    (proto project "clojure/protobuf/collections.proto")))
+
+(defn proto
+  ([project]
+     (if (= "clojure-protobuf" (:name project))
+       (build-protobuf project)
+       (apply proto project (proto-files "protos"))))
+  ([project & files]
+     (install)
+     (let [src-dir (or (:proto-source-dir project) "lib/src")]
+       (doseq [file files]
+         (protoc file src-dir))
+       (javac {:srcdir    (make-path src-dir)
+               :destdir   (:compile-path project)
+               :classpath (apply make-path (get-classpath project))}))))

From 3798cd949fa0561a1ad3ade6784de98c8efe89f2 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 18 May 2010 12:46:35 -0700
Subject: [PATCH 051/525] rename proto dir protos->proto

---
 project.clj                                          | 2 +-
 {protos => proto}/.gitignore                         | 0
 {protos => proto}/clojure/protobuf/collections.proto | 0
 src/leiningen/proto.clj                              | 8 ++++----
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {protos => proto}/.gitignore (100%)
 rename {protos => proto}/clojure/protobuf/collections.proto (100%)

diff --git a/project.clj b/project.clj
index 74e0be4..1611c83 100644
--- a/project.clj
+++ b/project.clj
@@ -5,7 +5,7 @@
                  [classlojure     "0.0.4-SNAPSHOT"]]
   :source-path      "src/clj"
   :java-source-path "src/jvm"
-  :resources-path   "protos")
+  :resources-path   "proto")
 
 (use 'clojure.contrib.with-ns)
 (require 'leiningen.compile)
diff --git a/protos/.gitignore b/proto/.gitignore
similarity index 100%
rename from protos/.gitignore
rename to proto/.gitignore
diff --git a/protos/clojure/protobuf/collections.proto b/proto/clojure/protobuf/collections.proto
similarity index 100%
rename from protos/clojure/protobuf/collections.proto
rename to proto/clojure/protobuf/collections.proto
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
index 16c2aa5..bd38119 100644
--- a/src/leiningen/proto.clj
+++ b/src/leiningen/proto.clj
@@ -23,14 +23,14 @@
 (defn proto-dependencies
   "look for lines starting with import in proto-file"
   [proto-file]
-  (for [line (read-lines (file "protos" proto-file)) :when (.startsWith line "import")]
+  (for [line (read-lines (file "proto" proto-file)) :when (.startsWith line "import")]
     (match #".*\"(.*)\".*" line)))
 
 (defn protoc [proto-file src-dir]
   (println "compiling" proto-file "to" src-dir)
   (mkdir {:dir src-dir})
   (let [src-dir (str "../" src-dir)]
-    (apply shell :dir "protos"
+    (apply shell :dir "proto"
        "protoc" proto-file (str "--java_out=" src-dir) "-I."
        (for [dir (map extract-proto (proto-dependencies proto-file)) :when dir]
          (str "-I" dir)))))
@@ -41,7 +41,7 @@
   (fetch-source)
   (let [src-dir    (str protobuf-dir "/java/src/main/java")
         descriptor "google/protobuf/descriptor.proto"
-        todir      "protos/google/protobuf"]
+        todir      "proto/google/protobuf"]
     (mkdir {:dir todir})
     (copy {:file (str protobuf-dir "/src/" descriptor) :todir todir})
     (protoc descriptor src-dir)
@@ -53,7 +53,7 @@
   ([project]
      (if (= "clojure-protobuf" (:name project))
        (build-protobuf project)
-       (apply proto project (proto-files "protos"))))
+       (apply proto project (proto-files "proto"))))
   ([project & files]
      (install)
      (let [src-dir (or (:proto-source-dir project) "lib/src")]

From f9a6693c7d5c8901fc26d0c92f56ca9c37cbcc2a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <justin@geni.com>
Date: Tue, 18 May 2010 16:40:57 -0700
Subject: [PATCH 052/525] recursively extract all proto dependencies from
 classpath

---
 project.clj                                | 15 +++--
 src/{ => clj}/leiningen/install_protoc.clj |  0
 src/clj/leiningen/proto.clj                | 75 ++++++++++++++++++++++
 src/leiningen                              |  1 +
 src/leiningen/proto.clj                    | 64 ------------------
 src/test.clj                               | 14 ----
 6 files changed, 87 insertions(+), 82 deletions(-)
 rename src/{ => clj}/leiningen/install_protoc.clj (100%)
 create mode 100644 src/clj/leiningen/proto.clj
 create mode 120000 src/leiningen
 delete mode 100644 src/leiningen/proto.clj
 delete mode 100644 src/test.clj

diff --git a/project.clj b/project.clj
index 1611c83..3bf68d6 100644
--- a/project.clj
+++ b/project.clj
@@ -2,7 +2,7 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]
-                 [classlojure     "0.0.4-SNAPSHOT"]]
+                 [classlojure     "0.1.0-SNAPSHOT"]]
   :source-path      "src/clj"
   :java-source-path "src/jvm"
   :resources-path   "proto")
@@ -10,11 +10,18 @@
 (use 'clojure.contrib.with-ns)
 (require 'leiningen.compile)
 (with-ns 'leiningen.compile
-  (use '[leiningen.proto :only [proto]])
+
+  (defn proto [project]
+    (try (require 'classlojure)
+         (require 'leiningen.proto)
+         ((ns-resolve 'leiningen.proto 'proto) project)
+       (catch java.io.FileNotFoundException e
+         (println "you must run 'lein deps' first")
+         (System/exit 1))))
 
   (defn compile [project]
-    (deps project :skip-dev)
     (proto project)
     (lancet/javac {:srcdir    (make-path (:java-source-path project))
                    :destdir   (:compile-path project)
-                   :classpath (apply make-path (get-classpath project))})))
\ No newline at end of file
+                   :classpath (apply make-path (get-classpath project))}))
+)
\ No newline at end of file
diff --git a/src/leiningen/install_protoc.clj b/src/clj/leiningen/install_protoc.clj
similarity index 100%
rename from src/leiningen/install_protoc.clj
rename to src/clj/leiningen/install_protoc.clj
diff --git a/src/clj/leiningen/proto.clj b/src/clj/leiningen/proto.clj
new file mode 100644
index 0000000..a53be76
--- /dev/null
+++ b/src/clj/leiningen/proto.clj
@@ -0,0 +1,75 @@
+(ns leiningen.proto
+  (:use leiningen.install-protoc
+        [leiningen.classpath :only [make-path get-classpath]]
+        [classlojure :only [extract-resource]]
+        [clojure.contrib.io :only [file read-lines]]
+        lancet))
+
+(def proto-dir         "proto")
+(def proto-extract-dir "lib/proto")
+(def proto-src-dir     "lib/proto_src")
+
+(defn- match [p s]
+  (when s
+    (let [p (if (string? p) (re-pattern p) p)]
+      (second (re-matches p s)))))
+
+(defn- proto-exists? [proto]
+  (or (.exists (file proto-dir proto))
+      (.exists (file proto-extract-dir proto))))
+
+(defn- proto-dependencies
+  "look for lines starting with import in proto-file"
+  [proto-file]
+  (for [line (read-lines proto-file) :when (.startsWith line "import")]
+    (match #".*\"(.*)\".*" line)))
+
+(defn extract-dependencies
+  "extract all files proto is dependent on"
+  [proto]
+  (loop [files (vec (proto-dependencies (file proto-dir proto)))]
+    (when-not (empty? files)
+      (let [proto (peek files)
+            files (pop files)]
+        (if (proto-exists? proto)
+          (recur files)
+          (let [proto-file (extract-resource proto proto-extract-dir)]
+            (recur (into files (proto-dependencies proto-file)))))))))
+
+(defn protoc [proto src-dir]
+  (println "compiling" proto "to" src-dir)
+  (extract-dependencies proto)
+  (mkdir {:dir src-dir})
+  (shell :dir proto-dir
+     "protoc" proto (str "--java_out=../" src-dir) "-I." (str "-I../" proto-extract-dir)))
+
+(declare proto)
+
+(defn build-protobuf [project]
+  (fetch-source)
+  (let [src-dir    (str protobuf-dir "/java/src/main/java")
+        descriptor "google/protobuf/descriptor.proto"
+        todir      (str proto-dir "/google/protobuf")]
+    (mkdir {:dir todir})
+    (copy {:file (str protobuf-dir "/src/" descriptor) :todir todir})
+    (protoc descriptor src-dir)
+    (javac {:srcdir  (make-path src-dir)
+            :destdir (:compile-path project)})
+    (proto project "clojure/protobuf/collections.proto")))
+
+(defn- proto-files [dir]
+  (for [file (rest (file-seq (file dir))) :when (re-find #"\.proto$" (.getName file))]
+    (.substring (.getPath file) (inc (count dir)))))
+
+(defn proto
+  ([project]
+     (if (= "clojure-protobuf" (:name project))
+       (build-protobuf project)
+       (apply proto project (proto-files proto-dir))))
+  ([project & files]
+     (install)
+     (doseq [file files]
+       (protoc file proto-src-dir))
+     (javac {:srcdir    (make-path proto-src-dir)
+             :destdir   (:compile-path project)
+             :classpath (apply make-path (get-classpath project))})))
diff --git a/src/leiningen b/src/leiningen
new file mode 120000
index 0000000..369c96c
--- /dev/null
+++ b/src/leiningen
@@ -0,0 +1 @@
+clj/leiningen
\ No newline at end of file
diff --git a/src/leiningen/proto.clj b/src/leiningen/proto.clj
deleted file mode 100644
index bd38119..0000000
--- a/src/leiningen/proto.clj
+++ /dev/null
@@ -1,64 +0,0 @@
-(ns leiningen.proto
-  (:use leiningen.install-protoc
-        [leiningen.classpath :only [make-path get-classpath]]
-        [classlojure :only [extract-resource]]
-        [clojure.contrib.io :only [file read-lines]]
-        lancet))
-
-(defn proto-files [dir]
-  (for [file (rest (file-seq (file dir))) :when (re-find #"\.proto$" (.getName file))]
-    (.substring (.getPath file) (inc (count dir)))))
-
-(defn- match [p s]
-  (when s
-    (let [p (if (string? p) (re-pattern p) p)]
-      (second (re-matches p s)))))
-
-(defn extract-proto
-  "extract proto-file to a temporary directory and return the directory"  
-  [proto-file]
-  (match (str "(.*)/" proto-file)
-         (extract-resource proto-file)))
-
-(defn proto-dependencies
-  "look for lines starting with import in proto-file"
-  [proto-file]
-  (for [line (read-lines (file "proto" proto-file)) :when (.startsWith line "import")]
-    (match #".*\"(.*)\".*" line)))
-
-(defn protoc [proto-file src-dir]
-  (println "compiling" proto-file "to" src-dir)
-  (mkdir {:dir src-dir})
-  (let [src-dir (str "../" src-dir)]
-    (apply shell :dir "proto"
-       "protoc" proto-file (str "--java_out=" src-dir) "-I."
-       (for [dir (map extract-proto (proto-dependencies proto-file)) :when dir]
-         (str "-I" dir)))))
-
-(declare proto)
-
-(defn build-protobuf [project]       
-  (fetch-source)
-  (let [src-dir    (str protobuf-dir "/java/src/main/java")
-        descriptor "google/protobuf/descriptor.proto"
-        todir      "proto/google/protobuf"]
-    (mkdir {:dir todir})
-    (copy {:file (str protobuf-dir "/src/" descriptor) :todir todir})
-    (protoc descriptor src-dir)
-    (javac {:srcdir  (make-path src-dir)
-            :destdir (:compile-path project)}) 
-    (proto project "clojure/protobuf/collections.proto")))
-
-(defn proto
-  ([project]
-     (if (= "clojure-protobuf" (:name project))
-       (build-protobuf project)
-       (apply proto project (proto-files "proto"))))
-  ([project & files]
-     (install)
-     (let [src-dir (or (:proto-source-dir project) "lib/src")]
-       (doseq [file files]
-         (protoc file src-dir))
-       (javac {:srcdir    (make-path src-dir)
-               :destdir   (:compile-path project)
-               :classpath (apply make-path (get-classpath project))}))))
diff --git a/src/test.clj b/src/test.clj
deleted file mode 100644
index ff560d4..0000000
--- a/src/test.clj
+++ /dev/null
@@ -1,14 +0,0 @@
-(use 'clojure.test)
-
-(def test-names [:protobuf])
-
-(def test-namespaces
-     (map #(symbol (str "test." (name %)))
-          test-names))
-
-(defn run []
-  (println "Loading tests...")
-  (apply require :reload-all test-namespaces)
-  (apply run-tests test-namespaces))
-
-(run)
\ No newline at end of file

From e4fdac3fbd19f7113832a6d78bae5723ac3ebb6a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 16 Jun 2010 15:09:40 -0700
Subject: [PATCH 053/525] save your fork

---
 .gitignore                               |  2 +
 project.clj                              | 27 ++-----
 proto/clojure/protobuf/collections.proto |  2 +
 src/clj/leiningen/install_protoc.clj     | 42 -----------
 src/clj/leiningen/proto.clj              | 75 -------------------
 src/clj/protobuf/tasks.clj               | 91 ++++++++++++++++++++++++
 src/leiningen                            |  1 -
 7 files changed, 99 insertions(+), 141 deletions(-)
 delete mode 100644 src/clj/leiningen/install_protoc.clj
 delete mode 100644 src/clj/leiningen/proto.clj
 create mode 100644 src/clj/protobuf/tasks.clj
 delete mode 120000 src/leiningen

diff --git a/.gitignore b/.gitignore
index a269431..6af1d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+.cake
 *~
 lib
 classes
+build
 pom.xml
 *.jar
 *.class
\ No newline at end of file
diff --git a/project.clj b/project.clj
index 3bf68d6..4af8c2e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,27 +1,8 @@
 (defproject clojure-protobuf "0.1.0-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
-                 [clojure-contrib "1.2.0-SNAPSHOT"]
-                 [classlojure     "0.1.0-SNAPSHOT"]]
-  :source-path      "src/clj"
-  :java-source-path "src/jvm"
-  :resources-path   "proto")
+                 [clojure-contrib "1.2.0-SNAPSHOT"]]
+  :tasks [protobuf.tasks]
+  :jar-files ["proto"])
 
-(use 'clojure.contrib.with-ns)
-(require 'leiningen.compile)
-(with-ns 'leiningen.compile
-
-  (defn proto [project]
-    (try (require 'classlojure)
-         (require 'leiningen.proto)
-         ((ns-resolve 'leiningen.proto 'proto) project)
-       (catch java.io.FileNotFoundException e
-         (println "you must run 'lein deps' first")
-         (System/exit 1))))
-
-  (defn compile [project]
-    (proto project)
-    (lancet/javac {:srcdir    (make-path (:java-source-path project))
-                   :destdir   (:compile-path project)
-                   :classpath (apply make-path (get-classpath project))}))
-)
\ No newline at end of file
+(deftask compile => proto)
\ No newline at end of file
diff --git a/proto/clojure/protobuf/collections.proto b/proto/clojure/protobuf/collections.proto
index 9883606..cfe5c0c 100644
--- a/proto/clojure/protobuf/collections.proto
+++ b/proto/clojure/protobuf/collections.proto
@@ -7,4 +7,6 @@ extend google.protobuf.FieldOptions {
   optional bool   set    = 52001;
   optional bool   map    = 52002;
   optional string map_by = 52003;
+  //  optional bool   sorted = 52004;
+  //  optional bool   multi  = 52005;
 }
diff --git a/src/clj/leiningen/install_protoc.clj b/src/clj/leiningen/install_protoc.clj
deleted file mode 100644
index 1d267f1..0000000
--- a/src/clj/leiningen/install_protoc.clj
+++ /dev/null
@@ -1,42 +0,0 @@
-(ns leiningen.install-protoc
-  (:use clojure.contrib.shell-out
-        clojure.contrib.str-utils
-        lancet))
-
-(def proto-version "protobuf-2.3.0")
-(def build-dir     "lib/build/")
-(def protobuf-dir  (str build-dir proto-version))
-
-(defn shell [& args]
-  (let [return (apply sh :return-map true args)]
-    (if (= 0 (return :exit))
-      (return :out)
-      (throw (Exception. (str "command failed: " (str-join " " args) "\n" (return :err)))))))
-
-(defn exists? [file]
-  (.exists (java.io.File. file)))
-
-(deftarget fetch-source "fetch google protocol buffer source"
-  (let [url      (java.net.URL. (str "http://protobuf.googlecode.com/files/" proto-version ".tar.gz"))
-        tarfile  (str protobuf-dir ".tar.gz")
-        gzip     (doto (org.apache.tools.ant.taskdefs.Untar$UntarCompressionMethod.) (.setValue "gzip"))]
-    (when-not (exists? protobuf-dir)
-      (mkdir {:dir build-dir})
-      (ant-get {:src url :dest tarfile})
-      (untar   {:src tarfile :dest build-dir :compression gzip}))))
-
-(deftarget install "install google protocol buffers"
-  (when (empty? (sh "which" "protoc"))
-    (fetch-source)
-    (with-sh-dir protobuf-dir
-      (when-not (exists? (str protobuf-dir "/src/protoc"))
-        (println "building google protobuf compiler...")
-        (chmod   {:file (str protobuf-dir "/configure")  :perm "+x"})
-        (chmod   {:file (str protobuf-dir "/install-sh") :perm "+x"})
-        (shell "./configure")
-        (shell "make"))
-      (println "installing google protobuf compiler...")
-      (shell "sudo" "make" "install"))))
-
-(defn install-protoc [project]
-  (install))
\ No newline at end of file
diff --git a/src/clj/leiningen/proto.clj b/src/clj/leiningen/proto.clj
deleted file mode 100644
index a53be76..0000000
--- a/src/clj/leiningen/proto.clj
+++ /dev/null
@@ -1,75 +0,0 @@
-(ns leiningen.proto
-  (:use leiningen.install-protoc
-        [leiningen.classpath :only [make-path get-classpath]]
-        [classlojure :only [extract-resource]]
-        [clojure.contrib.io :only [file read-lines]]
-        lancet))
-
-(def proto-dir         "proto")
-(def proto-extract-dir "lib/proto")
-(def proto-src-dir     "lib/proto_src")
-
-(defn- match [p s]
-  (when s
-    (let [p (if (string? p) (re-pattern p) p)]
-      (second (re-matches p s)))))
-
-(defn- proto-exists? [proto]
-  (or (.exists (file proto-dir proto))
-      (.exists (file proto-extract-dir proto))))
-
-(defn- proto-dependencies
-  "look for lines starting with import in proto-file"
-  [proto-file]
-  (for [line (read-lines proto-file) :when (.startsWith line "import")]
-    (match #".*\"(.*)\".*" line)))
-
-(defn extract-dependencies
-  "extract all files proto is dependent on"
-  [proto]
-  (loop [files (vec (proto-dependencies (file proto-dir proto)))]
-    (when-not (empty? files)
-      (let [proto (peek files)
-            files (pop files)]
-        (if (proto-exists? proto)
-          (recur files)
-          (let [proto-file (extract-resource proto proto-extract-dir)]
-            (recur (into files (proto-dependencies proto-file)))))))))
-
-(defn protoc [proto src-dir]
-  (println "compiling" proto "to" src-dir)
-  (extract-dependencies proto)
-  (mkdir {:dir src-dir})
-  (shell :dir proto-dir
-     "protoc" proto (str "--java_out=../" src-dir) "-I." (str "-I../" proto-extract-dir)))
-
-(declare proto)
-
-(defn build-protobuf [project]
-  (fetch-source)
-  (let [src-dir    (str protobuf-dir "/java/src/main/java")
-        descriptor "google/protobuf/descriptor.proto"
-        todir      (str proto-dir "/google/protobuf")]
-    (mkdir {:dir todir})
-    (copy {:file (str protobuf-dir "/src/" descriptor) :todir todir})
-    (protoc descriptor src-dir)
-    (javac {:srcdir  (make-path src-dir)
-            :destdir (:compile-path project)})
-    (proto project "clojure/protobuf/collections.proto")))
-
-(defn- proto-files [dir]
-  (for [file (rest (file-seq (file dir))) :when (re-find #"\.proto$" (.getName file))]
-    (.substring (.getPath file) (inc (count dir)))))
-
-(defn proto
-  ([project]
-     (if (= "clojure-protobuf" (:name project))
-       (build-protobuf project)
-       (apply proto project (proto-files proto-dir))))
-  ([project & files]
-     (install)
-     (doseq [file files]
-       (protoc file proto-src-dir))
-     (javac {:srcdir    (make-path proto-src-dir)
-             :destdir   (:compile-path project)
-             :classpath (apply make-path (get-classpath project))})))
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
new file mode 100644
index 0000000..a334c21
--- /dev/null
+++ b/src/clj/protobuf/tasks.clj
@@ -0,0 +1,91 @@
+(ns protobuf.tasks
+  (:use cake cake.ant
+        [clojure.java.shell :only [sh]]
+        [clojure.java.io :only [copy reader]])
+  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]
+           [java.net URL URLClassLoader URLConnection JarURLConnection]
+           [java.util.jar JarEntry]
+           [java.io File]))
+
+(def version "2.3.0")
+(def srcdir  (format "build/protobuf-%s" version))
+(def tarfile (format "build/protobuf-%s.tar.gz" version))
+(def url     (java.net.URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
+
+(defn installed? []
+  (try (.contains (:out (sh "protoc" "--version")) version)
+       (catch java.io.IOException e)))
+
+(deftask fetch-protoc
+  (when-not (.exists (file srcdir))
+    (ant Get   {:src url :dest tarfile})
+    (ant Untar {:src tarfile :dest "build" :compression "gzip"})))
+
+(deftask install-protoc
+  (when-not (installed?)
+    (run-task 'fetch-protoc)
+    (when-not (.exists (file srcdir "src" "protoc"))
+      (ant Chmod {:file (file srcdir "configure")  :perm "+x"})
+      (ant Chmod {:file (file srcdir "install-sh") :perm "+x"})
+      (ant ExecTask {:dir srcdir :executable "./configure"})
+      (ant ExecTask {:dir srcdir :executable "make"}))
+    (ant ExecTask {:dir srcdir :executable "sudo"}
+         (args ["make" "install"]))))
+
+(defn- proto-dependencies
+  "look for lines starting with import in proto-file"
+  [proto-file]
+  (for [line (line-seq (reader proto-file)) :when (.startsWith line "import")]
+    (second (re-matches #".*\"(.*)\".*" line))))
+
+(defn extract-resource [name dest-dir]
+  (let [loader (.getClassLoader clojure.lang.RT)
+        url    (.findResource loader name)
+        conn   (.openConnection url)]
+    (if (instance? JarURLConnection conn)
+      (let [jar  (cast JarURLConnection conn)
+            dest (File. dest-dir (.. jar getJarEntry getName))]
+        (copy (.getInputStream jar) dest))
+      (copy (File. (.getFile url)) (File. dest-dir name)))))
+
+(defn extract-dependencies
+  "extract all files proto is dependent on"
+  [proto-file]
+  (loop [files (vec (proto-dependencies proto-file))]
+    (when-not (empty? files)
+      (let [proto (peek files)
+            files (pop files)]
+        (if (or (.exists (file "proto" proto)) (.exists (file "build/proto" proto)))
+          (recur files)
+          (let [proto-file (extract-resource proto "build/proto")]
+            (recur (into files (proto-dependencies proto-file)))))))))
+
+(defn protoc
+  ([protos] (protoc protos "build/protosrc"))
+  ([protos dest]
+      (doseq [proto protos]
+        (log "compiling" proto "to" dest)
+        (extract-dependencies (file "proto" proto))
+        (ant Mkdir {:dir dest})
+        (ant Mkdir {:dir "build/proto"})
+        (ant ExecTask {:executable "protoc" :dir "proto"}
+             (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"])))
+      (ant Javac {:srcdir    (path dest)
+                  :destdir   (file "classes")
+                  :classpath (classpath project)})))
+
+(defn build-protobuf []
+  (ant Mkdir {:dir "proto/google/protobuf"})
+  (ant Copy {:file (str srcdir "/src/google/protobuf/descriptor.proto") :todir "proto/google/protobuf"})
+  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java"))
+  (protoc ["clojure/protobuf/collections.proto"]))
+
+(defn proto-files [dir]
+  (for [file (rest (file-seq dir)) :when (.endsWith (.getName file) ".proto")]
+    (.substring (.getPath file) (inc (count (.getPath dir))))))
+
+(deftask proto
+  (if (= "clojure-protobuf" (:artifact-id project))
+    (do (run-task 'fetch-protoc)
+        (build-protobuf))
+    (protoc (or (:proto opts) (proto-files (file "proto"))))))
diff --git a/src/leiningen b/src/leiningen
deleted file mode 120000
index 369c96c..0000000
--- a/src/leiningen
+++ /dev/null
@@ -1 +0,0 @@
-clj/leiningen
\ No newline at end of file

From d39b59a5015be620ea8e34d17dca0f46d3fdaf23 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 16 Jun 2010 15:10:14 -0700
Subject: [PATCH 054/525] bump version

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4af8c2e..ed97ab1 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.1.0-SNAPSHOT"
+(defproject clojure-protobuf "0.2.0"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]

From 373502f894917e72513e5893123980d507c43e7a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 16 Jun 2010 17:11:59 -0700
Subject: [PATCH 055/525] bump version

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index ed97ab1..ea97e2f 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.0"
+(defproject clojure-protobuf "0.2.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]

From 7785e7a5e4e2283f305c12670059c1ba8b13e056 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 16 Jun 2010 17:48:22 -0700
Subject: [PATCH 056/525] improved error message when proto files are missing

---
 src/clj/protobuf/tasks.clj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index a334c21..1d86f0b 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -39,14 +39,14 @@
     (second (re-matches #".*\"(.*)\".*" line))))
 
 (defn extract-resource [name dest-dir]
-  (let [loader (.getClassLoader clojure.lang.RT)
-        url    (.findResource loader name)
-        conn   (.openConnection url)]
-    (if (instance? JarURLConnection conn)
-      (let [jar  (cast JarURLConnection conn)
-            dest (File. dest-dir (.. jar getJarEntry getName))]
-        (copy (.getInputStream jar) dest))
-      (copy (File. (.getFile url)) (File. dest-dir name)))))
+  (if-let [url (.findResource (.getClassLoader clojure.lang.RT) name)]
+    (let [conn (.openConnection url)]
+      (if (instance? JarURLConnection conn)
+        (let [jar  (cast JarURLConnection conn)
+              dest (File. dest-dir (.. jar getJarEntry getName))]
+          (copy (.getInputStream jar) dest))
+        (copy (File. (.getFile url)) (File. dest-dir name))))
+    (throw (Exception. (format "unable to find %s on classpath" name)))))
 
 (defn extract-dependencies
   "extract all files proto is dependent on"

From cac29903c85c757d9061e524e5660952d6f44b1b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 17 Jun 2010 11:09:19 -0700
Subject: [PATCH 057/525] move .gitignore out of proto dir

---
 .gitignore       | 3 ++-
 proto/.gitignore | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 proto/.gitignore

diff --git a/.gitignore b/.gitignore
index 6af1d4d..79b5bdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ classes
 build
 pom.xml
 *.jar
-*.class
\ No newline at end of file
+*.class
+proto/google/protobuf/descriptor.proto
diff --git a/proto/.gitignore b/proto/.gitignore
deleted file mode 100644
index 576998b..0000000
--- a/proto/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-google/protobuf/descriptor.proto
\ No newline at end of file

From 78677d4d4f0ff4b602607dda444fcdc85b2a1a6d Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 17 Jun 2010 15:49:11 -0700
Subject: [PATCH 058/525] extract proto files from the proto dir

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 1d86f0b..83dcde9 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -57,7 +57,7 @@
             files (pop files)]
         (if (or (.exists (file "proto" proto)) (.exists (file "build/proto" proto)))
           (recur files)
-          (let [proto-file (extract-resource proto "build/proto")]
+          (let [proto-file (extract-resource (str "proto/" proto) "build/proto")]
             (recur (into files (proto-dependencies proto-file)))))))))
 
 (defn protoc

From aea9e6b6632ba1068c34c475ebcab73bd12d2c89 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 17 Jun 2010 16:29:37 -0700
Subject: [PATCH 059/525] fix extract-dependencies in tasks

---
 src/clj/protobuf/tasks.clj | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 83dcde9..d2c089d 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -32,24 +32,24 @@
     (ant ExecTask {:dir srcdir :executable "sudo"}
          (args ["make" "install"]))))
 
-(defn- proto-dependencies
-  "look for lines starting with import in proto-file"
+(defn- proto-dependencies "look for lines starting with import in proto-file"
   [proto-file]
   (for [line (line-seq (reader proto-file)) :when (.startsWith line "import")]
     (second (re-matches #".*\"(.*)\".*" line))))
 
 (defn extract-resource [name dest-dir]
   (if-let [url (.findResource (.getClassLoader clojure.lang.RT) name)]
-    (let [conn (.openConnection url)]
+    (let [dest (File. dest-dir name)
+          conn (.openConnection url)]
+      (.mkdirs (.getParentFile dest))
       (if (instance? JarURLConnection conn)
-        (let [jar  (cast JarURLConnection conn)
-              dest (File. dest-dir (.. jar getJarEntry getName))]
+        (let [jar (cast JarURLConnection conn)]
           (copy (.getInputStream jar) dest))
-        (copy (File. (.getFile url)) (File. dest-dir name))))
+        (copy (File. (.getFile url)) dest))
+      dest)
     (throw (Exception. (format "unable to find %s on classpath" name)))))
 
-(defn extract-dependencies
-  "extract all files proto is dependent on"
+(defn extract-dependencies "extract all files proto is dependent on"
   [proto-file]
   (loop [files (vec (proto-dependencies proto-file))]
     (when-not (empty? files)
@@ -57,7 +57,7 @@
             files (pop files)]
         (if (or (.exists (file "proto" proto)) (.exists (file "build/proto" proto)))
           (recur files)
-          (let [proto-file (extract-resource (str "proto/" proto) "build/proto")]
+          (let [proto-file (extract-resource (str "proto/" proto) "build")]
             (recur (into files (proto-dependencies proto-file)))))))))
 
 (defn protoc

From 456c9b0c3aaa17fb401766761cbb8406bb217908 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 21 Jun 2010 16:40:08 -0700
Subject: [PATCH 060/525] build protos before compiling

---
 src/clj/protobuf/tasks.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index d2c089d..4d2fb1d 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -84,6 +84,7 @@
   (for [file (rest (file-seq dir)) :when (.endsWith (.getName file) ".proto")]
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
+(deftask compile #{proto})
 (deftask proto
   (if (= "clojure-protobuf" (:artifact-id project))
     (do (run-task 'fetch-protoc)

From 94e7772a0590fa2a3bf13b7184266542b1b24784 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 29 Jun 2010 11:40:21 -0700
Subject: [PATCH 061/525] add license

---
 LICENSE | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..fec593a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,227 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and
+are distributed by that particular Contributor. A Contribution
+'originates' from a Contributor if it was added to the Program by such
+Contributor itself or anyone acting on such Contributor's
+behalf. Contributions do not include additions to the Program which:
+(i) are separate modules of software distributed in conjunction with
+the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor
+which are necessarily infringed by the use or sale of its Contribution
+alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this
+Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free copyright
+license to reproduce, prepare derivative works of, publicly display,
+publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and
+object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free patent
+license under Licensed Patents to make, use, sell, offer to sell,
+import and otherwise transfer the Contribution of such Contributor, if
+any, in source code and object code form.  This patent license shall
+apply to the combination of the Contribution and the Program if, at
+the time the Contribution is added by the Contributor, such addition
+of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are
+provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow
+Recipient to distribute the Program, it is Recipient's responsibility
+to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright
+license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form
+under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties
+and conditions, express and implied, including warranties or
+conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability
+for damages, including direct, indirect, special, incidental and
+consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable
+manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a
+commercial product offering should do so in a manner which does not
+create potential liability for other Contributors. Therefore, if a
+Contributor includes the Program in a commercial product offering,
+such Contributor ("Commercial Contributor") hereby agrees to defend
+and indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses") arising
+from claims, lawsuits and other legal actions brought by a third party
+against the Indemnified Contributor to the extent caused by the acts
+or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering.  The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must: a)
+promptly notify the Commercial Contributor in writing of such claim,
+and b) allow the Commercial Contributor tocontrol, and cooperate with
+the Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable
+laws, damage to or loss of data, programs or equipment, and
+unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+the Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of
+the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably
+practicable. However, Recipient's obligations under this Agreement and
+any licenses granted by Recipient relating to the Program shall
+continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign
+the responsibility to serve as the Agreement Steward to a suitable
+separate entity. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions)
+may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives
+no rights or licenses to the intellectual property of any Contributor
+under this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of Washington and
+the intellectual property laws of the United States of America. No
+party to this Agreement will bring a legal action under this Agreement
+more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.

From aa6fdce48340774352f71a42e67f6fe6748867ac Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 29 Jun 2010 11:40:46 -0700
Subject: [PATCH 062/525] use useful.io/extract-resource

---
 project.clj                |  4 +---
 src/clj/protobuf/tasks.clj | 20 ++++----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/project.clj b/project.clj
index ea97e2f..4631598 100644
--- a/project.clj
+++ b/project.clj
@@ -3,6 +3,4 @@
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
   :tasks [protobuf.tasks]
-  :jar-files ["proto"])
-
-(deftask compile => proto)
\ No newline at end of file
+  :jar-files ["proto"])
\ No newline at end of file
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 4d2fb1d..05ce49d 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,16 +1,16 @@
 (ns protobuf.tasks
   (:use cake cake.ant
         [clojure.java.shell :only [sh]]
-        [clojure.java.io :only [copy reader]])
+        [clojure.java.io :only [reader]]
+        [useful.io :only [extract-resource]])
   (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]
-           [java.net URL URLClassLoader URLConnection JarURLConnection]
-           [java.util.jar JarEntry]
+           [java.net URL URLConnection JarURLConnection]
            [java.io File]))
 
 (def version "2.3.0")
 (def srcdir  (format "build/protobuf-%s" version))
 (def tarfile (format "build/protobuf-%s.tar.gz" version))
-(def url     (java.net.URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
+(def url     (URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
 
 (defn installed? []
   (try (.contains (:out (sh "protoc" "--version")) version)
@@ -37,18 +37,6 @@
   (for [line (line-seq (reader proto-file)) :when (.startsWith line "import")]
     (second (re-matches #".*\"(.*)\".*" line))))
 
-(defn extract-resource [name dest-dir]
-  (if-let [url (.findResource (.getClassLoader clojure.lang.RT) name)]
-    (let [dest (File. dest-dir name)
-          conn (.openConnection url)]
-      (.mkdirs (.getParentFile dest))
-      (if (instance? JarURLConnection conn)
-        (let [jar (cast JarURLConnection conn)]
-          (copy (.getInputStream jar) dest))
-        (copy (File. (.getFile url)) dest))
-      dest)
-    (throw (Exception. (format "unable to find %s on classpath" name)))))
-
 (defn extract-dependencies "extract all files proto is dependent on"
   [proto-file]
   (loop [files (vec (proto-dependencies proto-file))]

From 1bfcb9e752023d38f39b6348af0a887740e98021 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 29 Jun 2010 11:41:36 -0700
Subject: [PATCH 063/525] bump version

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4631598..e11da5a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.1-SNAPSHOT"
+(defproject clojure-protobuf "0.2.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]

From 3bcf47f19f64ac192c4096e9920d77e95fc6537a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 30 Jun 2010 11:22:46 -0700
Subject: [PATCH 064/525] don't rebuild protos unless the files have changed

---
 project.clj                |  2 +-
 src/clj/protobuf/tasks.clj | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/project.clj b/project.clj
index e11da5a..278d8d0 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.1"
+(defproject clojure-protobuf "0.2.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 05ce49d..824223e 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -3,14 +3,12 @@
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
         [useful.io :only [extract-resource]])
-  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]
-           [java.net URL URLConnection JarURLConnection]
-           [java.io File]))
+  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
 (def srcdir  (format "build/protobuf-%s" version))
 (def tarfile (format "build/protobuf-%s.tar.gz" version))
-(def url     (URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
+(def url     (java.net.URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
 
 (defn installed? []
   (try (.contains (:out (sh "protoc" "--version")) version)
@@ -48,19 +46,23 @@
           (let [proto-file (extract-resource (str "proto/" proto) "build")]
             (recur (into files (proto-dependencies proto-file)))))))))
 
+(defn modtime [dir]
+  (apply max (map #(.lastModified %) (file-seq (file dir)))))
+
 (defn protoc
   ([protos] (protoc protos "build/protosrc"))
   ([protos dest]
-      (doseq [proto protos]
-        (log "compiling" proto "to" dest)
-        (extract-dependencies (file "proto" proto))
-        (ant Mkdir {:dir dest})
-        (ant Mkdir {:dir "build/proto"})
-        (ant ExecTask {:executable "protoc" :dir "proto"}
-             (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"])))
-      (ant Javac {:srcdir    (path dest)
-                  :destdir   (file "classes")
-                  :classpath (classpath project)})))
+     (when (> (modtime "proto") (modtime dest))
+       (doseq [proto protos]
+         (log "compiling" proto "to" dest)
+         (extract-dependencies (file "proto" proto))
+         (ant Mkdir {:dir dest})
+         (ant Mkdir {:dir "build/proto"})
+         (ant ExecTask {:executable "protoc" :dir "proto"}
+              (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"])))
+       (ant Javac {:srcdir    (path dest)
+                   :destdir   (file "classes")
+                   :classpath (classpath project)}))))
 
 (defn build-protobuf []
   (ant Mkdir {:dir "proto/google/protobuf"})

From 510bdca82dce094ccbcc4997b80d3c4d4ae8db2c Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 6 Jul 2010 15:13:25 -0700
Subject: [PATCH 065/525] install protoc before trying to compile proto files

---
 src/clj/protobuf/tasks.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 824223e..fca5a41 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -75,7 +75,8 @@
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
 (deftask compile #{proto})
-(deftask proto
+(deftask proto #{install-protoc}
+  "Compile protocol buffer files located in proto dir."
   (if (= "clojure-protobuf" (:artifact-id project))
     (do (run-task 'fetch-protoc)
         (build-protobuf))

From 54f6a02d84a1bdb59691a14f05cc5c057615ab4c Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 6 Jul 2010 16:03:02 -0700
Subject: [PATCH 066/525] recompile protobufs if src or class dir is older than
 proto dir.

---
 src/clj/protobuf/tasks.clj | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index fca5a41..4610134 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -47,12 +47,16 @@
             (recur (into files (proto-dependencies proto-file)))))))))
 
 (defn modtime [dir]
-  (apply max (map #(.lastModified %) (file-seq (file dir)))))
+  (let [files (rest (file-seq (file dir)))]
+    (if (empty? files)
+      0
+      (apply max (map #(.lastModified %) files)))))
 
 (defn protoc
   ([protos] (protoc protos "build/protosrc"))
   ([protos dest]
-     (when (> (modtime "proto") (modtime dest))
+     (when (or (> (modtime "proto") (modtime dest))
+               (> (modtime "proto") (modtime "classes")))
        (doseq [proto protos]
          (log "compiling" proto "to" dest)
          (extract-dependencies (file "proto" proto))

From 96a0ced8df31ef6d8e7554b0ae309d1f32a317fb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 6 Jul 2010 16:03:23 -0700
Subject: [PATCH 067/525] bump version

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 278d8d0..693b3d9 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.2"
+(defproject clojure-protobuf "0.2.3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]

From 70e37db310548200d615b075a61392deb2c32043 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 19 Jul 2010 13:09:51 -0700
Subject: [PATCH 068/525] fix tests to run with cake

---
 {test => proto/clojure/protobuf}/test.proto |  4 ++--
 src/clj/protobuf.clj                        |  4 ++--
 src/clj/protobuf/tasks.clj                  | 12 +++++++++---
 test/{protobuf.clj => protobuf_test.clj}    |  8 ++++----
 4 files changed, 17 insertions(+), 11 deletions(-)
 rename {test => proto/clojure/protobuf}/test.proto (89%)
 rename test/{protobuf.clj => protobuf_test.clj} (95%)

diff --git a/test/test.proto b/proto/clojure/protobuf/test.proto
similarity index 89%
rename from test/test.proto
rename to proto/clojure/protobuf/test.proto
index 419cc11..583fec3 100644
--- a/test/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -1,7 +1,7 @@
-package test.protobuf;
 import "clojure/protobuf/collections.proto";
 
-option java_outer_classname = "Proto";
+option java_package = "clojure.protobuf";
+option java_outer_classname = "Test";
 
 message Foo {
   optional uint32   id        = 1 [default = 43];
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index ee73d55..98e717b 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -30,8 +30,8 @@
 (defn protofields [type]
   (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)
         type #^com.google.protobuf.Descriptors$Descriptor (.getMessageType type)]
-    (map (fn [#^com.google.protobuf.Descriptors$FieldDescriptor field] (keyword (.getName field)))
-         (.getFields type))))
+    (for [#^com.google.protobuf.Descriptors$FieldDescriptor field (.getFields type)]
+      (keyword (.getName field)))))
 
 (defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 4610134..43d3289 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -55,7 +55,8 @@
 (defn protoc
   ([protos] (protoc protos "build/protosrc"))
   ([protos dest]
-     (when (or (> (modtime "proto") (modtime dest))
+     (when (or (:recompile opts)
+               (> (modtime "proto") (modtime dest))
                (> (modtime "proto") (modtime "classes")))
        (doseq [proto protos]
          (log "compiling" proto "to" dest)
@@ -72,10 +73,15 @@
   (ant Mkdir {:dir "proto/google/protobuf"})
   (ant Copy {:file (str srcdir "/src/google/protobuf/descriptor.proto") :todir "proto/google/protobuf"})
   (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java"))
-  (protoc ["clojure/protobuf/collections.proto"]))
+  (protoc ["clojure/protobuf/collections.proto" "clojure/protobuf/test.proto"]))
+
+(defn proto-file? [file]
+  (let [name (.getName file)]
+    (and (.endsWith name ".proto")
+         (not (.startsWith name ".")))))
 
 (defn proto-files [dir]
-  (for [file (rest (file-seq dir)) :when (.endsWith (.getName file) ".proto")]
+  (for [file (rest (file-seq dir)) :when (proto-file? file)]
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
 (deftask compile #{proto})
diff --git a/test/protobuf.clj b/test/protobuf_test.clj
similarity index 95%
rename from test/protobuf.clj
rename to test/protobuf_test.clj
index 38360a0..9959b45 100644
--- a/test/protobuf.clj
+++ b/test/protobuf_test.clj
@@ -1,8 +1,8 @@
-(ns test.protobuf
+(ns protobuf-test
   (:use protobuf)
   (:use clojure.test))
 
-(defprotobuf Foo test.protobuf.Proto Foo)
+(defprotobuf Foo clojure.protobuf.Test Foo)
 
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
@@ -62,7 +62,7 @@
   (testing "protofields"
     (let [fields '(:id :label :tags :parent :responses :tag_set :attr_map :foo_by_id :groups)]
       (is (= fields (protofields Foo)))
-      (is (= fields (protofields test.protobuf.Proto$Foo)))))
+      (is (= fields (protofields clojure.protobuf.Test$Foo)))))
   (testing "protodefault"
     (is (= 43  (protodefault Foo :id)))
     (is (= ""  (protodefault Foo :label)))
@@ -72,7 +72,7 @@
     (is (= #{} (protodefault Foo :tag_set)))
     (is (= {}  (protodefault Foo :foo_by_id)))
     (is (= {}  (protodefault Foo :groups)))
-    (is (= {}  (protodefault test.protobuf.Proto$Foo :groups)))
+    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))
   ))
 
 (deftest protobuf-extended

From 8ee26d50fc65a4135f7d23fb880439b82d8f92f1 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 19 Jul 2010 13:48:51 -0700
Subject: [PATCH 069/525] rename collections.proto to extensions.proto. add
 meta extension field

---
 project.clj                                               | 2 +-
 .../protobuf/{collections.proto => extensions.proto}      | 3 ++-
 proto/clojure/protobuf/test.proto                         | 4 ++--
 src/clj/protobuf.clj                                      | 6 ++++--
 src/clj/protobuf/tasks.clj                                | 2 +-
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 8 ++++----
 test/protobuf_test.clj                                    | 3 ++-
 7 files changed, 16 insertions(+), 12 deletions(-)
 rename proto/clojure/protobuf/{collections.proto => extensions.proto} (79%)

diff --git a/project.clj b/project.clj
index 693b3d9..46ccd22 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.3"
+(defproject clojure-protobuf "0.2.4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
diff --git a/proto/clojure/protobuf/collections.proto b/proto/clojure/protobuf/extensions.proto
similarity index 79%
rename from proto/clojure/protobuf/collections.proto
rename to proto/clojure/protobuf/extensions.proto
index cfe5c0c..4441d4f 100644
--- a/proto/clojure/protobuf/collections.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -1,7 +1,7 @@
 import "google/protobuf/descriptor.proto";
 
 option java_package = "clojure.protobuf";
-option java_outer_classname = "Collections";
+option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
   optional bool   set    = 52001;
@@ -9,4 +9,5 @@ extend google.protobuf.FieldOptions {
   optional string map_by = 52003;
   //  optional bool   sorted = 52004;
   //  optional bool   multi  = 52005;
+  optional string meta   = 52006;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 583fec3..edab84c 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -1,11 +1,11 @@
-import "clojure/protobuf/collections.proto";
+import "clojure/protobuf/extensions.proto";
 
 option java_package = "clojure.protobuf";
 option java_outer_classname = "Test";
 
 message Foo {
   optional uint32   id        = 1 [default = 43];
-  optional string   label     = 2;
+  optional string   label     = 2 [(meta) = "{:a 1 :b 2 :c 3}"];
   repeated string   tags      = 3;
   optional Foo      parent    = 4;
   repeated Response responses = 5;
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 98e717b..fbd0f66 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -30,8 +30,10 @@
 (defn protofields [type]
   (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)
         type #^com.google.protobuf.Descriptors$Descriptor (.getMessageType type)]
-    (for [#^com.google.protobuf.Descriptors$FieldDescriptor field (.getFields type)]
-      (keyword (.getName field)))))
+    (into {}
+      (for [#^com.google.protobuf.Descriptors$FieldDescriptor field (.getFields type)]
+        (let [meta-string (.. field getOptions (getExtension (clojure.protobuf.Extensions/meta)))]
+          [(keyword (.getName field)) (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 43d3289..a4dfd80 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -73,7 +73,7 @@
   (ant Mkdir {:dir "proto/google/protobuf"})
   (ant Copy {:file (str srcdir "/src/google/protobuf/descriptor.proto") :todir "proto/google/protobuf"})
   (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java"))
-  (protoc ["clojure/protobuf/collections.proto" "clojure/protobuf/test.proto"]))
+  (protoc ["clojure/protobuf/extensions.proto" "clojure/protobuf/test.proto"]))
 
 (defn proto-file? [file]
   (let [name (.getName file)]
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index cc210c1..49fa069 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -190,7 +190,7 @@ static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_valu
   static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
     Keyword keyword = map_field_by.get(field);
     if (keyword == null) {
-      String name = field.getOptions().getExtension(Collections.mapBy);
+      String name = field.getOptions().getExtension(Extensions.mapBy);
 
       name = name.toLowerCase().replaceAll("_","-");
       keyword = Keyword.intern(Symbol.intern(name));
@@ -221,7 +221,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           }
         }
         return map.persistent();
-      } else if (options.getExtension(Collections.map)) {
+      } else if (options.getExtension(Extensions.map)) {
         Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
         Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
         Descriptors.FieldDescriptor val_field = def.fieldDescriptor(k_val);
@@ -244,7 +244,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         while (iterator.hasNext()) {
           list.add(fromProtoValue(field, iterator.next()));
         }
-        return options.getExtension(Collections.set) ? PersistentHashSet.create(list) : PersistentVector.create(list);
+        return options.getExtension(Extensions.set) ? PersistentHashSet.create(list) : PersistentVector.create(list);
       }
     } else {
       switch (field.getJavaType()) {
@@ -318,7 +318,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
             Object value = toProtoValue(field, map.assoc(map_field_by, e.getKey()));
             builder.addRepeatedField(field, value);
           }
-        } else if (field.getOptions().getExtension(Collections.map)) {
+        } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(val); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 9959b45..77d93af 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -60,7 +60,8 @@
       (is (= ["sweet" "savory"] (s :tags)))
     ))
   (testing "protofields"
-    (let [fields '(:id :label :tags :parent :responses :tag_set :attr_map :foo_by_id :groups)]
+    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil,
+                  :tag_set nil, :attr_map nil, :foo_by_id nil, :groups nil}]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields clojure.protobuf.Test$Foo)))))
   (testing "protodefault"

From c81fbe51e39f3e3825e1ae34efabadfdbe6e9262 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 19 Jul 2010 14:24:40 -0700
Subject: [PATCH 070/525] update readme

---
 README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 42f908f..c3d893d 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ Write a `.proto` file:
       repeated string likes = 4;
     }
 
-If you put it in the protos directory of your project, you can compile it with lein:
+If you put it in the proto directory of your project, you can compile it with cake:
 
-    lein proto example.proto
+    cake proto example.proto
 
 Now you can use the protocol buffer in clojure:
 
@@ -40,12 +40,13 @@ Now you can use the protocol buffer in clojure:
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
 
-## Collection extensions
+## Extensions
 
 Clojure-protobuf supports extensions to protocol buffers which provide sets and maps using
-repeated fields. To use these, you must import the extension file and include it when compiling. For example:
+repeated fields. You can also provide metadata on protobuf fields using clojure syntax. To
+use these, you must import the extension file and include it when compiling. For example:
 
-    import "collections.proto";
+    import "clojure/protobuf/extensions.proto";
     message Photo {
       required int32  id     = 1;
       required string path   = 2;
@@ -60,7 +61,7 @@ repeated fields. To use these, you must import the extension file and include it
 
       message Tag {
         required int32 person_id = 1;
-        optional int32 x_coord   = 2;
+        optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
         optional int32 y_coord   = 3;
         optional int32 width     = 4;
         optional int32 height    = 5;
@@ -69,12 +70,13 @@ repeated fields. To use these, you must import the extension file and include it
 
 Compile the file:
 
-     lein proto example.proto
+     cake proto example.proto
 
 Then you can access the maps in clojure:
 
     (use 'protobuf)
     (defprotobuf Photo Example$Photo)
+    (defprotobuf Tag Example$Photo$Tag)
 
     (def p (protobuf Photo :id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
@@ -87,15 +89,14 @@ Then you can access the maps in clojure:
     (protobuf-load Photo b)
     => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
-## Installation
-
-In your [Leiningen](http://github.com/technomancy/leiningen) project.clj:
+    (:x-coord (protofields Tag))
+    => {:max 100.0 :min -100.0}
 
-    :dependencies [[clojure-protobuf "0.1.0-SNAPSHOT"]]
+## Installation
 
-Build from source:
+Add clojure-protobuf to your [Cake](http://github.com/ninjudd/cake) project.clj:
 
-    lein deps
-    lein jar
+    :dependencies [[clojure-protobuf "0.2.4"]]
+    :dev-dependencies [[clojure-protobuf "0.2.4"]]
 
 This code works with Clojure 1.2. Here's the [1.1 branch](http://github.com/ninjudd/clojure-protobuf/tree/clojure-1.1).
\ No newline at end of file

From 36a42c337f94c57fbcf6ab255b8fb1a9c553d943 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 19 Jul 2010 16:04:51 -0700
Subject: [PATCH 071/525] update readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3d893d..2989334 100644
--- a/README.md
+++ b/README.md
@@ -94,9 +94,10 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-Add clojure-protobuf to your [Cake](http://github.com/ninjudd/cake) project.clj:
+Add the following to your [Cake](http://github.com/ninjudd/cake) project.clj:
 
     :dependencies [[clojure-protobuf "0.2.4"]]
     :dev-dependencies [[clojure-protobuf "0.2.4"]]
+    :tasks [protobuf.tasks]
 
 This code works with Clojure 1.2. Here's the [1.1 branch](http://github.com/ninjudd/clojure-protobuf/tree/clojure-1.1).
\ No newline at end of file

From f1d86eacd7072ed5dbb02ea5b289795688293340 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 4 Aug 2010 13:12:35 -0700
Subject: [PATCH 072/525] fix classpath call

---
 project.clj                | 2 +-
 src/clj/protobuf/tasks.clj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 46ccd22..cd01ab3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.4"
+(defproject clojure-protobuf "0.2.5"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index a4dfd80..c2a1bb0 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -59,7 +59,7 @@
                (> (modtime "proto") (modtime dest))
                (> (modtime "proto") (modtime "classes")))
        (doseq [proto protos]
-         (log "compiling" proto "to" dest)
+         (log "Compiling" proto "to" dest)
          (extract-dependencies (file "proto" proto))
          (ant Mkdir {:dir dest})
          (ant Mkdir {:dir "build/proto"})
@@ -67,7 +67,7 @@
               (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"])))
        (ant Javac {:srcdir    (path dest)
                    :destdir   (file "classes")
-                   :classpath (classpath project)}))))
+                   :classpath (classpath)}))))
 
 (defn build-protobuf []
   (ant Mkdir {:dir "proto/google/protobuf"})

From c209dcd2b30f7a4e9e444d70c3092bd7f99239be Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 4 Aug 2010 17:34:25 -0700
Subject: [PATCH 073/525] *earmuffs*

---
 project.clj                | 2 +-
 src/clj/protobuf/tasks.clj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index cd01ab3..c1c6b1c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.5"
+(defproject clojure-protobuf "0.2.6"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index c2a1bb0..79207d9 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -55,7 +55,7 @@
 (defn protoc
   ([protos] (protoc protos "build/protosrc"))
   ([protos dest]
-     (when (or (:recompile opts)
+     (when (or (:recompile *opts*)
                (> (modtime "proto") (modtime dest))
                (> (modtime "proto") (modtime "classes")))
        (doseq [proto protos]
@@ -87,7 +87,7 @@
 (deftask compile #{proto})
 (deftask proto #{install-protoc}
   "Compile protocol buffer files located in proto dir."
-  (if (= "clojure-protobuf" (:artifact-id project))
+  (if (= "clojure-protobuf" (:artifact-id *project*))
     (do (run-task 'fetch-protoc)
         (build-protobuf))
-    (protoc (or (:proto opts) (proto-files (file "proto"))))))
+    (protoc (or (:proto *opts*) (proto-files (file "proto"))))))

From a1614c63e44b4ed8404f287e41dd455812f86927 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 17 Aug 2010 19:12:48 -0700
Subject: [PATCH 074/525] update to work with cake 0.4.0

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 79207d9..4d541a0 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,5 +1,5 @@
 (ns protobuf.tasks
-  (:use cake cake.ant
+  (:use cake cake.core cake.ant
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
         [useful.io :only [extract-resource]])

From 4cd8f807366640a89b4cf732a42397996771eadb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 17 Aug 2010 19:13:12 -0700
Subject: [PATCH 075/525] version 0.2.7

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index c1c6b1c..cf708ff 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.6"
+(defproject clojure-protobuf "0.2.7"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
                  [clojure-contrib "1.2.0-SNAPSHOT"]]

From 77dc2892af5c9fac2d347060caeda47fb3651274 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 18 Aug 2010 21:22:49 -0700
Subject: [PATCH 076/525] delete build/protosrc when there is an error in
 protoc

---
 src/clj/protobuf/tasks.clj | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 4d541a0..645fbba 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -3,7 +3,7 @@
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
         [useful.io :only [extract-resource]])
-  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
+  (:import [org.apache.tools.ant.taskdefs Chmod Copy Delete ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
 (def srcdir  (format "build/protobuf-%s" version))
@@ -57,14 +57,17 @@
   ([protos dest]
      (when (or (:recompile *opts*)
                (> (modtime "proto") (modtime dest))
-               (> (modtime "proto") (modtime "classes")))
+               (> (modtime "proto") (modtime "classes")))       
+       (ant Mkdir {:dir dest})
+       (ant Mkdir {:dir "build/proto"})
        (doseq [proto protos]
          (log "Compiling" proto "to" dest)
          (extract-dependencies (file "proto" proto))
-         (ant Mkdir {:dir dest})
-         (ant Mkdir {:dir "build/proto"})
-         (ant ExecTask {:executable "protoc" :dir "proto"}
-              (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"])))
+         (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
+                   (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
+              (catch org.apache.tools.ant.BuildException e
+                (ant Delete {:dir dest})
+                (throw (Exception. (str "error compiling " proto))))))
        (ant Javac {:srcdir    (path dest)
                    :destdir   (file "classes")
                    :classpath (classpath)}))))

From 38214e2199e2868420ce808c85ccba6be84f856e Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 18 Aug 2010 21:23:29 -0700
Subject: [PATCH 077/525] support deletions on append with set extension

---
 proto/clojure/protobuf/extensions.proto       |  8 +--
 proto/clojure/protobuf/test.proto             |  7 ++-
 .../protobuf/PersistentProtocolBufferMap.java | 50 +++++++++++++++++--
 test/protobuf_test.clj                        |  8 +--
 4 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/proto/clojure/protobuf/extensions.proto b/proto/clojure/protobuf/extensions.proto
index 4441d4f..db4908e 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -4,10 +4,10 @@ option java_package = "clojure.protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
-  optional bool   set    = 52001;
+  optional bool   set    = 52001;  
   optional bool   map    = 52002;
   optional string map_by = 52003;
-  //  optional bool   sorted = 52004;
-  //  optional bool   multi  = 52005;
-  optional string meta   = 52006;
+  //  optional bool   sorted = 52005;
+  //  optional bool   multi  = 52006;
+  optional string meta   = 52010;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index edab84c..dd337ef 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -16,7 +16,7 @@ message Foo {
     MAYBE = 1;
   }
 
-  repeated string tag_set   = 10 [(set)    = true];
+  repeated Item   tag_set   = 10 [(set)    = true];
   repeated Pair   attr_map  = 11 [(map)    = true];
   repeated Foo    foo_by_id = 12 [(map_by) = "id"];
   repeated Group  groups    = 13 [(map)    = true];
@@ -31,3 +31,8 @@ message Group {
   required string key = 1;
   repeated Foo    val = 2;
 }
+
+message Item {
+  required string item   = 1;
+  required bool   exists = 2 [default = true];
+}
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 49fa069..85822ba 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -199,8 +199,10 @@ static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
     return keyword == k_null ? null : keyword;
   }
 
-  static Keyword k_key = Keyword.intern(Symbol.intern("key"));
-  static Keyword k_val = Keyword.intern(Symbol.intern("val"));
+  static Keyword k_key    = Keyword.intern(Symbol.intern("key"));
+  static Keyword k_val    = Keyword.intern(Symbol.intern("val"));
+  static Keyword k_item   = Keyword.intern(Symbol.intern("item"));
+  static Keyword k_exists = Keyword.intern(Symbol.intern("exists"));
   static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
     if (value instanceof List) {
       List values = (List) value;
@@ -239,12 +241,34 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           }
         }
         return map.persistent();
+      } else if (options.getExtension(Extensions.set)) {
+        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
+        Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
+
+        ITransientSet set = (ITransientSet) PersistentHashSet.EMPTY.asTransient();
+        while (iterator.hasNext()) {
+          DynamicMessage message = (DynamicMessage) iterator.next();
+          Object  item   = fromProtoValue(item_field, message.getField(item_field));
+          Boolean exists = (Boolean) message.getField(exists_field);
+
+          if (exists) {
+            set.conj(item);
+          } else {
+            try {
+              set.disjoin(item);
+            } catch (Exception e) {
+              e.printStackTrace();
+            }
+          }
+        }
+        return set.persistent();
       } else {
         List<Object> list = new ArrayList<Object>(values.size());
         while (iterator.hasNext()) {
           list.add(fromProtoValue(field, iterator.next()));
         }
-        return options.getExtension(Extensions.set) ? PersistentHashSet.create(list) : PersistentVector.create(list);
+        return PersistentVector.create(list);
       }
     } else {
       switch (field.getJavaType()) {
@@ -302,9 +326,10 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
   protected void addField(DynamicMessage.Builder builder, Object key, Object val) {
     if (key == null) return;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+    boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
-      if (val instanceof Sequential || val instanceof IPersistentSet) {
+      if (val instanceof Sequential && !set) {
         for (ISeq s = RT.seq(val); s != null; s = s.next()) {
           Object value = toProtoValue(field, s.first());
           builder.addRepeatedField(field, value);
@@ -325,6 +350,21 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
             Object value = toProtoValue(field, new PersistentArrayMap(map));
             builder.addRepeatedField(field, value);
           }
+        } else if (set) {
+          if (val instanceof IPersistentMap) {
+            for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+              Map.Entry e = (Map.Entry) s.first();
+              Object[] map = {k_item, e.getKey(), k_exists, e.getValue()};
+              Object value = toProtoValue(field, new PersistentArrayMap(map));
+              builder.addRepeatedField(field, value);
+            }
+          } else {
+            for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+              Object[] map = {k_item, s.first(), k_exists, true};
+              Object value = toProtoValue(field, new PersistentArrayMap(map));
+              builder.addRepeatedField(field, value);
+            }
+          }
         } else {
           Object value = toProtoValue(field, val);
           builder.addRepeatedField(field, value);
@@ -463,7 +503,7 @@ public Obj withMeta(IPersistentMap meta) {
       if(meta != meta()) return new Seq(meta, map, fields, i);
       return this;
     }
-    
+
     public Object first() {
       if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 77d93af..8bf27ea 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -47,8 +47,8 @@
         (is (= ["check" "it" "out"] (p "tags"))))
       ))
   (testing "append"
-    (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"])
-          q (protobuf Foo :id 43 :tags ["savory"])
+    (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
+          q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
           r (protobuf Foo :label "bad")
           s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
           t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
@@ -58,6 +58,8 @@
       (is (= "bad" (t :label)))
       (is (= ["sweet"] (t :tags)))
       (is (= ["sweet" "savory"] (s :tags)))
+      (is (= #{"foo" "bar" "baz"} (p :tag-set)))
+      (is (= #{"bap" "baz"} (s :tag-set)))
     ))
   (testing "protofields"
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil,
@@ -78,7 +80,7 @@
 
 (deftest protobuf-extended
   (testing "create"
-    (let [p (protobuf Foo :id 5 :tag-set ["little" "yellow"] :attr-map {"size" "little", "color" "yellow", "style" "different"})]
+    (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
       (is (= #{"little" "yellow"} (:tag-set p)))
       (is (associative? (:attr-map p)))
       (is (= "different" (get-in p [:attr-map "style"])))

From f85e20e5d2b117ca93e33ddc95c0b3b5644f3925 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 19 Aug 2010 08:42:12 -0700
Subject: [PATCH 078/525] update to clojure 1.2.0

---
 project.clj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index cf708ff..d9d027e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,5 @@
-(defproject clojure-protobuf "0.2.7"
+(defproject clojure-protobuf "0.2.8"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[clojure         "1.2.0-master-SNAPSHOT"]
-                 [clojure-contrib "1.2.0-SNAPSHOT"]]
+  :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
   :jar-files ["proto"])
\ No newline at end of file

From 0a203432f14e7b7e79397272154325d9fec598fb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 19 Aug 2010 14:52:00 -0700
Subject: [PATCH 079/525] apply nested message fixes from Ilya Chernikov.
 thanks!

---
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 85822ba..e852d08 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -324,7 +324,7 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
   }
 
   protected void addField(DynamicMessage.Builder builder, Object key, Object val) {
-    if (key == null) return;
+    if (key == null || val == null) return;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     boolean set = field.getOptions().getExtension(Extensions.set);
 
@@ -373,7 +373,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
     } else {
       Object value = toProtoValue(field, val);
       if (value instanceof DynamicMessage) {
-        value = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) value);
+        value = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) value).build();
       }
       builder.setField(field, value);
     }

From 74e659bc4f78f828c460841fd6081e4edbc12f93 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 19 Aug 2010 22:33:33 -0700
Subject: [PATCH 080/525] cake tasks updates. add deps dependency. download
 google source to lib/ instead of build/

---
 project.clj                |  2 +-
 src/clj/protobuf/tasks.clj | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index d9d027e..928fd07 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.8"
+(defproject clojure-protobuf "0.2.9"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 645fbba..d263b66 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -6,8 +6,8 @@
   (:import [org.apache.tools.ant.taskdefs Chmod Copy Delete ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
-(def srcdir  (format "build/protobuf-%s" version))
-(def tarfile (format "build/protobuf-%s.tar.gz" version))
+(def srcdir  (format "lib/protobuf-%s" version))
+(def tarfile (format "lib/protobuf-%s.tar.gz" version))
 (def url     (java.net.URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
 
 (defn installed? []
@@ -17,7 +17,7 @@
 (deftask fetch-protoc
   (when-not (.exists (file srcdir))
     (ant Get   {:src url :dest tarfile})
-    (ant Untar {:src tarfile :dest "build" :compression "gzip"})))
+    (ant Untar {:src tarfile :dest "lib" :compression "gzip"})))
 
 (deftask install-protoc
   (when-not (installed?)
@@ -55,7 +55,7 @@
 (defn protoc
   ([protos] (protoc protos "build/protosrc"))
   ([protos dest]
-     (when (or (:recompile *opts*)
+     (when (or (:force *opts*)
                (> (modtime "proto") (modtime dest))
                (> (modtime "proto") (modtime "classes")))       
        (ant Mkdir {:dir dest})
@@ -88,7 +88,7 @@
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
 (deftask compile #{proto})
-(deftask proto #{install-protoc}
+(deftask proto #{deps install-protoc}
   "Compile protocol buffer files located in proto dir."
   (if (= "clojure-protobuf" (:artifact-id *project*))
     (do (run-task 'fetch-protoc)

From 84bd59134a56ec89559a700d4a42a5600323c11a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 24 Aug 2010 13:28:24 -0700
Subject: [PATCH 081/525] nested message tests from Ilya Chernikov

---
 proto/clojure/protobuf/test.proto | 10 ++++++++++
 test/protobuf_test.clj            |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index dd337ef..68b3424 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -36,3 +36,13 @@ message Item {
   required string item   = 1;
   required bool   exists = 2 [default = true];
 }
+
+message ErrorMsg {
+  required sint32 code = 1;
+  optional string data = 2;
+}
+
+message Response {
+  required bool ok = 1;
+  optional ErrorMsg error = 2;
+}
\ No newline at end of file
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 8bf27ea..d2baf18 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -3,6 +3,8 @@
   (:use clojure.test))
 
 (defprotobuf Foo clojure.protobuf.Test Foo)
+(defprotobuf Response clojure.protobuf.Test Response)
+(defprotobuf ErrorMsg clojure.protobuf.Test ErrorMsg)
 
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
@@ -102,3 +104,8 @@
         (is (= ["even" "even"]  (get-in p [:foo-by-id 6 :tags]))))
       )))
 
+(deftest protobuf-nested-message
+  (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))
+
+(deftest protobuf-nil-field
+  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]))
\ No newline at end of file

From cc08c7d93b59b1fe061bc090da98e04c4a5fb93c Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 30 Aug 2010 11:31:51 -0700
Subject: [PATCH 082/525] fix install task to work over socket

---
 project.clj                |  2 +-
 src/clj/protobuf/tasks.clj | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 928fd07..f5619df 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.9"
+(defproject clojure-protobuf "0.2.10"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index d263b66..d9603fc 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -20,6 +20,7 @@
     (ant Untar {:src tarfile :dest "lib" :compression "gzip"})))
 
 (deftask install-protoc
+  "Compile and install protoc to /usr/local."
   (when-not (installed?)
     (run-task 'fetch-protoc)
     (when-not (.exists (file srcdir "src" "protoc"))
@@ -27,8 +28,16 @@
       (ant Chmod {:file (file srcdir "install-sh") :perm "+x"})
       (ant ExecTask {:dir srcdir :executable "./configure"})
       (ant ExecTask {:dir srcdir :executable "make"}))
-    (ant ExecTask {:dir srcdir :executable "sudo"}
-         (args ["make" "install"]))))
+    (let [password (prompt-read "Password" :echo false)]
+      (ant ExecTask {:dir srcdir :executable "sudo" :input-string (str password "\n")}
+           (args ["-S" "make" "install"])))))
+
+(deftask uninstall-protoc
+  "Remove protoc if it is installed."
+  (when (installed?)
+    (let [password (prompt-read "Password" :echo false)]
+      (ant ExecTask {:dir srcdir :executable "sudo" :input-string (str password "\n")}
+           (args ["-S" "make" "uninstall"])))))
 
 (defn- proto-dependencies "look for lines starting with import in proto-file"
   [proto-file]

From 0f282345c8da7bd363b992c85df9c26e7801f095 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 20 Sep 2010 14:38:45 -0700
Subject: [PATCH 083/525] fix cake tasks

---
 src/clj/protobuf/tasks.clj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index d9603fc..8fe199b 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,8 +1,9 @@
 (ns protobuf.tasks
   (:use cake cake.core cake.ant
+        [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
-        [useful.io :only [extract-resource]])
+        [cake.utils.io :only [extract-resource]])
   (:import [org.apache.tools.ant.taskdefs Chmod Copy Delete ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
@@ -77,9 +78,7 @@
               (catch org.apache.tools.ant.BuildException e
                 (ant Delete {:dir dest})
                 (throw (Exception. (str "error compiling " proto))))))
-       (ant Javac {:srcdir    (path dest)
-                   :destdir   (file "classes")
-                   :classpath (classpath)}))))
+       (compile-java (file dest)))))
 
 (defn build-protobuf []
   (ant Mkdir {:dir "proto/google/protobuf"})

From 1c6a768a99c46a444e9168575c8fef93ebad1dd6 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 20 Sep 2010 15:22:41 -0700
Subject: [PATCH 084/525] change conj to behave like clojure maps. for
 appending behavior use new append method

---
 src/clj/protobuf.clj                          |  5 +++-
 .../protobuf/PersistentProtocolBufferMap.java | 15 ++++++++---
 test/protobuf_test.clj                        | 25 +++++++++++++++----
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index fbd0f66..8e3676c 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -42,4 +42,7 @@
      (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data length))))
 
 (defn protobuf-dump [#^clojure.protobuf.PersistentProtocolBufferMap p]
-  (.toByteArray p))
\ No newline at end of file
+  (.toByteArray p))
+
+(defn append [#^clojure.protobuf.PersistentProtocolBufferMap p map]
+  (.append p map))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index e852d08..49988a5 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -329,6 +329,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
+      builder.clearField(field);
       if (val instanceof Sequential && !set) {
         for (ISeq s = RT.seq(val); s != null; s = s.next()) {
           Object value = toProtoValue(field, s.first());
@@ -419,10 +420,7 @@ public IPersistentMap assoc(Object key, Object val) {
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
-    if (field == null) return this;
-    if (field.isRepeated()) builder.clearField(field);
     addField(builder, field, val);
-
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
@@ -433,7 +431,6 @@ public IPersistentMap assocEx(Object key, Object val) throws Exception {
 
   public IPersistentCollection cons(Object o) {
     DynamicMessage.Builder builder = builder();
-
     if (o instanceof Map.Entry) {
       Map.Entry e = (Map.Entry) o;
       addField(builder, e.getKey(), e.getValue());
@@ -450,6 +447,16 @@ public IPersistentCollection cons(Object o) {
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
+  public PersistentProtocolBufferMap append(IPersistentMap map) {
+    PersistentProtocolBufferMap proto;
+    if (map instanceof PersistentProtocolBufferMap) {
+      proto = (PersistentProtocolBufferMap) map;
+    } else {
+      proto = construct(def, map);
+    }
+    return new PersistentProtocolBufferMap(meta(), def, builder().mergeFrom(proto.message()));
+  }
+
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return this;
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index d2baf18..ba01280 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -17,13 +17,25 @@
         (is (= "bar" (:label p)))
         (is (= ["little" "yellow"] (:tags p))))
       (let [p (conj p {:tags ["different"]})]
+        (is (= ["different"] (:tags p))))
+      (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
+        (is (= ["little" "yellow" "different"] (:tags p)))
+        (is (= "very" (:label p))))
+      ))
+  (testing "append"
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+      (let [p (append p {:label "bar"})]
+        (is (= 5     (:id p)))
+        (is (= "bar" (:label p)))
+        (is (= ["little" "yellow"] (:tags p))))
+      (let [p (append p {:tags ["different"]})]
         (is (= ["little" "yellow" "different"] (:tags p))))
-      (let [p (conj p {:tags ["different"] :label "very"})]
+      (let [p (append p {:tags ["different"] :label "very"})]
         (is (= ["little" "yellow" "different"] (:tags p)))
         (is (= "very" (:label p))))
       ))
   (testing "assoc"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
       (let [p (assoc p :label "baz" :tags ["nuprin"])]
         (is (= ["nuprin"] (:tags p)))
         (is (= "baz"      (:label p))))
@@ -31,6 +43,8 @@
         (is (= [:yes :no :maybe :no :yes] (:responses p))))
       (let [p (assoc p :tags "aspirin")]
         (is (= ["aspirin"] (:tags p))))
+      (let [p (assoc p :foo-by-id {3 {:label "three"} 2 {:label "two"}})]
+        (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))
       ))
   (testing "dissoc"
     (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"])]
@@ -48,7 +62,7 @@
         (is (= ["check" "it" "out"] (p :tags)))
         (is (= ["check" "it" "out"] (p "tags"))))
       ))
-  (testing "append"
+  (testing "append bytes"
     (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
           q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
           r (protobuf Foo :label "bad")
@@ -99,9 +113,10 @@
       ))
   (testing "conj"
     (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
-      (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["even"]}}})]
+      (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
         (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
-        (is (= ["even" "even"]  (get-in p [:foo-by-id 6 :tags]))))
+        (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
+        (is (= ""               (get-in p [:foo-by-id 6 :label]))))
       )))
 
 (deftest protobuf-nested-message

From 3863bf1c4de627290969cd159db994c81e64f8d3 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 20 Sep 2010 15:23:30 -0700
Subject: [PATCH 085/525] version 0.2.11-SNAPSHOT

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index f5619df..2118252 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.10"
+(defproject clojure-protobuf "0.2.11-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]

From 5c22eed0ee6c2e85985012b625833f8b843f7d0d Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 4 Oct 2010 12:05:00 -0700
Subject: [PATCH 086/525] add explicit dependency on useful

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2118252..344f93e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,5 +1,6 @@
 (defproject clojure-protobuf "0.2.11-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[clojure "1.2.0"]]
+  :dependencies [[clojure "1.2.0"]
+                 [clojure-useful "0.3.0-SNAPSHOT"]]
   :tasks [protobuf.tasks]
   :jar-files ["proto"])
\ No newline at end of file

From a9ee5bcef6792f762687d719f5e1c6fdf02ce4df Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 4 Oct 2010 21:57:58 -0700
Subject: [PATCH 087/525] make addField robust to missing fields

---
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 49988a5..769d190 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -326,6 +326,7 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
   protected void addField(DynamicMessage.Builder builder, Object key, Object val) {
     if (key == null || val == null) return;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+    if (field == null) return;
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {

From 3731eaac219eade772b809cf20a012c6a8424248 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 6 Oct 2010 14:52:30 -0700
Subject: [PATCH 088/525] add test for double and float. fix cake tasks

---
 proto/clojure/protobuf/test.proto                |  3 +++
 src/clj/protobuf/tasks.clj                       |  2 ++
 .../protobuf/PersistentProtocolBufferMap.java    |  3 +++
 test/protobuf_test.clj                           | 16 +++++++++++-----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 68b3424..b57e4e8 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -10,6 +10,9 @@ message Foo {
   optional Foo      parent    = 4;
   repeated Response responses = 5;
 
+  repeated double doubles = 6;
+  repeated float  floats  = 7;
+
   enum Response {
     YES   = 0;
     NO    = 1;
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 8fe199b..21472d1 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,5 +1,7 @@
 (ns protobuf.tasks
   (:use cake cake.core cake.ant
+        [cake.file :only [file]]
+        [cake.project :only [log]]
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 769d190..9847a66 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -299,6 +299,9 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       if (value instanceof Integer) return value;
       Long l = (Long) value;
       return new Integer(l.intValue());
+    case FLOAT:
+      if (value instanceof Float) return value;
+      return new Float((Double)value);
     case ENUM:
       String name = (value instanceof Keyword) ? ((Keyword) value).getName() : (String) value;
       name = name.toUpperCase().replaceAll("-","_");
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index ba01280..7a7ec93 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -11,11 +11,14 @@
 
 (deftest protobuf-simple
   (testing "conj"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
       (let [p (conj p {:label "bar"})]
         (is (= 5     (:id p)))
         (is (= "bar" (:label p)))
-        (is (= ["little" "yellow"] (:tags p))))
+        (is (= ["little" "yellow"] (:tags p)))
+        (is (= [1.2 3.4 5.6] (:doubles p)))
+        (is (= [(float 0.01) (float 0.02) (float 0.03)] (:floats  p)))
+        )
       (let [p (conj p {:tags ["different"]})]
         (is (= ["different"] (:tags p))))
       (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
@@ -23,7 +26,7 @@
         (is (= "very" (:label p))))
       ))
   (testing "append"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"])]
+    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
       (let [p (append p {:label "bar"})]
         (is (= 5     (:id p)))
         (is (= "bar" (:label p)))
@@ -33,6 +36,9 @@
       (let [p (append p {:tags ["different"] :label "very"})]
         (is (= ["little" "yellow" "different"] (:tags p)))
         (is (= "very" (:label p))))
+      (let [p (append p {:doubles [3.4] :floats [0.02]})]
+        (is (= [1.2 3.4] (:doubles p)))
+        (is (= [(float 0.01) (float 0.02)] (:floats  p))))
       ))
   (testing "assoc"
     (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
@@ -79,7 +85,7 @@
     ))
   (testing "protofields"
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil,
-                  :tag_set nil, :attr_map nil, :foo_by_id nil, :groups nil}]
+                  :tag_set nil, :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil}]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields clojure.protobuf.Test$Foo)))))
   (testing "protodefault"
@@ -123,4 +129,4 @@
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))
 
 (deftest protobuf-nil-field
-  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]))
\ No newline at end of file
+  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]))

From 9f657176f67526614f14b3edd105758e862a7601 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 13 Oct 2010 20:12:06 -0700
Subject: [PATCH 089/525] support installing protoc from cake on linux when tty
 required for sudo

---
 src/clj/protobuf/tasks.clj | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 21472d1..4cbd956 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -2,11 +2,12 @@
   (:use cake cake.core cake.ant
         [cake.file :only [file]]
         [cake.project :only [log]]
+        [cake.tasks.deps :only [os-name]]
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
         [cake.utils.io :only [extract-resource]])
-  (:import [org.apache.tools.ant.taskdefs Chmod Copy Delete ExecTask Get Javac Mkdir Untar]))
+  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
 (def srcdir  (format "lib/protobuf-%s" version))
@@ -31,9 +32,13 @@
       (ant Chmod {:file (file srcdir "install-sh") :perm "+x"})
       (ant ExecTask {:dir srcdir :executable "./configure"})
       (ant ExecTask {:dir srcdir :executable "make"}))
-    (let [password (prompt-read "Password" :echo false)]
-      (ant ExecTask {:dir srcdir :executable "sudo" :input-string (str password "\n")}
-           (args ["-S" "make" "install"])))))
+    (let [password (prompt-read "Password" :echo false)
+          opts     {:dir srcdir :input-string (str password "\n")}]
+      (if (= "linux "(os-name))
+        (ant ExecTask (assoc opts :executable "script")
+             (argline "-q -c 'sudo -S make install' /dev/null"))
+        (ant ExecTask (assoc opts :executable "sudo")
+             (args ["-S" "make" "install"]))))))
 
 (deftask uninstall-protoc
   "Remove protoc if it is installed."
@@ -78,7 +83,6 @@
          (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
                    (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
               (catch org.apache.tools.ant.BuildException e
-                (ant Delete {:dir dest})
                 (throw (Exception. (str "error compiling " proto))))))
        (compile-java (file dest)))))
 

From a2dbe1e775447f4aae4bf3d63603dc49fffd4f92 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 13 Oct 2010 20:14:01 -0700
Subject: [PATCH 090/525] version 0.2.11

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 344f93e..f763970 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.11-SNAPSHOT"
+(defproject clojure-protobuf "0.2.11"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [clojure-useful "0.3.0-SNAPSHOT"]]

From d5e149a1357444043a66b69d7b41b046b605ba6a Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Sun, 17 Oct 2010 22:47:47 -0700
Subject: [PATCH 091/525] add test for map-by with required field

---
 proto/clojure/protobuf/test.proto |  9 +++---
 test/protobuf_test.clj            | 46 ++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index b57e4e8..9768209 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -19,10 +19,11 @@ message Foo {
     MAYBE = 1;
   }
 
-  repeated Item   tag_set   = 10 [(set)    = true];
-  repeated Pair   attr_map  = 11 [(map)    = true];
-  repeated Foo    foo_by_id = 12 [(map_by) = "id"];
-  repeated Group  groups    = 13 [(map)    = true];
+  repeated Item  tag_set   = 10 [(set)    = true];
+  repeated Pair  attr_map  = 11 [(map)    = true];
+  repeated Foo   foo_by_id = 12 [(map_by) = "id"];
+  repeated Group groups    = 13 [(map)    = true];
+  repeated Item  item_map  = 14 [(map_by) = "item"];
 }
 
 message Pair {
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 7a7ec93..d53ac97 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -82,26 +82,10 @@
       (is (= ["sweet" "savory"] (s :tags)))
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
       (is (= #{"bap" "baz"} (s :tag-set)))
-    ))
-  (testing "protofields"
-    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil,
-                  :tag_set nil, :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil}]
-      (is (= fields (protofields Foo)))
-      (is (= fields (protofields clojure.protobuf.Test$Foo)))))
-  (testing "protodefault"
-    (is (= 43  (protodefault Foo :id)))
-    (is (= ""  (protodefault Foo :label)))
-    (is (= []  (protodefault Foo :tags)))
-    (is (= nil (protodefault Foo :parent)))
-    (is (= []  (protodefault Foo :responses)))
-    (is (= #{} (protodefault Foo :tag_set)))
-    (is (= {}  (protodefault Foo :foo_by_id)))
-    (is (= {}  (protodefault Foo :groups)))
-    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))
-  ))
+    )))
 
 (deftest protobuf-extended
-  (testing "create"
+  (comment testing "create"
     (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
       (is (= #{"little" "yellow"} (:tag-set p)))
       (is (associative? (:attr-map p)))
@@ -117,7 +101,12 @@
         (is (= 6      (six  :id)))
         (is (= "six"  (six  :label))))
       ))
-  (testing "conj"
+  (testing "map-by with required field"
+    (let [p (protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
+      (is (= "foo" (get-in p [:item-map "foo" :item])))
+      (is (= "bar" (get-in p [:item-map "bar" :item])))
+      ))
+  (comment testing "conj"
     (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
       (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
         (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
@@ -125,6 +114,25 @@
         (is (= ""               (get-in p [:foo-by-id 6 :label]))))
       )))
 
+(deftest protofields-and-defaults
+  (testing "protofields"
+    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil,
+                  :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil, :item_map nil}]
+      (is (= fields (protofields Foo)))
+      (is (= fields (protofields clojure.protobuf.Test$Foo)))))
+  (testing "protodefault"
+    (is (= 43  (protodefault Foo :id)))
+    (is (= ""  (protodefault Foo :label)))
+    (is (= []  (protodefault Foo :tags)))
+    (is (= nil (protodefault Foo :parent)))
+    (is (= []  (protodefault Foo :responses)))
+    (is (= #{} (protodefault Foo :tag-set)))
+    (is (= {}  (protodefault Foo :foo-by-id)))
+    (is (= {}  (protodefault Foo :groups)))
+    (is (= {}  (protodefault Foo :item-map)))
+    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))
+  ))
+
 (deftest protobuf-nested-message
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))
 

From b07eb5afe2a0cc5a6dd0f139708a67562328a8d8 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 19 Oct 2010 20:09:43 -0700
Subject: [PATCH 092/525] add offset to protobuf-load function

---
 project.clj                                               | 2 +-
 src/clj/protobuf.clj                                      | 4 ++--
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index f763970..727a664 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.2.11"
+(defproject clojure-protobuf "0.3.0-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [clojure-useful "0.3.0-SNAPSHOT"]]
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 8e3676c..acc0a87 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -38,8 +38,8 @@
 (defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
      (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data)))
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data #^Integer length]
-     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data length))))
+  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data #^Integer offset #^Integer length]
+     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data offset length))))
 
 (defn protobuf-dump [#^clojure.protobuf.PersistentProtocolBufferMap p]
   (.toByteArray p))
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 9847a66..0f9c46e 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -118,8 +118,8 @@ static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws I
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
-  static public PersistentProtocolBufferMap create(Def def, byte[] bytes, Integer length) throws IOException {
-    CodedInputStream input = CodedInputStream.newInstance(bytes, 0, length.intValue());
+  static public PersistentProtocolBufferMap create(Def def, byte[] bytes, Integer offset, Integer length) throws IOException {
+    CodedInputStream input = CodedInputStream.newInstance(bytes, offset.intValue(), length.intValue());
     DynamicMessage message = def.parseFrom(input);
     return new PersistentProtocolBufferMap(null, def, message);
   }

From 13a75beb0068fc71cb4489d32ce504dd60bddb01 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 20 Oct 2010 11:49:25 -0700
Subject: [PATCH 093/525] replace _ with - in protofields

---
 src/clj/protobuf.clj   | 5 +++--
 test/protobuf_test.clj | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index acc0a87..3997852 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -32,8 +32,9 @@
         type #^com.google.protobuf.Descriptors$Descriptor (.getMessageType type)]
     (into {}
       (for [#^com.google.protobuf.Descriptors$FieldDescriptor field (.getFields type)]
-        (let [meta-string (.. field getOptions (getExtension (clojure.protobuf.Extensions/meta)))]
-          [(keyword (.getName field)) (when-not (empty? meta-string) (read-string meta-string))])))))
+        (let [meta-string (.. field getOptions (getExtension (clojure.protobuf.Extensions/meta)))
+              field-name  (keyword (.replaceAll (.getName field) "_" "-"))]
+          [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
   ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index d53ac97..96a655a 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -116,8 +116,8 @@
 
 (deftest protofields-and-defaults
   (testing "protofields"
-    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil,
-                  :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil, :item_map nil}]
+    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil,
+                  :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil}]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields clojure.protobuf.Test$Foo)))))
   (testing "protodefault"

From d9505d09f1af3b03509fcd3e675a01fa49b294aa Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Thu, 4 Nov 2010 17:09:54 -0700
Subject: [PATCH 094/525] fix typo

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 4cbd956..3ba5c06 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -34,7 +34,7 @@
       (ant ExecTask {:dir srcdir :executable "make"}))
     (let [password (prompt-read "Password" :echo false)
           opts     {:dir srcdir :input-string (str password "\n")}]
-      (if (= "linux "(os-name))
+      (if (= "linux" (os-name))
         (ant ExecTask (assoc opts :executable "script")
              (argline "-q -c 'sudo -S make install' /dev/null"))
         (ant ExecTask (assoc opts :executable "sudo")

From c15e26c7b15be4d8f989616ec093b741c3c60a6d Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Thu, 18 Nov 2010 17:47:13 -0800
Subject: [PATCH 095/525] return nil when non-repeated field is missing. clean
 up tests

---
 .../protobuf/PersistentProtocolBufferMap.java |  1 +
 test/protobuf_test.clj                        | 52 +++++++++----------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 0f9c46e..e70cf56 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -412,6 +412,7 @@ public IMapEntry entryAt(Object key) {
   public Object valAt(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return null;
+    if (!field.isRepeated() && !message().hasField(field)) return null;
     return fromProtoValue(field, message().getField(field));
   }
 
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 96a655a..bc5fc75 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -10,6 +10,7 @@
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
 
 (deftest protobuf-simple
+
   (testing "conj"
     (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
       (let [p (conj p {:label "bar"})]
@@ -23,8 +24,8 @@
         (is (= ["different"] (:tags p))))
       (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
         (is (= ["little" "yellow" "different"] (:tags p)))
-        (is (= "very" (:label p))))
-      ))
+        (is (= "very" (:label p))))))
+
   (testing "append"
     (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
       (let [p (append p {:label "bar"})]
@@ -38,8 +39,8 @@
         (is (= "very" (:label p))))
       (let [p (append p {:doubles [3.4] :floats [0.02]})]
         (is (= [1.2 3.4] (:doubles p)))
-        (is (= [(float 0.01) (float 0.02)] (:floats  p))))
-      ))
+        (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
+
   (testing "assoc"
     (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
       (let [p (assoc p :label "baz" :tags ["nuprin"])]
@@ -50,14 +51,14 @@
       (let [p (assoc p :tags "aspirin")]
         (is (= ["aspirin"] (:tags p))))
       (let [p (assoc p :foo-by-id {3 {:label "three"} 2 {:label "two"}})]
-        (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))
-      ))
+        (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))))
+
   (testing "dissoc"
-    (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"])]
+    (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
       (let [p (dissoc p :label :tags)]
-        (is (= [] (:tags p)))
-        (is (= "" (:label p))))
-      ))
+        (is (= []  (:tags p)))
+        (is (= nil (:label p))))))
+
   (testing "string keys"
     (let [p (protobuf Foo "id" 5 "label" "rad")]
       (is (= 5 (p :id)))
@@ -66,8 +67,8 @@
       (is (= "rad" (p "label")))
       (let [p (conj p {"tags" ["check" "it" "out"]})]
         (is (= ["check" "it" "out"] (p :tags)))
-        (is (= ["check" "it" "out"] (p "tags"))))
-      ))
+        (is (= ["check" "it" "out"] (p "tags"))))))
+
   (testing "append bytes"
     (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
           q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
@@ -81,45 +82,45 @@
       (is (= ["sweet"] (t :tags)))
       (is (= ["sweet" "savory"] (s :tags)))
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
-      (is (= #{"bap" "baz"} (s :tag-set)))
-    )))
+      (is (= #{"bap" "baz"} (s :tag-set))))))
 
 (deftest protobuf-extended
-  (comment testing "create"
+
+  (testing "create"
     (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
       (is (= #{"little" "yellow"} (:tag-set p)))
       (is (associative? (:attr-map p)))
       (is (= "different" (get-in p [:attr-map "style"])))
       (is (= "little"    (get-in p [:attr-map "size" ])))
-      (is (= "yellow"    (get-in p [:attr-map "color"])))
-      )
+      (is (= "yellow"    (get-in p [:attr-map "color"]))))
     (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
       (let [five ((p :foo-by-id) 5)
             six  ((p :foo-by-id) 6)]
         (is (= 5      (five :id)))
         (is (= "five" (five :label)))
         (is (= 6      (six  :id)))
-        (is (= "six"  (six  :label))))
-      ))
+        (is (= "six"  (six  :label))))))
+
   (testing "map-by with required field"
     (let [p (protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
       (is (= "foo" (get-in p [:item-map "foo" :item])))
-      (is (= "bar" (get-in p [:item-map "bar" :item])))
-      ))
-  (comment testing "conj"
+      (is (= "bar" (get-in p [:item-map "bar" :item])))))
+
+  (testing "conj"
     (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
       (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
         (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
         (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
-        (is (= ""               (get-in p [:foo-by-id 6 :label]))))
-      )))
+        (is (= nil              (get-in p [:foo-by-id 6 :label])))))))
 
 (deftest protofields-and-defaults
+
   (testing "protofields"
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil,
                   :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil}]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields clojure.protobuf.Test$Foo)))))
+
   (testing "protodefault"
     (is (= 43  (protodefault Foo :id)))
     (is (= ""  (protodefault Foo :label)))
@@ -130,8 +131,7 @@
     (is (= {}  (protodefault Foo :foo-by-id)))
     (is (= {}  (protodefault Foo :groups)))
     (is (= {}  (protodefault Foo :item-map)))
-    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))
-  ))
+    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))))
 
 (deftest protobuf-nested-message
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))

From ac58b619166a5a160eb801940caaa7961883d571 Mon Sep 17 00:00:00 2001
From: lance bradley <l@ncebradley.org>
Date: Wed, 17 Nov 2010 15:34:55 -0800
Subject: [PATCH 096/525] cake face compatible branch

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 3ba5c06..ce6b8de 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -2,7 +2,7 @@
   (:use cake cake.core cake.ant
         [cake.file :only [file]]
         [cake.project :only [log]]
-        [cake.tasks.deps :only [os-name]]
+        [cake.utils :only [os-name prompt-read]]
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]

From 2b222bd5597819726a10a3a9773eb396e1cdda24 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 22 Nov 2010 17:04:31 -0800
Subject: [PATCH 097/525] version 0.3.1-SNAPSHOT

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 727a664..b74b63e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.0-SNAPSHOT"
+(defproject clojure-protobuf "0.3.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [clojure-useful "0.3.0-SNAPSHOT"]]

From 4ae56cd3868c65420f97bdd7fce9350ede653712 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 22 Nov 2010 17:18:07 -0800
Subject: [PATCH 098/525] update for cake face branch

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index ce6b8de..418ba09 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,7 +1,7 @@
 (ns protobuf.tasks
   (:use cake cake.core cake.ant
         [cake.file :only [file]]
-        [cake.project :only [log]]
+        [bake.core :only [log]]
         [cake.utils :only [os-name prompt-read]]
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]

From c591ee0b4b9dcef17e9414ed957b41186cd46093 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 30 Nov 2010 17:13:46 -0800
Subject: [PATCH 099/525] cake 0.6.0 fixes

---
 src/clj/protobuf/tasks.clj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 418ba09..052f257 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -6,7 +6,7 @@
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
-        [cake.utils.io :only [extract-resource]])
+        [cake.utils :only [extract-resource]])
   (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")
@@ -26,7 +26,7 @@
 (deftask install-protoc
   "Compile and install protoc to /usr/local."
   (when-not (installed?)
-    (run-task 'fetch-protoc)
+    (invoke fetch-protoc)
     (when-not (.exists (file srcdir "src" "protoc"))
       (ant Chmod {:file (file srcdir "configure")  :perm "+x"})
       (ant Chmod {:file (file srcdir "install-sh") :perm "+x"})
@@ -105,6 +105,6 @@
 (deftask proto #{deps install-protoc}
   "Compile protocol buffer files located in proto dir."
   (if (= "clojure-protobuf" (:artifact-id *project*))
-    (do (run-task 'fetch-protoc)
+    (do (invoke fetch-protoc)
         (build-protobuf))
     (protoc (or (:proto *opts*) (proto-files (file "proto"))))))

From 731e2df99072f0c8ba1dddc13e29e0cae11a4ee2 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Thu, 9 Dec 2010 12:34:36 -0800
Subject: [PATCH 100/525] move extract-resource to bake.io

---
 project.clj                | 3 +--
 src/clj/protobuf/tasks.clj | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index b74b63e..7bc938c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,5 @@
 (defproject clojure-protobuf "0.3.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[clojure "1.2.0"]
-                 [clojure-useful "0.3.0-SNAPSHOT"]]
+  :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
   :jar-files ["proto"])
\ No newline at end of file
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 052f257..11f07bc 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -6,7 +6,7 @@
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
-        [cake.utils :only [extract-resource]])
+        [bake.io :only [extract-resource]])
   (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
 
 (def version "2.3.0")

From 4da20d6ccf9817f297dd7d0f3f5d8c58a81440ac Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Sun, 12 Dec 2010 13:52:09 -0800
Subject: [PATCH 101/525] switch to use uncle

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 11f07bc..94e1fbf 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,5 +1,5 @@
 (ns protobuf.tasks
-  (:use cake cake.core cake.ant
+  (:use cake cake.core uncle.core
         [cake.file :only [file]]
         [bake.core :only [log]]
         [cake.utils :only [os-name prompt-read]]

From 0afddcd76a5a56c92cb5762a4f79b554991b3f97 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 29 Dec 2010 13:11:21 -0800
Subject: [PATCH 102/525] remove version number from README

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2989334..8e262ca 100644
--- a/README.md
+++ b/README.md
@@ -94,10 +94,11 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-Add the following to your [Cake](http://github.com/ninjudd/cake) project.clj:
+Add the `clojure-protobuf` to your [Cake](http://github.com/ninjudd/cake) project.clj:
 
-    :dependencies [[clojure-protobuf "0.2.4"]]
-    :dev-dependencies [[clojure-protobuf "0.2.4"]]
+    :dependencies [[clojure-protobuf "LATEST"]]
+    :dev-dependencies [[clojure-protobuf "LATEST"]]
     :tasks [protobuf.tasks]
 
-This code works with Clojure 1.2. Here's the [1.1 branch](http://github.com/ninjudd/clojure-protobuf/tree/clojure-1.1).
\ No newline at end of file
+You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
+to update this every time I bump the version, so I'm not going to put an actual number here.
\ No newline at end of file

From afcc6629027eb57926f797784d6f3d1aa60f1d6a Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 3 Jan 2011 17:56:23 -0800
Subject: [PATCH 103/525] coerce integers to floats or doubles

---
 proto/clojure/protobuf/test.proto                 |  3 +++
 .../protobuf/PersistentProtocolBufferMap.java     |  9 +++++++--
 test/protobuf_test.clj                            | 15 +++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 9768209..3b89fb1 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -13,6 +13,9 @@ message Foo {
   repeated double doubles = 6;
   repeated float  floats  = 7;
 
+  optional double lat  = 8;
+  optional float  long = 9;
+
   enum Response {
     YES   = 0;
     NO    = 1;
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index e70cf56..8753145 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -300,8 +300,13 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       Long l = (Long) value;
       return new Integer(l.intValue());
     case FLOAT:
-      if (value instanceof Float) return value;
-      return new Float((Double)value);
+      if (value instanceof Integer) return new Float((Integer) value * 1.0);
+      if (value instanceof Double)  return new Float((Double) value);
+      return value;
+    case DOUBLE:
+      if (value instanceof Integer) return new Double((Integer) value * 1.0);
+      if (value instanceof Float)   return new Double((Float) value);
+      return value;
     case ENUM:
       String name = (value instanceof Keyword) ? ((Keyword) value).getName() : (String) value;
       name = name.toUpperCase().replaceAll("-","_");
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index bc5fc75..07509df 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -82,7 +82,16 @@
       (is (= ["sweet"] (t :tags)))
       (is (= ["sweet" "savory"] (s :tags)))
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
-      (is (= #{"bap" "baz"} (s :tag-set))))))
+      (is (= #{"bap" "baz"} (s :tag-set)))))
+
+  (testing "coercing doubles and floats"
+    (let [p (protobuf Foo :lat 5 :long 6)]
+      (is (= 5.0 (p :lat)))
+      (is (= 6.0 (p :long))))
+    (let [p (protobuf Foo :lat (float 5.0) :long (double 6.0))]
+      (is (= 5.0 (p :lat)))
+      (is (= 6.0 (p :long))))
+    ))
 
 (deftest protobuf-extended
 
@@ -117,12 +126,14 @@
 
   (testing "protofields"
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil,
-                  :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil}]
+                  :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil, :lat nil, :long nil}]
       (is (= fields (protofields Foo)))
       (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
   (testing "protodefault"
     (is (= 43  (protodefault Foo :id)))
+    (is (= 0.0 (protodefault Foo :lat)))
+    (is (= 0.0 (protodefault Foo :long)))
     (is (= ""  (protodefault Foo :label)))
     (is (= []  (protodefault Foo :tags)))
     (is (= nil (protodefault Foo :parent)))

From abbdb952f0787267f1b6cb2e420955aabd7b0150 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 3 Jan 2011 17:56:50 -0800
Subject: [PATCH 104/525] version 0.3.1

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 7bc938c..d9aa063 100644
--- a/project.clj
+++ b/project.clj
@@ -1,5 +1,5 @@
-(defproject clojure-protobuf "0.3.1-SNAPSHOT"
+(defproject clojure-protobuf "0.3.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
-  :jar-files ["proto"])
\ No newline at end of file
+  :jar-files ["proto"])

From a3a639b2f089ab4d40e7d869b71153282388a1dd Mon Sep 17 00:00:00 2001
From: David Santiago <david.santiago@gmail.com>
Date: Thu, 10 Feb 2011 17:07:30 -0600
Subject: [PATCH 105/525] Changed compile-native to work with changes to cake's
 compile task. Bumped version to 0.3.2

---
 project.clj                | 2 +-
 src/clj/protobuf/tasks.clj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index d9aa063..e8deeba 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.1"
+(defproject clojure-protobuf "0.3.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 94e1fbf..79d6739 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -101,7 +101,7 @@
   (for [file (rest (file-seq dir)) :when (proto-file? file)]
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
-(deftask compile #{proto})
+(deftask compile-native #{proto})
 (deftask proto #{deps install-protoc}
   "Compile protocol buffer files located in proto dir."
   (if (= "clojure-protobuf" (:artifact-id *project*))

From a12631c2cca14c4f9c9ec88c6959ae867500650e Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 15 Feb 2011 12:56:58 -0800
Subject: [PATCH 106/525] add global option to use underscores (since we must
 clear all keyword caches when it is changed)...
 clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores

---
 project.clj                                   |  2 +-
 proto/clojure/protobuf/test.proto             |  7 +--
 src/clj/protobuf.clj                          | 44 ++++++++++---------
 .../protobuf/PersistentProtocolBufferMap.java | 22 ++++++++--
 test/protobuf_test.clj                        | 11 +++++
 5 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/project.clj b/project.clj
index e8deeba..6f92ba3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.2"
+(defproject clojure-protobuf "0.3.3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 3b89fb1..6781bd9 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -17,9 +17,10 @@ message Foo {
   optional float  long = 9;
 
   enum Response {
-    YES   = 0;
-    NO    = 1;
-    MAYBE = 1;
+    YES      = 0;
+    NO       = 1;
+    MAYBE    = 2;
+    NOT_SURE = 3;
   }
 
   repeated Item  tag_set   = 10 [(set)    = true];
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 3997852..d8140bd 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,49 +1,51 @@
-(ns protobuf)
+(ns protobuf
+  (:import (clojure.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
+           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor)))
 
 (defn protobuf? [obj]
-  (instance? clojure.protobuf.PersistentProtocolBufferMap obj))
+  (instance? PersistentProtocolBufferMap obj))
 
 (defn protodef? [obj]
-  (instance? clojure.protobuf.PersistentProtocolBufferMap$Def obj))
+  (instance? PersistentProtocolBufferMap$Def obj))
 
 (defn protodef [class]
   (if (or (protodef? class) (nil? class))
     class
-    (clojure.protobuf.PersistentProtocolBufferMap$Def/create class)))
+    (PersistentProtocolBufferMap$Def/create class)))
 
 (defmacro defprotobuf [sym & args]
   (let [class (apply str (interpose "$" (map name args)))]
     `(def ~sym (protodef ~class))))
 
 (defn protobuf
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type]
-     (clojure.protobuf.PersistentProtocolBufferMap/construct type {}))
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type m]
-     (clojure.protobuf.PersistentProtocolBufferMap/construct type m))
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type k v & kvs]
-     (clojure.protobuf.PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
+  ([#^PersistentProtocolBufferMap$Def type]
+     (PersistentProtocolBufferMap/construct type {}))
+  ([#^PersistentProtocolBufferMap$Def type m]
+     (PersistentProtocolBufferMap/construct type m))
+  ([#^PersistentProtocolBufferMap$Def type k v & kvs]
+     (PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
 
 (defn protodefault [type key]
-  (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)]
+  (let [type #^PersistentProtocolBufferMap$Def (protodef type)]
     (.defaultValue type key)))
 
 (defn protofields [type]
-  (let [type #^clojure.protobuf.PersistentProtocolBufferMap$Def (protodef type)
-        type #^com.google.protobuf.Descriptors$Descriptor (.getMessageType type)]
+  (let [type #^PersistentProtocolBufferMap$Def (protodef type)
+        type #^Descriptors$Descriptor (.getMessageType type)]
     (into {}
-      (for [#^com.google.protobuf.Descriptors$FieldDescriptor field (.getFields type)]
-        (let [meta-string (.. field getOptions (getExtension (clojure.protobuf.Extensions/meta)))
+      (for [#^Descriptors$FieldDescriptor field (.getFields type)]
+        (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
               field-name  (keyword (.replaceAll (.getName field) "_" "-"))]
           [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data]
-     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data)))
-  ([#^clojure.protobuf.PersistentProtocolBufferMap$Def type #^bytes data #^Integer offset #^Integer length]
-     (if data (clojure.protobuf.PersistentProtocolBufferMap/create type data offset length))))
+  ([#^PersistentProtocolBufferMap$Def type #^bytes data]
+     (if data (PersistentProtocolBufferMap/create type data)))
+  ([#^PersistentProtocolBufferMap$Def type #^bytes data #^Integer offset #^Integer length]
+     (if data (PersistentProtocolBufferMap/create type data offset length))))
 
-(defn protobuf-dump [#^clojure.protobuf.PersistentProtocolBufferMap p]
+(defn protobuf-dump [#^PersistentProtocolBufferMap p]
   (.toByteArray p))
 
-(defn append [#^clojure.protobuf.PersistentProtocolBufferMap p map]
+(defn append [#^PersistentProtocolBufferMap p map]
   (.append p map))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 8753145..8e0fe45 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -171,12 +171,28 @@ protected DynamicMessage.Builder builder() {
     }
   }
 
+
+  static boolean use_underscores = false;
+  static public void setUseUnderscores(boolean val) {
+    use_underscores = val;
+    enum_to_keyword.clear();
+    map_field_by.clear();
+  }
+
+  static protected String normalize(String s) {
+    s = s.toLowerCase();
+    if (!use_underscores) {
+      s = s.replaceAll("_","-");
+    }
+    return s;
+  }
+
   static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword =
      new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
   static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
     Keyword keyword = enum_to_keyword.get(enum_value);
     if (keyword == null) {
-      String name = enum_value.getName().toLowerCase().replaceAll("_","-");
+      String name = normalize(enum_value.getName());
       keyword = Keyword.intern(Symbol.intern(name));
       enum_to_keyword.putIfAbsent(enum_value, keyword);
     }
@@ -192,7 +208,7 @@ static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
     if (keyword == null) {
       String name = field.getOptions().getExtension(Extensions.mapBy);
 
-      name = name.toLowerCase().replaceAll("_","-");
+      name = normalize(name);
       keyword = Keyword.intern(Symbol.intern(name));
       map_field_by.putIfAbsent(field, keyword);
     }
@@ -524,7 +540,7 @@ public Obj withMeta(IPersistentMap meta) {
     public Object first() {
       if (i == fields.length) return null;
       Descriptors.FieldDescriptor field = fields[i];
-      String name = field.getName().replaceAll("_","-");
+      String name = normalize(field.getName());
       Keyword key = Keyword.intern(Symbol.intern(name));
       Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));
       return new MapEntry(key, val);
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 07509df..7cea7b0 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -144,6 +144,17 @@
     (is (= {}  (protodefault Foo :item-map)))
     (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))))
 
+(deftest use-underscores
+  (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
+    (is (= '(:responses :tag-set)                (keys p)))
+    (is (= [:yes :not-sure :maybe :not-sure :no] (:responses p)))
+
+    (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores true)
+    (is (= '(:responses :tag_set)                (keys p)))
+    (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
+
+    (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))
+
 (deftest protobuf-nested-message
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))
 

From 39c34b179a1caefcc7d5a4e0c2864c1820ba01ee Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 15 Feb 2011 13:39:17 -0800
Subject: [PATCH 107/525] normalize protofields

---
 src/clj/protobuf.clj                                      | 2 +-
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 3 +--
 test/protobuf_test.clj                                    | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index d8140bd..00c9572 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -35,7 +35,7 @@
     (into {}
       (for [#^Descriptors$FieldDescriptor field (.getFields type)]
         (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-              field-name  (keyword (.replaceAll (.getName field) "_" "-"))]
+              field-name  (keyword (PersistentProtocolBufferMap/normalize (.getName field)))]
           [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 8e0fe45..68e3dac 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -171,7 +171,6 @@ protected DynamicMessage.Builder builder() {
     }
   }
 
-
   static boolean use_underscores = false;
   static public void setUseUnderscores(boolean val) {
     use_underscores = val;
@@ -179,7 +178,7 @@ static public void setUseUnderscores(boolean val) {
     map_field_by.clear();
   }
 
-  static protected String normalize(String s) {
+  static public String normalize(String s) {
     s = s.toLowerCase();
     if (!use_underscores) {
       s = s.replaceAll("_","-");
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 7cea7b0..fbb899c 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -153,6 +153,10 @@
     (is (= '(:responses :tag_set)                (keys p)))
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
+    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil,
+                  :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil, :item_map nil, :lat nil, :long nil}]
+      (is (= fields (protofields Foo))))
+
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))
 
 (deftest protobuf-nested-message

From 14bd6d348cea34cf012fcc21ec4b1d8436f11e72 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 18 Feb 2011 13:59:58 -0800
Subject: [PATCH 108/525] move os-name to bake.core

---
 project.clj                | 2 +-
 src/clj/protobuf/tasks.clj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index 6f92ba3..5280b3b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.3"
+(defproject clojure-protobuf "0.3.4-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 79d6739..08527f7 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -1,8 +1,8 @@
 (ns protobuf.tasks
   (:use cake cake.core uncle.core
         [cake.file :only [file]]
-        [bake.core :only [log]]
-        [cake.utils :only [os-name prompt-read]]
+        [bake.core :only [log os-name]]
+        [cake.utils :only [prompt-read]]
         [cake.tasks.compile :only [compile-java]]
         [clojure.java.shell :only [sh]]
         [clojure.java.io :only [reader]]
@@ -74,7 +74,7 @@
   ([protos dest]
      (when (or (:force *opts*)
                (> (modtime "proto") (modtime dest))
-               (> (modtime "proto") (modtime "classes")))       
+               (> (modtime "proto") (modtime "classes")))
        (ant Mkdir {:dir dest})
        (ant Mkdir {:dir "build/proto"})
        (doseq [proto protos]

From 4d94e093e742db9e867e9b514ce72a35eb4f36e6 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 21 Feb 2011 09:14:50 -0800
Subject: [PATCH 109/525] fix type hints. add read method that takes a
 CodedInputStream

---
 src/clj/protobuf.clj                          | 33 ++++++++++---------
 .../protobuf/PersistentProtocolBufferMap.java |  5 ++-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 00c9572..d75b7c5 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,6 +1,6 @@
 (ns protobuf
   (:import (clojure.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
-           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor)))
+           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)))
 
 (defn protobuf? [obj]
   (instance? PersistentProtocolBufferMap obj))
@@ -18,34 +18,37 @@
     `(def ~sym (protodef ~class))))
 
 (defn protobuf
-  ([#^PersistentProtocolBufferMap$Def type]
+  ([^PersistentProtocolBufferMap$Def type]
      (PersistentProtocolBufferMap/construct type {}))
-  ([#^PersistentProtocolBufferMap$Def type m]
+  ([^PersistentProtocolBufferMap$Def type m]
      (PersistentProtocolBufferMap/construct type m))
-  ([#^PersistentProtocolBufferMap$Def type k v & kvs]
+  ([^PersistentProtocolBufferMap$Def type k v & kvs]
      (PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
 
 (defn protodefault [type key]
-  (let [type #^PersistentProtocolBufferMap$Def (protodef type)]
+  (let [type ^PersistentProtocolBufferMap$Def (protodef type)]
     (.defaultValue type key)))
 
 (defn protofields [type]
-  (let [type #^PersistentProtocolBufferMap$Def (protodef type)
-        type #^Descriptors$Descriptor (.getMessageType type)]
+  (let [type ^PersistentProtocolBufferMap$Def (protodef type)
+        type ^Descriptors$Descriptor (.getMessageType type)]
     (into {}
-      (for [#^Descriptors$FieldDescriptor field (.getFields type)]
+      (for [^Descriptors$FieldDescriptor field (.getFields type)]
         (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
               field-name  (keyword (PersistentProtocolBufferMap/normalize (.getName field)))]
           [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
-  ([#^PersistentProtocolBufferMap$Def type #^bytes data]
-     (if data (PersistentProtocolBufferMap/create type data)))
-  ([#^PersistentProtocolBufferMap$Def type #^bytes data #^Integer offset #^Integer length]
-     (if data (PersistentProtocolBufferMap/create type data offset length))))
-
-(defn protobuf-dump [#^PersistentProtocolBufferMap p]
+  ([^PersistentProtocolBufferMap$Def type ^bytes data]
+     (when data
+       (PersistentProtocolBufferMap/create type data)))
+  ([^PersistentProtocolBufferMap$Def type ^bytes data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/read type in)))))
+
+(defn protobuf-dump [^PersistentProtocolBufferMap p]
   (.toByteArray p))
 
-(defn append [#^PersistentProtocolBufferMap p map]
+(defn append [^PersistentProtocolBufferMap p map]
   (.append p map))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 68e3dac..63b8b3d 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -118,9 +118,8 @@ static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws I
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
-  static public PersistentProtocolBufferMap create(Def def, byte[] bytes, Integer offset, Integer length) throws IOException {
-    CodedInputStream input = CodedInputStream.newInstance(bytes, offset.intValue(), length.intValue());
-    DynamicMessage message = def.parseFrom(input);
+  static public PersistentProtocolBufferMap read(Def def, CodedInputStream in) throws IOException {
+    DynamicMessage message = def.parseFrom(in);
     return new PersistentProtocolBufferMap(null, def, message);
   }
 

From e875dcd113de72216a82ad2ce669f39bd6425fcd Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 21 Feb 2011 21:25:10 -0800
Subject: [PATCH 110/525] add support for reading delimited protobufs from
 input streams and writing delimited protobufs to output streams

---
 src/clj/protobuf.clj                          | 21 ++++++++++--
 .../protobuf/PersistentProtocolBufferMap.java | 32 +++++++++++++++++--
 test/protobuf_test.clj                        | 14 +++++++-
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index d75b7c5..68d6319 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,6 +1,8 @@
 (ns protobuf
+  (:use [clojure.java.io :only [input-stream output-stream]])
   (:import (clojure.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
-           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)))
+           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)
+           (java.io InputStream OutputStream)))
 
 (defn protobuf? [obj]
   (instance? PersistentProtocolBufferMap obj))
@@ -45,10 +47,25 @@
   ([^PersistentProtocolBufferMap$Def type ^bytes data ^Integer offset ^Integer length]
      (when data
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
-         (PersistentProtocolBufferMap/read type in)))))
+         (PersistentProtocolBufferMap/parseFrom type in)))))
+
 
 (defn protobuf-dump [^PersistentProtocolBufferMap p]
   (.toByteArray p))
 
+(defn protobuf-seq [^PersistentProtocolBufferMap$Def type in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (input-stream in)]
+      (when-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
+        (cons p (protobuf-seq type in)))))))
+
+(defn protobuf-write [out & ps]
+  (io!
+   (let [^OutputStream out (output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))
+
 (defn append [^PersistentProtocolBufferMap p map]
   (.append p map))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 63b8b3d..0e498a4 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -13,6 +13,7 @@
 import clojure.lang.*;
 import java.util.*;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
@@ -22,6 +23,7 @@
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
 
 public class PersistentProtocolBufferMap extends APersistentMap {
   public static class Def {
@@ -61,6 +63,15 @@ public DynamicMessage parseFrom(CodedInputStream input) throws IOException {
       return DynamicMessage.parseFrom(type, input);
     }
 
+    public DynamicMessage.Builder parseDelimitedFrom(InputStream input) throws IOException {
+      DynamicMessage.Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder;
+      } else {
+        return null;
+      }
+    }
+
     public DynamicMessage.Builder newBuilder() {
       return DynamicMessage.newBuilder(type);
     }
@@ -118,11 +129,20 @@ static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws I
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
-  static public PersistentProtocolBufferMap read(Def def, CodedInputStream in) throws IOException {
-    DynamicMessage message = def.parseFrom(in);
+  static public PersistentProtocolBufferMap parseFrom(Def def, CodedInputStream input) throws IOException {
+    DynamicMessage message = def.parseFrom(input);
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
+  static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStream input) throws IOException {
+    DynamicMessage.Builder builder = def.parseDelimitedFrom(input);
+    if (builder != null) {
+      return new PersistentProtocolBufferMap(null, def, builder);
+    } else {
+      return null;
+    }
+  }
+
   static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
@@ -150,6 +170,14 @@ public byte[] toByteArray() {
     return message().toByteArray();
   }
 
+  public void writeTo(CodedOutputStream output) throws IOException {
+    message().writeTo(output);
+  }
+
+  public void writeDelimitedTo(OutputStream output) throws IOException {
+    message().writeDelimitedTo(output);
+  }
+
   public Descriptors.Descriptor getMessageType() {
     return def.getMessageType();
   }
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index fbb899c..8d9f34b 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -1,6 +1,7 @@
 (ns protobuf-test
   (:use protobuf)
-  (:use clojure.test))
+  (:use clojure.test)
+  (:import (java.io PipedInputStream PipedOutputStream)))
 
 (defprotobuf Foo clojure.protobuf.Test Foo)
 (defprotobuf Response clojure.protobuf.Test Response)
@@ -164,3 +165,14 @@
 
 (deftest protobuf-nil-field
   (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]))
+
+(deftest protobuf-seq-and-write-protobuf
+  (let [in  (PipedInputStream.)
+        out (PipedOutputStream. in)
+        foo (protobuf Foo :id 1 :label "foo")
+        bar (protobuf Foo :id 2 :label "bar")
+        baz (protobuf Foo :id 3 :label "baz")]
+    (protobuf-write out foo bar baz)
+    (.close out)
+    (is (= [{:id 1, :label "foo"} {:id 2, :label "bar"} {:id 3, :label "baz"}]
+           (protobuf-seq Foo in)))))

From dab8327623c0291f030bfc391179335dd0afb3b9 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 21 Feb 2011 21:46:38 -0800
Subject: [PATCH 111/525] docstrings

---
 src/clj/protobuf.clj | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 68d6319..b0142e1 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -4,22 +4,31 @@
            (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)
            (java.io InputStream OutputStream)))
 
-(defn protobuf? [obj]
+(defn protobuf?
+  "Is the given object a PersistentProtocolBufferMap?"
+  [obj]
   (instance? PersistentProtocolBufferMap obj))
 
-(defn protodef? [obj]
+(defn protodef?
+  "Is the given object a PersistentProtocolBufferMap$Def?"
+  [obj]
   (instance? PersistentProtocolBufferMap$Def obj))
 
-(defn protodef [class]
+(defn protodef
+  "Create a protodef from a string or protobuf class."
+  [class]
   (if (or (protodef? class) (nil? class))
     class
     (PersistentProtocolBufferMap$Def/create class)))
 
-(defmacro defprotobuf [sym & args]
+(defmacro defprotobuf
+  "Helper macro for defining a protodef object."
+  [sym & args]
   (let [class (apply str (interpose "$" (map name args)))]
     `(def ~sym (protodef ~class))))
 
 (defn protobuf
+  "Construct a protobuf of the given type."
   ([^PersistentProtocolBufferMap$Def type]
      (PersistentProtocolBufferMap/construct type {}))
   ([^PersistentProtocolBufferMap$Def type m]
@@ -27,11 +36,15 @@
   ([^PersistentProtocolBufferMap$Def type k v & kvs]
      (PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
 
-(defn protodefault [type key]
+(defn protodefault
+  "Return the default empty protobuf of the given type."
+  [type key]
   (let [type ^PersistentProtocolBufferMap$Def (protodef type)]
     (.defaultValue type key)))
 
-(defn protofields [type]
+(defn protofields
+  "Return a map of the protobuf fields to the clojure.protobuf.Extensions metadata for each field."
+  [type]
   (let [type ^PersistentProtocolBufferMap$Def (protodef type)
         type ^Descriptors$Descriptor (.getMessageType type)]
     (into {}
@@ -41,6 +54,7 @@
           [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
+  "Load a protobuf of the given type from an array of bytes."
   ([^PersistentProtocolBufferMap$Def type ^bytes data]
      (when data
        (PersistentProtocolBufferMap/create type data)))
@@ -50,22 +64,30 @@
          (PersistentProtocolBufferMap/parseFrom type in)))))
 
 
-(defn protobuf-dump [^PersistentProtocolBufferMap p]
+(defn protobuf-dump
+  "Return the byte representation of the given protobuf."
+  [^PersistentProtocolBufferMap p]
   (.toByteArray p))
 
-(defn protobuf-seq [^PersistentProtocolBufferMap$Def type in]
+(defn protobuf-seq
+  "Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream."
+  [^PersistentProtocolBufferMap$Def type in]
   (lazy-seq
    (io!
     (let [^InputStream in (input-stream in)]
       (when-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
         (cons p (protobuf-seq type in)))))))
 
-(defn protobuf-write [out & ps]
+(defn protobuf-write
+  "Write the given protobufs to the given output stream, prefixing each with its length to delimit them."
+  [out & ps]
   (io!
    (let [^OutputStream out (output-stream out)]
      (doseq [^PersistentProtocolBufferMap p ps]
        (.writeDelimitedTo p out))
      (.flush out))))
 
-(defn append [^PersistentProtocolBufferMap p map]
+(defn append
+  "Merge the given map into the protobuf. Equivalent to appending the byte representations."
+  [^PersistentProtocolBufferMap p map]
   (.append p map))
\ No newline at end of file

From 069a7d08e15dd008961f9171f73e08e5b5f4199d Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 18 Mar 2011 12:19:50 -0700
Subject: [PATCH 112/525] version 0.3.4

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 5280b3b..7003d9e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.4-SNAPSHOT"
+(defproject clojure-protobuf "0.3.4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]

From 2b6ca58cef87d8f0512d5dbc2d1e6e4fa38721d3 Mon Sep 17 00:00:00 2001
From: Jan Rychter <jan@rychter.com>
Date: Thu, 7 Apr 2011 15:24:01 +0800
Subject: [PATCH 113/525] make protobuf-seq close the stream after entire
 sequence is consumed

---
 src/clj/protobuf.clj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index b0142e1..78e10a8 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -75,8 +75,9 @@
   (lazy-seq
    (io!
     (let [^InputStream in (input-stream in)]
-      (when-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
-        (cons p (protobuf-seq type in)))))))
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
+        (cons p (protobuf-seq type in))
+        (.close in))))))
 
 (defn protobuf-write
   "Write the given protobufs to the given output stream, prefixing each with its length to delimit them."

From d9d08eb7bc8b932bcb5569d1b5c69b52317237ad Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 15 Apr 2011 18:34:23 -0700
Subject: [PATCH 114/525] test cleanup

---
 test/protobuf_test.clj | 283 ++++++++++++++++++++++-------------------
 1 file changed, 149 insertions(+), 134 deletions(-)

diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 8d9f34b..3e0f4da 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -10,140 +10,155 @@
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
 
-(deftest protobuf-simple
-
-  (testing "conj"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
-      (let [p (conj p {:label "bar"})]
-        (is (= 5     (:id p)))
-        (is (= "bar" (:label p)))
-        (is (= ["little" "yellow"] (:tags p)))
-        (is (= [1.2 3.4 5.6] (:doubles p)))
-        (is (= [(float 0.01) (float 0.02) (float 0.03)] (:floats  p)))
-        )
-      (let [p (conj p {:tags ["different"]})]
-        (is (= ["different"] (:tags p))))
-      (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
-        (is (= ["little" "yellow" "different"] (:tags p)))
-        (is (= "very" (:label p))))))
-
-  (testing "append"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
-      (let [p (append p {:label "bar"})]
-        (is (= 5     (:id p)))
-        (is (= "bar" (:label p)))
-        (is (= ["little" "yellow"] (:tags p))))
-      (let [p (append p {:tags ["different"]})]
-        (is (= ["little" "yellow" "different"] (:tags p))))
-      (let [p (append p {:tags ["different"] :label "very"})]
-        (is (= ["little" "yellow" "different"] (:tags p)))
-        (is (= "very" (:label p))))
-      (let [p (append p {:doubles [3.4] :floats [0.02]})]
-        (is (= [1.2 3.4] (:doubles p)))
-        (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
-
-  (testing "assoc"
-    (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
-      (let [p (assoc p :label "baz" :tags ["nuprin"])]
-        (is (= ["nuprin"] (:tags p)))
-        (is (= "baz"      (:label p))))
-      (let [p (assoc p "responses" [:yes :no :maybe :no "yes"])]
-        (is (= [:yes :no :maybe :no :yes] (:responses p))))
-      (let [p (assoc p :tags "aspirin")]
-        (is (= ["aspirin"] (:tags p))))
-      (let [p (assoc p :foo-by-id {3 {:label "three"} 2 {:label "two"}})]
-        (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))))
-
-  (testing "dissoc"
-    (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
-      (let [p (dissoc p :label :tags)]
-        (is (= []  (:tags p)))
-        (is (= nil (:label p))))))
-
-  (testing "string keys"
-    (let [p (protobuf Foo "id" 5 "label" "rad")]
-      (is (= 5 (p :id)))
-      (is (= 5 (p "id")))
-      (is (= "rad" (p :label)))
-      (is (= "rad" (p "label")))
-      (let [p (conj p {"tags" ["check" "it" "out"]})]
-        (is (= ["check" "it" "out"] (p :tags)))
-        (is (= ["check" "it" "out"] (p "tags"))))))
-
-  (testing "append bytes"
-    (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
-          q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
-          r (protobuf Foo :label "bad")
-          s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
-          t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
-      (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
-      (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
-      (is (= "rad" (s :label)))
-      (is (= "bad" (t :label)))
-      (is (= ["sweet"] (t :tags)))
-      (is (= ["sweet" "savory"] (s :tags)))
-      (is (= #{"foo" "bar" "baz"} (p :tag-set)))
-      (is (= #{"bap" "baz"} (s :tag-set)))))
-
-  (testing "coercing doubles and floats"
-    (let [p (protobuf Foo :lat 5 :long 6)]
-      (is (= 5.0 (p :lat)))
-      (is (= 6.0 (p :long))))
-    (let [p (protobuf Foo :lat (float 5.0) :long (double 6.0))]
-      (is (= 5.0 (p :lat)))
-      (is (= 6.0 (p :long))))
-    ))
-
-(deftest protobuf-extended
-
-  (testing "create"
-    (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
-      (is (= #{"little" "yellow"} (:tag-set p)))
-      (is (associative? (:attr-map p)))
-      (is (= "different" (get-in p [:attr-map "style"])))
-      (is (= "little"    (get-in p [:attr-map "size" ])))
-      (is (= "yellow"    (get-in p [:attr-map "color"]))))
-    (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
-      (let [five ((p :foo-by-id) 5)
-            six  ((p :foo-by-id) 6)]
-        (is (= 5      (five :id)))
-        (is (= "five" (five :label)))
-        (is (= 6      (six  :id)))
-        (is (= "six"  (six  :label))))))
-
-  (testing "map-by with required field"
-    (let [p (protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
-      (is (= "foo" (get-in p [:item-map "foo" :item])))
-      (is (= "bar" (get-in p [:item-map "bar" :item])))))
-
-  (testing "conj"
-    (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
-      (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
-        (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
-        (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
-        (is (= nil              (get-in p [:foo-by-id 6 :label])))))))
-
-(deftest protofields-and-defaults
-
-  (testing "protofields"
-    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil,
-                  :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil, :lat nil, :long nil}]
-      (is (= fields (protofields Foo)))
-      (is (= fields (protofields clojure.protobuf.Test$Foo)))))
-
-  (testing "protodefault"
-    (is (= 43  (protodefault Foo :id)))
-    (is (= 0.0 (protodefault Foo :lat)))
-    (is (= 0.0 (protodefault Foo :long)))
-    (is (= ""  (protodefault Foo :label)))
-    (is (= []  (protodefault Foo :tags)))
-    (is (= nil (protodefault Foo :parent)))
-    (is (= []  (protodefault Foo :responses)))
-    (is (= #{} (protodefault Foo :tag-set)))
-    (is (= {}  (protodefault Foo :foo-by-id)))
-    (is (= {}  (protodefault Foo :groups)))
-    (is (= {}  (protodefault Foo :item-map)))
-    (is (= {}  (protodefault clojure.protobuf.Test$Foo :groups)))))
+(deftest test-conj
+  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
+    (let [p (conj p {:label "bar"})]
+      (is (= 5     (:id p)))
+      (is (= "bar" (:label p)))
+      (is (= ["little" "yellow"] (:tags p)))
+      (is (= [1.2 3.4 5.6] (:doubles p)))
+      (is (= [(float 0.01) (float 0.02) (float 0.03)] (:floats  p)))
+      )
+    (let [p (conj p {:tags ["different"]})]
+      (is (= ["different"] (:tags p))))
+    (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
+      (is (= ["little" "yellow" "different"] (:tags p)))
+      (is (= "very" (:label p))))))
+
+(deftest test-append
+  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
+    (let [p (append p {:label "bar"})]
+      (is (= 5     (:id p)))
+      (is (= "bar" (:label p)))
+      (is (= false (:deleted p)))
+      (is (= ["little" "yellow"] (:tags p))))
+    (let [p (append (assoc p :deleted true) p)]
+      (is (= true (:deleted p))))
+    (let [p (append p {:tags ["different"]})]
+      (is (= ["little" "yellow" "different"] (:tags p))))
+    (let [p (append p {:tags ["different"] :label "very"})]
+      (is (= ["little" "yellow" "different"] (:tags p)))
+      (is (= "very" (:label p))))
+    (let [p (append p {:doubles [3.4] :floats [0.02]})]
+      (is (= [1.2 3.4] (:doubles p)))
+      (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
+
+(deftest test-adjoin
+  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
+    (let [p (adjoin p {:label "bar"})]
+      (is (= 5     (:id p)))
+      (is (= "bar" (:label p)))
+      (is (= false (:deleted p)))
+      (is (= ["little" "yellow"] (:tags p))))
+    (let [p (adjoin (assoc p :deleted true) p)]
+      (is (= false (:deleted p))))
+    (let [p (adjoin p {:tags ["different"]})]
+      (is (= ["little" "yellow" "different"] (:tags p))))
+    (let [p (adjoin p {:tags ["different"] :label "very"})]
+      (is (= ["little" "yellow" "different"] (:tags p)))
+      (is (= "very" (:label p))))
+    (let [p (adjoin p {:doubles [3.4] :floats [0.02]})]
+      (is (= [1.2 3.4] (:doubles p)))
+      (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
+
+(deftest test-assoc
+  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
+    (let [p (assoc p :label "baz" :tags ["nuprin"])]
+      (is (= ["nuprin"] (:tags p)))
+      (is (= "baz"      (:label p))))
+    (let [p (assoc p "responses" [:yes :no :maybe :no "yes"])]
+      (is (= [:yes :no :maybe :no :yes] (:responses p))))
+    (let [p (assoc p :tags "aspirin")]
+      (is (= ["aspirin"] (:tags p))))
+    (let [p (assoc p :foo-by-id {3 {:label "three"} 2 {:label "two"}})]
+      (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))))
+
+(deftest test-dissoc
+  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+    (let [p (dissoc p :label :tags)]
+      (is (= nil (:tags p)))
+      (is (= nil (:label p))))))
+
+(deftest test-string-keys
+  (let [p (protobuf Foo "id" 5 "label" "rad")]
+    (is (= 5 (p :id)))
+    (is (= 5 (p "id")))
+    (is (= "rad" (p :label)))
+    (is (= "rad" (p "label")))
+    (let [p (conj p {"tags" ["check" "it" "out"]})]
+      (is (= ["check" "it" "out"] (p :tags)))
+      (is (= ["check" "it" "out"] (p "tags"))))))
+
+(deftest test-append-bytes
+  (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
+        q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
+        r (protobuf Foo :label "bad")
+        s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
+        t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
+    (is (= 43 (s :id)))                 ; make sure an explicit default overwrites on append
+    (is (= 5  (t :id)))                 ; make sure a missing default doesn't overwrite on append
+    (is (= "rad" (s :label)))
+    (is (= "bad" (t :label)))
+    (is (= ["sweet"] (t :tags)))
+    (is (= ["sweet" "savory"] (s :tags)))
+    (is (= #{"foo" "bar" "baz"} (p :tag-set)))
+    (is (= #{"bap" "baz"} (s :tag-set)))))
+
+(deftest test-coercing
+  (let [p (protobuf Foo :lat 5 :long 6)]
+    (is (= 5.0 (p :lat)))
+    (is (= 6.0 (p :long))))
+  (let [p (protobuf Foo :lat (float 5.0) :long (double 6.0))]
+    (is (= 5.0 (p :lat)))
+    (is (= 6.0 (p :long)))))
+
+(deftest test-create
+  (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
+    (is (= #{"little" "yellow"} (:tag-set p)))
+    (is (associative? (:attr-map p)))
+    (is (= "different" (get-in p [:attr-map "style"])))
+    (is (= "little"    (get-in p [:attr-map "size" ])))
+    (is (= "yellow"    (get-in p [:attr-map "color"]))))
+  (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
+    (let [five ((p :foo-by-id) 5)
+          six  ((p :foo-by-id) 6)]
+      (is (= 5      (five :id)))
+      (is (= "five" (five :label)))
+      (is (= 6      (six  :id)))
+      (is (= "six"  (six  :label))))))
+
+(deftest test-map-by-with-required-field
+  (let [p (protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
+    (is (= "foo" (get-in p [:item-map "foo" :item])))
+    (is (= "bar" (get-in p [:item-map "bar" :item])))))
+
+(deftest test-conj
+  (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
+    (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
+      (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
+      (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
+      (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
+
+(deftest test-protofields
+  (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil, :deleted nil,
+                :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil, :lat nil, :long nil}]
+    (is (= fields (protofields Foo)))
+    (is (= fields (protofields clojure.protobuf.Test$Foo)))))
+
+(deftest test-protodefault
+  (is (= 43    (protodefault Foo :id)))
+  (is (= 0.0   (protodefault Foo :lat)))
+  (is (= 0.0   (protodefault Foo :long)))
+  (is (= ""    (protodefault Foo :label)))
+  (is (= []    (protodefault Foo :tags)))
+  (is (= nil   (protodefault Foo :parent)))
+  (is (= []    (protodefault Foo :responses)))
+  (is (= #{}   (protodefault Foo :tag-set)))
+  (is (= {}    (protodefault Foo :foo-by-id)))
+  (is (= {}    (protodefault Foo :groups)))
+  (is (= {}    (protodefault Foo :item-map)))
+  (is (= false (protodefault Foo :deleted)))
+  (is (= {}    (protodefault clojure.protobuf.Test$Foo :groups))))
 
 (deftest use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]

From a14c93c61a996e3f196a8e92b581faf8fe0e8d14 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 15 Apr 2011 18:37:56 -0700
Subject: [PATCH 115/525] clean up seq, make explicit defaults show in seq and
 valAt

---
 proto/clojure/protobuf/test.proto             |  1 +
 src/clj/protobuf.clj                          |  2 +-
 .../protobuf/PersistentProtocolBufferMap.java | 71 +++++++++----------
 test/protobuf_test.clj                        |  6 +-
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 6781bd9..426dd57 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -28,6 +28,7 @@ message Foo {
   repeated Foo   foo_by_id = 12 [(map_by) = "id"];
   repeated Group groups    = 13 [(map)    = true];
   repeated Item  item_map  = 14 [(map_by) = "item"];
+  optional bool  deleted   = 15 [default  = false];
 }
 
 message Pair {
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 78e10a8..3eb4ac2 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -50,7 +50,7 @@
     (into {}
       (for [^Descriptors$FieldDescriptor field (.getFields type)]
         (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-              field-name  (keyword (PersistentProtocolBufferMap/normalize (.getName field)))]
+              field-name  (keyword (PersistentProtocolBufferMap/intern (.getName field)))]
           [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
 
 (defn protobuf-load
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 0e498a4..18d59d7 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -201,16 +201,22 @@ protected DynamicMessage.Builder builder() {
   static boolean use_underscores = false;
   static public void setUseUnderscores(boolean val) {
     use_underscores = val;
+    field_name_to_keyword.clear();
     enum_to_keyword.clear();
     map_field_by.clear();
   }
 
-  static public String normalize(String s) {
-    s = s.toLowerCase();
-    if (!use_underscores) {
-      s = s.replaceAll("_","-");
+  static ConcurrentHashMap<String, Keyword> field_name_to_keyword =
+     new ConcurrentHashMap<String, Keyword>();
+  static public Keyword intern(String name) {
+    Keyword keyword = field_name_to_keyword.get(name);
+    if (keyword == null) {
+      name = name.toLowerCase();
+      if (!use_underscores) name = name.replaceAll("_","-");
+      keyword = Keyword.intern(Symbol.intern(name));
+      field_name_to_keyword.putIfAbsent(name, keyword);
     }
-    return s;
+    return keyword;
   }
 
   static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword =
@@ -218,8 +224,7 @@ static public String normalize(String s) {
   static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
     Keyword keyword = enum_to_keyword.get(enum_value);
     if (keyword == null) {
-      String name = normalize(enum_value.getName());
-      keyword = Keyword.intern(Symbol.intern(name));
+      keyword = intern(enum_value.getName());
       enum_to_keyword.putIfAbsent(enum_value, keyword);
     }
     return keyword;
@@ -233,9 +238,7 @@ static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
     Keyword keyword = map_field_by.get(field);
     if (keyword == null) {
       String name = field.getOptions().getExtension(Extensions.mapBy);
-
-      name = normalize(name);
-      keyword = Keyword.intern(Symbol.intern(name));
+      keyword = intern(name);
       map_field_by.putIfAbsent(field, keyword);
     }
     return keyword == k_null ? null : keyword;
@@ -459,7 +462,8 @@ public IMapEntry entryAt(Object key) {
   public Object valAt(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return null;
-    if (!field.isRepeated() && !message().hasField(field)) return null;
+    if (field.isRepeated() && message().getRepeatedFieldCount(field) == 0) return null;
+    if (!field.isRepeated() && !field.hasDefaultValue() && !message().hasField(field)) return null;
     return fromProtoValue(field, message().getField(field));
   }
 
@@ -486,7 +490,7 @@ public IPersistentCollection cons(Object o) {
     if (o instanceof Map.Entry) {
       Map.Entry e = (Map.Entry) o;
       addField(builder, e.getKey(), e.getValue());
-    }	else if (o instanceof IPersistentVector) {
+    } else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector) o;
       if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
       addField(builder, v.nth(0), v.nth(1));
@@ -528,7 +532,7 @@ public int count() {
   }
 
   public ISeq seq() {
-    return Seq.create(message());
+    return Seq.create(null, this, RT.seq(def.type.getFields()));
   }
 
   public IPersistentCollection empty() {
@@ -538,43 +542,38 @@ public IPersistentCollection empty() {
   }
 
   static class Seq extends ASeq {
-    final Map<Descriptors.FieldDescriptor, Object> map;
-    final Descriptors.FieldDescriptor[] fields;
-    final int i;
-
-    static public Seq create(DynamicMessage message) {
-      Map<Descriptors.FieldDescriptor, Object> map = message.getAllFields();
-      if (map.size() == 0) return null;
-
-      Descriptors.FieldDescriptor[] fields = new Descriptors.FieldDescriptor[map.size()];
-      fields = (Descriptors.FieldDescriptor[]) map.keySet().toArray(fields);
-      return new Seq(null, map, fields, 0);
+    final PersistentProtocolBufferMap proto;
+    final MapEntry first;
+    final ISeq fields;
+
+    static public Seq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
+      for (ISeq s = fields; s != null; s = s.next()) {
+        Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
+        Keyword key = intern(field.getName());
+        Object  val = proto.valAt(key);
+        if (val != null) return new Seq(meta, proto, new MapEntry(key, val), s);
+      }
+      return null;
     }
 
-    protected Seq(IPersistentMap meta, Map<Descriptors.FieldDescriptor, Object> map, Descriptors.FieldDescriptor[] fields, int i){
+    protected Seq(IPersistentMap meta, PersistentProtocolBufferMap proto, MapEntry first, ISeq fields){
       super(meta);
-      this.map    = map;
+      this.proto  = proto;
+      this.first  = first;
       this.fields = fields;
-      this.i      = i;
     }
 
     public Obj withMeta(IPersistentMap meta) {
-      if(meta != meta()) return new Seq(meta, map, fields, i);
+      if (meta != meta()) return new Seq(meta, proto, first, fields);
       return this;
     }
 
     public Object first() {
-      if (i == fields.length) return null;
-      Descriptors.FieldDescriptor field = fields[i];
-      String name = normalize(field.getName());
-      Keyword key = Keyword.intern(Symbol.intern(name));
-      Object  val = PersistentProtocolBufferMap.fromProtoValue(field, map.get(field));
-      return new MapEntry(key, val);
+      return first;
     }
 
     public ISeq next() {
-      if (i + 1 < fields.length) return new Seq(meta(), map, fields, i + 1);
-      return null;
+      return create(meta(), proto, fields.next());
     }
   }
 }
\ No newline at end of file
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 3e0f4da..1492cee 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -162,14 +162,14 @@
 
 (deftest use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
-    (is (= '(:responses :tag-set)                (keys p)))
+    (is (= '(:id :responses :tag-set :deleted)   (keys p)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses p)))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores true)
-    (is (= '(:responses :tag_set)                (keys p)))
+    (is (= '(:id :responses :tag_set :deleted)   (keys p)))
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
-    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil,
+    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil, :deleted nil,
                   :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil, :item_map nil, :lat nil, :long nil}]
       (is (= fields (protofields Foo))))
 

From 8e0baeaaff025a11d013529c023a7836e6dc5dbd Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 15 Apr 2011 18:38:47 -0700
Subject: [PATCH 116/525] add adjoin method (already in tests)

---
 project.clj                                           |  2 +-
 src/clj/protobuf.clj                                  |  7 ++++++-
 .../clojure/protobuf/PersistentProtocolBufferMap.java | 11 ++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 7003d9e..a04127e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.3.4"
+(defproject clojure-protobuf "0.4.0-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]]
   :tasks [protobuf.tasks]
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 3eb4ac2..e90921d 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -91,4 +91,9 @@
 (defn append
   "Merge the given map into the protobuf. Equivalent to appending the byte representations."
   [^PersistentProtocolBufferMap p map]
-  (.append p map))
\ No newline at end of file
+  (.append p map))
+
+(defn adjoin
+  "Merge the given map into the protobuf. Like append, except default values in map will be used if it i."
+  [^PersistentProtocolBufferMap p map]
+  (.adjoin p map))
\ No newline at end of file
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 18d59d7..65b4259 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -143,7 +143,7 @@ static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStrea
     }
   }
 
-  static public PersistentProtocolBufferMap construct(Def def, IPersistentMap keyvals) {
+  static public PersistentProtocolBufferMap construct(Def def, Object keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
     return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
   }
@@ -513,6 +513,15 @@ public PersistentProtocolBufferMap append(IPersistentMap map) {
     return new PersistentProtocolBufferMap(meta(), def, builder().mergeFrom(proto.message()));
   }
 
+  public PersistentProtocolBufferMap adjoin(IPersistentMap map) {
+    if (map instanceof PersistentProtocolBufferMap) {
+      PersistentProtocolBufferMap proto = (PersistentProtocolBufferMap) map;
+      return append(construct(def, proto.seq()));
+    } else {
+      return append(map);
+    }
+  }
+
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return this;

From 518e88a4919023ce0aa8cc6d62fc77db2676a0ce Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Fri, 15 Apr 2011 19:40:35 -0700
Subject: [PATCH 117/525] use ordered-set

---
 project.clj                                               | 3 ++-
 src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index a04127e..c00a7d2 100644
--- a/project.clj
+++ b/project.clj
@@ -1,5 +1,6 @@
 (defproject clojure-protobuf "0.4.0-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[clojure "1.2.0"]]
+  :dependencies [[clojure "1.2.0"]
+                 [ordered-set "0.2.2"]]
   :tasks [protobuf.tasks]
   :jar-files ["proto"])
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 65b4259..66881ca 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -291,7 +291,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
         Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
 
-        ITransientSet set = (ITransientSet) PersistentHashSet.EMPTY.asTransient();
+        ITransientSet set = (ITransientSet) PersistentOrderedSet.EMPTY.asTransient();
         while (iterator.hasNext()) {
           DynamicMessage message = (DynamicMessage) iterator.next();
           Object  item   = fromProtoValue(item_field, message.getField(item_field));

From 9733802c38902df24762be3f079975dae93bb10e Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Wed, 18 May 2011 18:45:16 -0700
Subject: [PATCH 118/525] version 0.4.0

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index c00a7d2..472e519 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.0-SNAPSHOT"
+(defproject clojure-protobuf "0.4.0"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 01f5e5af2b6ffbba465e902a0d22cbb06e681fcd Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 23 May 2011 18:55:41 -0700
Subject: [PATCH 119/525] fix map_by bug when value has string key which is
 overridden

---
 proto/clojure/protobuf/test.proto                  |  3 ++-
 .../protobuf/PersistentProtocolBufferMap.java      |  5 +++--
 test/protobuf_test.clj                             | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 426dd57..fa48803 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -28,7 +28,8 @@ message Foo {
   repeated Foo   foo_by_id = 12 [(map_by) = "id"];
   repeated Group groups    = 13 [(map)    = true];
   repeated Item  item_map  = 14 [(map_by) = "item"];
-  optional bool  deleted   = 15 [default  = false];
+  repeated Pair  pair_map  = 15 [(map_by) = "key"];
+  optional bool  deleted   = 16 [default  = false];
 }
 
 message Pair {
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 66881ca..d53957b 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -395,8 +395,9 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
           for (ISeq s = RT.seq(val); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             IPersistentMap map = (IPersistentMap) e.getValue();
-            Object value = toProtoValue(field, map.assoc(map_field_by, e.getKey()));
-            builder.addRepeatedField(field, value);
+            Object k = e.getKey();
+            Object v = toProtoValue(field, map.assoc(map_field_by, k).assoc(map_field_by.getName(), k));
+            builder.addRepeatedField(field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(val); s != null; s = s.next()) {
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 1492cee..3fb3197 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -132,6 +132,14 @@
     (is (= "foo" (get-in p [:item-map "foo" :item])))
     (is (= "bar" (get-in p [:item-map "bar" :item])))))
 
+(deftest test-map-by-with-inconsistent-keys
+  (let [p (protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
+    (is (= "hmm" (get-in p [:pair-map "foo" :val])))
+    (is (= nil   (get-in p [:pair-map "bar" :val]))))
+  (let [p (protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
+    (is (= "hmm" (get-in p [:pair-map "foo" :val])))
+    (is (= nil   (get-in p [:pair-map "bar" :val])))))
+
 (deftest test-conj
   (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
     (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
@@ -141,7 +149,8 @@
 
 (deftest test-protofields
   (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil, :deleted nil,
-                :attr-map nil, :foo-by-id nil, :groups nil, :doubles nil, :floats nil, :item-map nil, :lat nil, :long nil}]
+                :attr-map nil, :foo-by-id nil, :pair-map nil, :groups nil, :doubles nil, :floats nil, :item-map nil,
+                :lat nil, :long nil}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
@@ -170,7 +179,8 @@
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil, :deleted nil,
-                  :attr_map nil, :foo_by_id nil, :groups nil, :doubles nil, :floats nil, :item_map nil, :lat nil, :long nil}]
+                  :attr_map nil, :foo_by_id nil, :pair_map nil, :groups nil, :doubles nil, :floats nil, :item_map nil,
+                  :lat nil, :long nil}]
       (is (= fields (protofields Foo))))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))

From 6e52dae079840b01ebea9437924997f03120eb93 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 23 May 2011 18:56:43 -0700
Subject: [PATCH 120/525] version 0.4.1

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 472e519..0eae3e4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.0"
+(defproject clojure-protobuf "0.4.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 937fb0aa2f0dd7be69cd933f0aa74700bdd383d9 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Mon, 23 May 2011 21:50:20 -0700
Subject: [PATCH 121/525] add count extension type

---
 proto/clojure/protobuf/extensions.proto       |  5 ++---
 proto/clojure/protobuf/test.proto             | 17 ++++++++++-------
 .../protobuf/PersistentProtocolBufferMap.java |  6 ++++++
 test/protobuf_test.clj                        | 19 +++++++++++++++++--
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/proto/clojure/protobuf/extensions.proto b/proto/clojure/protobuf/extensions.proto
index db4908e..2028a2f 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -4,10 +4,9 @@ option java_package = "clojure.protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
-  optional bool   set    = 52001;  
+  optional bool   set    = 52001;
   optional bool   map    = 52002;
   optional string map_by = 52003;
-  //  optional bool   sorted = 52005;
-  //  optional bool   multi  = 52006;
+  optional bool   count  = 52004;
   optional string meta   = 52010;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index fa48803..f23332a 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -16,6 +16,9 @@ message Foo {
   optional double lat  = 8;
   optional float  long = 9;
 
+  repeated uint32 count_int    = 10 [(count) = true];
+  repeated double count_double = 11 [(count) = true];
+
   enum Response {
     YES      = 0;
     NO       = 1;
@@ -23,13 +26,13 @@ message Foo {
     NOT_SURE = 3;
   }
 
-  repeated Item  tag_set   = 10 [(set)    = true];
-  repeated Pair  attr_map  = 11 [(map)    = true];
-  repeated Foo   foo_by_id = 12 [(map_by) = "id"];
-  repeated Group groups    = 13 [(map)    = true];
-  repeated Item  item_map  = 14 [(map_by) = "item"];
-  repeated Pair  pair_map  = 15 [(map_by) = "key"];
-  optional bool  deleted   = 16 [default  = false];
+  repeated Item  tag_set   = 20 [(set)    = true];
+  repeated Pair  attr_map  = 21 [(map)    = true];
+  repeated Foo   foo_by_id = 22 [(map_by) = "id"];
+  repeated Group groups    = 23 [(map)    = true];
+  repeated Item  item_map  = 24 [(map_by) = "item"];
+  repeated Pair  pair_map  = 25 [(map_by) = "key"];
+  optional bool  deleted   = 26 [default  = false];
 }
 
 message Pair {
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index d53957b..a51b344 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -268,6 +268,12 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           }
         }
         return map.persistent();
+      } else if (options.getExtension(Extensions.count)) {
+        Object count = iterator.next();
+        while (iterator.hasNext()) {
+          count = Numbers.add(count, iterator.next());
+        }
+        return count;
       } else if (options.getExtension(Extensions.map)) {
         Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
         Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 3fb3197..c9a4dee 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -147,10 +147,25 @@
       (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
       (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
 
+(deftest test-counts
+  (let [p (protobuf Foo :count-int 5)]
+    (is (= 5 (get p :count-int)))
+    (let [p (append p {:count-int 2})]
+      (is (= 7 (get p :count-int)))
+      (let [p (append p {:count-int -8})]
+        (is (= -1 (get p :count-int))))))
+  (let [p (protobuf Foo :count-double 5.0)]
+    (is (= 5.0 (get p :count-double)))
+    (let [p (append p {:count-double -2.4})]
+      (is (= 2.6 (get p :count-double)))
+      (let [p (append p {:count-double 4.06})]
+        (is (= 6.66 (get p :count-double)))))))
+
+
 (deftest test-protofields
   (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil, :deleted nil,
                 :attr-map nil, :foo-by-id nil, :pair-map nil, :groups nil, :doubles nil, :floats nil, :item-map nil,
-                :lat nil, :long nil}]
+                :count-int nil, :count-double nil, :lat nil, :long nil}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
@@ -180,7 +195,7 @@
 
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil, :deleted nil,
                   :attr_map nil, :foo_by_id nil, :pair_map nil, :groups nil, :doubles nil, :floats nil, :item_map nil,
-                  :lat nil, :long nil}]
+                  :count_int nil, :count_double nil, :lat nil, :long nil}]
       (is (= fields (protofields Foo))))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))

From aefdf252c5aa6e3a67909d74ce2807f9f6d6c77e Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 24 May 2011 13:22:57 -0700
Subject: [PATCH 122/525] rename count field option to counter since field
 cannot have the same name as an option

---
 proto/clojure/protobuf/extensions.proto                | 10 +++++-----
 proto/clojure/protobuf/test.proto                      |  4 ++--
 .../clojure/protobuf/PersistentProtocolBufferMap.java  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proto/clojure/protobuf/extensions.proto b/proto/clojure/protobuf/extensions.proto
index 2028a2f..2e89a8f 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -4,9 +4,9 @@ option java_package = "clojure.protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
-  optional bool   set    = 52001;
-  optional bool   map    = 52002;
-  optional string map_by = 52003;
-  optional bool   count  = 52004;
-  optional string meta   = 52010;
+  optional bool   set     = 52001;
+  optional bool   map     = 52002;
+  optional string map_by  = 52003;
+  optional bool   counter = 52004;
+  optional string meta    = 52010;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index f23332a..b18ec5c 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -16,8 +16,8 @@ message Foo {
   optional double lat  = 8;
   optional float  long = 9;
 
-  repeated uint32 count_int    = 10 [(count) = true];
-  repeated double count_double = 11 [(count) = true];
+  repeated int32  count_int    = 10 [(counter) = true];
+  repeated double count_double = 11 [(counter) = true];
 
   enum Response {
     YES      = 0;
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index a51b344..e65be01 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -268,7 +268,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           }
         }
         return map.persistent();
-      } else if (options.getExtension(Extensions.count)) {
+      } else if (options.getExtension(Extensions.counter)) {
         Object count = iterator.next();
         while (iterator.hasNext()) {
           count = Numbers.add(count, iterator.next());

From c1573f90e8f472c442389dc539732386ce3fb038 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 24 May 2011 13:24:49 -0700
Subject: [PATCH 123/525] version 0.4.2

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 0eae3e4..2fcdde8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.1"
+(defproject clojure-protobuf "0.4.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 6f5499dc55f991ef4474821a939cf585553f5d65 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 24 May 2011 17:00:55 -0700
Subject: [PATCH 124/525] append messages within map_by. add test for nested
 counters

---
 proto/clojure/protobuf/test.proto             |  9 ++++--
 .../protobuf/PersistentProtocolBufferMap.java |  2 +-
 test/protobuf_test.clj                        | 28 +++++++++----------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index b18ec5c..a0843fa 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -16,8 +16,7 @@ message Foo {
   optional double lat  = 8;
   optional float  long = 9;
 
-  repeated int32  count_int    = 10 [(counter) = true];
-  repeated double count_double = 11 [(counter) = true];
+  repeated Count counts = 10 [(map_by) = "key"];
 
   enum Response {
     YES      = 0;
@@ -50,6 +49,12 @@ message Item {
   required bool   exists = 2 [default = true];
 }
 
+message Count {
+  required string key = 1;
+  repeated int32  i   = 2 [(counter) = true];
+  repeated double d   = 3 [(counter) = true];
+}
+
 message ErrorMsg {
   required sint32 code = 1;
   optional string data = 2;
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index e65be01..472034d 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -262,7 +262,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           Object key = val.valAt(map_field_by);
           PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(key);
           if (existing != null) {
-            map.assoc(key, existing.cons(val));
+            map.assoc(key, existing.append(val));
           } else {
             map.assoc(key, val);
           }
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index c9a4dee..982e32a 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -148,24 +148,22 @@
       (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
 
 (deftest test-counts
-  (let [p (protobuf Foo :count-int 5)]
-    (is (= 5 (get p :count-int)))
-    (let [p (append p {:count-int 2})]
-      (is (= 7 (get p :count-int)))
-      (let [p (append p {:count-int -8})]
-        (is (= -1 (get p :count-int))))))
-  (let [p (protobuf Foo :count-double 5.0)]
-    (is (= 5.0 (get p :count-double)))
-    (let [p (append p {:count-double -2.4})]
-      (is (= 2.6 (get p :count-double)))
-      (let [p (append p {:count-double 4.06})]
-        (is (= 6.66 (get p :count-double)))))))
-
+  (let [p (protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
+    (is (= 5   (get-in p [:counts "foo" :i])))
+    (is (= 5.0 (get-in p [:counts "foo" :d])))
+    (let [p (append p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
+      (is (= 7   (get-in p [:counts "foo" :i])))
+      (is (= 2.6 (get-in p [:counts "foo" :d])))
+      (is (= 99  (get-in p [:counts "bar" :i])))
+      (let [p (append p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
+        (is (= -1   (get-in p [:counts "foo" :i])))
+        (is (= 6.66 (get-in p [:counts "foo" :d])))
+        (is (= 33   (get-in p [:counts "bar" :i])))))))
 
 (deftest test-protofields
   (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil, :deleted nil,
                 :attr-map nil, :foo-by-id nil, :pair-map nil, :groups nil, :doubles nil, :floats nil, :item-map nil,
-                :count-int nil, :count-double nil, :lat nil, :long nil}]
+                :counts nil, :lat nil, :long nil}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
@@ -195,7 +193,7 @@
 
     (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil, :deleted nil,
                   :attr_map nil, :foo_by_id nil, :pair_map nil, :groups nil, :doubles nil, :floats nil, :item_map nil,
-                  :count_int nil, :count_double nil, :lat nil, :long nil}]
+                  :counts nil, :lat nil, :long nil}]
       (is (= fields (protofields Foo))))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))

From 108c69bca52b0d2005067c9559dbc243db4009c2 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 24 May 2011 17:01:05 -0700
Subject: [PATCH 125/525] test cleanup

---
 test/protobuf_test.clj | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 982e32a..789cfbd 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -182,7 +182,7 @@
   (is (= false (protodefault Foo :deleted)))
   (is (= {}    (protodefault clojure.protobuf.Test$Foo :groups))))
 
-(deftest use-underscores
+(deftest test-use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
     (is (= '(:id :responses :tag-set :deleted)   (keys p)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses p)))
@@ -198,13 +198,15 @@
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))
 
-(deftest protobuf-nested-message
-  (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]))
+(deftest test-protobuf-nested-message
+  (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]
+    (is (= "abc" (get-in p [:error :data])))))
 
-(deftest protobuf-nil-field
-  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]))
+(deftest test-protobuf-nested-null-field
+  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]
+    (is (:ok p))))
 
-(deftest protobuf-seq-and-write-protobuf
+(deftest test-protobuf-seq-and-write-protobuf
   (let [in  (PipedInputStream.)
         out (PipedOutputStream. in)
         foo (protobuf Foo :id 1 :label "foo")

From 296caf3bedd28bdd17b590300bc0ce33cb896f1d Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Tue, 24 May 2011 17:01:42 -0700
Subject: [PATCH 126/525] version 0.4.3

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2fcdde8..af5d19d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.2"
+(defproject clojure-protobuf "0.4.3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From fc5413e367e886945cbc365faefc37a6178a5bfd Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Thu, 9 Jun 2011 17:31:52 -0700
Subject: [PATCH 127/525] include :repeated and :type in protofields metadata

---
 src/clj/protobuf.clj   | 11 ++++++++---
 test/protobuf_test.clj | 27 ++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index e90921d..5dcba96 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -1,5 +1,6 @@
 (ns protobuf
-  (:use [clojure.java.io :only [input-stream output-stream]])
+  (:use [clojure.java.io :only [input-stream output-stream]]
+        [clojure.string :only [lower-case]])
   (:import (clojure.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)
            (java.io InputStream OutputStream)))
@@ -50,8 +51,12 @@
     (into {}
       (for [^Descriptors$FieldDescriptor field (.getFields type)]
         (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-              field-name  (keyword (PersistentProtocolBufferMap/intern (.getName field)))]
-          [field-name (when-not (empty? meta-string) (read-string meta-string))])))))
+              field-name  (keyword (PersistentProtocolBufferMap/intern (.getName field)))
+              field-type  (keyword (lower-case (.name (.getJavaType field))))]
+          [field-name (assoc (when-not (empty? meta-string)
+                               (read-string meta-string))
+                        :type     field-type
+                        :repeated (.isRepeated field))])))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 789cfbd..3ecbe3d 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -161,9 +161,23 @@
         (is (= 33   (get-in p [:counts "bar" :i])))))))
 
 (deftest test-protofields
-  (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag-set nil, :deleted nil,
-                :attr-map nil, :foo-by-id nil, :pair-map nil, :groups nil, :doubles nil, :floats nil, :item-map nil,
-                :counts nil, :lat nil, :long nil}]
+  (let [fields {:parent    {:repeated false, :type :message},
+                :floats    {:repeated true,  :type :float},
+                :doubles   {:repeated true,  :type :double},
+                :counts    {:repeated true,  :type :message},
+                :attr-map  {:repeated true,  :type :message},
+                :tag-set   {:repeated true,  :type :message},
+                :item-map  {:repeated true,  :type :message},
+                :groups    {:repeated true,  :type :message},
+                :responses {:repeated true,  :type :enum},
+                :lat       {:repeated false, :type :double},
+                :pair-map  {:repeated true,  :type :message},
+                :foo-by-id {:repeated true,  :type :message},
+                :label     {:repeated false, :type :string, :a 1, :b 2, :c 3},
+                :id        {:repeated false, :type :int},
+                :long      {:repeated false, :type :float},
+                :deleted   {:repeated false, :type :boolean},
+                :tags      {:repeated true,  :type :string}}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
@@ -191,10 +205,9 @@
     (is (= '(:id :responses :tag_set :deleted)   (keys p)))
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
-    (let [fields {:id nil, :label {:a 1, :b 2, :c 3}, :tags nil, :parent nil, :responses nil, :tag_set nil, :deleted nil,
-                  :attr_map nil, :foo_by_id nil, :pair_map nil, :groups nil, :doubles nil, :floats nil, :item_map nil,
-                  :counts nil, :lat nil, :long nil}]
-      (is (= fields (protofields Foo))))
+    (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
+             :pair_map :groups :doubles :floats :item_map :counts :lat :long}
+           (set (keys (protofields Foo)))))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))
 

From ac5fb9af03f787081d05a1a8dd6d1371a256bb66 Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Thu, 9 Jun 2011 17:33:58 -0700
Subject: [PATCH 128/525] version 0.4.4

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index af5d19d..fea5ceb 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.3"
+(defproject clojure-protobuf "0.4.4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 8d4a73a5f94e40ea0bcc4142653dac8509d6d4ac Mon Sep 17 00:00:00 2001
From: ninjudd <git@justinbalthrop.com>
Date: Sun, 12 Jun 2011 10:23:20 -0700
Subject: [PATCH 129/525] add succession extension type and (get-raw ...) to
 get value bypassing extensions

---
 project.clj                                   |   2 +-
 proto/clojure/protobuf/extensions.proto       |  11 +-
 proto/clojure/protobuf/test.proto             |  10 ++
 src/clj/protobuf.clj                          |   7 +-
 .../protobuf/PersistentProtocolBufferMap.java | 147 ++++++++++--------
 test/protobuf_test.clj                        |  25 ++-
 6 files changed, 124 insertions(+), 78 deletions(-)

diff --git a/project.clj b/project.clj
index fea5ceb..cce2979 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.4"
+(defproject clojure-protobuf "0.4.5"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
diff --git a/proto/clojure/protobuf/extensions.proto b/proto/clojure/protobuf/extensions.proto
index 2e89a8f..a56dd34 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -4,9 +4,10 @@ option java_package = "clojure.protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
-  optional bool   set     = 52001;
-  optional bool   map     = 52002;
-  optional string map_by  = 52003;
-  optional bool   counter = 52004;
-  optional string meta    = 52010;
+  optional bool   set        = 52001;
+  optional bool   map        = 52002;
+  optional string map_by     = 52003;
+  optional bool   counter    = 52004;
+  optional bool   succession = 52005;
+  optional string meta       = 52010;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index a0843fa..08aee2b 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -18,6 +18,8 @@ message Foo {
 
   repeated Count counts = 10 [(map_by) = "key"];
 
+  repeated Time time = 11 [(succession) = true];
+
   enum Response {
     YES      = 0;
     NO       = 1;
@@ -34,6 +36,14 @@ message Foo {
   optional bool  deleted   = 26 [default  = false];
 }
 
+message Time {
+  optional sint32 year   = 1;
+  optional int32  month  = 2;
+  optional int32  day    = 3;
+  optional int32  hour   = 4;
+  optional int32  minute = 5;
+}
+
 message Pair {
   required string key = 1;
   required string val = 2;
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 5dcba96..d69c764 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -101,4 +101,9 @@
 (defn adjoin
   "Merge the given map into the protobuf. Like append, except default values in map will be used if it i."
   [^PersistentProtocolBufferMap p map]
-  (.adjoin p map))
\ No newline at end of file
+  (.adjoin p map))
+
+(defn get-raw
+  "Get value at key ignoring extension fields."
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 472034d..79b7ea4 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -249,78 +249,85 @@ static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
   static Keyword k_item   = Keyword.intern(Symbol.intern("item"));
   static Keyword k_exists = Keyword.intern(Symbol.intern("exists"));
   static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
+    return fromProtoValue(field, value, true);
+  }
+
+  static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value, boolean use_extensions) {
     if (value instanceof List) {
       List values = (List) value;
       Iterator iterator = values.iterator();
 
-      Keyword map_field_by = mapFieldBy(field);
-      DescriptorProtos.FieldOptions options = field.getOptions();
-      if (map_field_by != null) {
-        ITransientMap map = PersistentHashMap.EMPTY.asTransient();
-        while (iterator.hasNext()) {
-          PersistentProtocolBufferMap val = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
-          Object key = val.valAt(map_field_by);
-          PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(key);
-          if (existing != null) {
-            map.assoc(key, existing.append(val));
-          } else {
-            map.assoc(key, val);
+      if (use_extensions) {
+        Keyword map_field_by = mapFieldBy(field);
+        DescriptorProtos.FieldOptions options = field.getOptions();
+        if (map_field_by != null) {
+          ITransientMap map = PersistentHashMap.EMPTY.asTransient();
+          while (iterator.hasNext()) {
+            PersistentProtocolBufferMap val = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
+            Object key = val.valAt(map_field_by);
+            PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(key);
+            if (existing != null) {
+              map.assoc(key, existing.append(val));
+            } else {
+              map.assoc(key, val);
+            }
           }
-        }
-        return map.persistent();
-      } else if (options.getExtension(Extensions.counter)) {
-        Object count = iterator.next();
-        while (iterator.hasNext()) {
-          count = Numbers.add(count, iterator.next());
-        }
-        return count;
-      } else if (options.getExtension(Extensions.map)) {
-        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-        Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
-        Descriptors.FieldDescriptor val_field = def.fieldDescriptor(k_val);
-
-        ITransientMap map = PersistentHashMap.EMPTY.asTransient();
-        while (iterator.hasNext()) {
-          DynamicMessage message = (DynamicMessage) iterator.next();
-          Object key = fromProtoValue(key_field, message.getField(key_field));
-          Object val = fromProtoValue(val_field, message.getField(val_field));
-          Object existing = map.valAt(key);
-          if (existing != null && existing instanceof IPersistentCollection) {
-            map.assoc(key, ((IPersistentCollection) existing).cons(val));
-          } else {
-            map.assoc(key, val);
+          return map.persistent();
+        } else if (options.getExtension(Extensions.counter)) {
+          Object count = iterator.next();
+          while (iterator.hasNext()) {
+            count = Numbers.add(count, iterator.next());
           }
-        }
-        return map.persistent();
-      } else if (options.getExtension(Extensions.set)) {
-        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-        Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
-        Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
-
-        ITransientSet set = (ITransientSet) PersistentOrderedSet.EMPTY.asTransient();
-        while (iterator.hasNext()) {
-          DynamicMessage message = (DynamicMessage) iterator.next();
-          Object  item   = fromProtoValue(item_field, message.getField(item_field));
-          Boolean exists = (Boolean) message.getField(exists_field);
-
-          if (exists) {
-            set.conj(item);
-          } else {
-            try {
-              set.disjoin(item);
-            } catch (Exception e) {
-              e.printStackTrace();
+          return count;
+        } else if (options.getExtension(Extensions.succession)) {
+          return fromProtoValue(field, values.get(values.size() - 1));
+        } else if (options.getExtension(Extensions.map)) {
+          Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+          Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
+          Descriptors.FieldDescriptor val_field = def.fieldDescriptor(k_val);
+
+          ITransientMap map = PersistentHashMap.EMPTY.asTransient();
+          while (iterator.hasNext()) {
+            DynamicMessage message = (DynamicMessage) iterator.next();
+            Object key = fromProtoValue(key_field, message.getField(key_field));
+            Object val = fromProtoValue(val_field, message.getField(val_field));
+            Object existing = map.valAt(key);
+            if (existing != null && existing instanceof IPersistentCollection) {
+              map.assoc(key, ((IPersistentCollection) existing).cons(val));
+            } else {
+              map.assoc(key, val);
             }
           }
+          return map.persistent();
+        } else if (options.getExtension(Extensions.set)) {
+          Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+          Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
+          Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
+
+          ITransientSet set = (ITransientSet) PersistentOrderedSet.EMPTY.asTransient();
+          while (iterator.hasNext()) {
+            DynamicMessage message = (DynamicMessage) iterator.next();
+            Object  item   = fromProtoValue(item_field, message.getField(item_field));
+            Boolean exists = (Boolean) message.getField(exists_field);
+
+            if (exists) {
+              set.conj(item);
+            } else {
+              try {
+                set.disjoin(item);
+              } catch (Exception e) {
+                e.printStackTrace();
+              }
+            }
+          }
+          return set.persistent();
         }
-        return set.persistent();
-      } else {
-        List<Object> list = new ArrayList<Object>(values.size());
-        while (iterator.hasNext()) {
-          list.add(fromProtoValue(field, iterator.next()));
-        }
-        return PersistentVector.create(list);
       }
+      List<Object> list = new ArrayList<Object>(values.size());
+      while (iterator.hasNext()) {
+        list.add(fromProtoValue(field, iterator.next(), use_extensions));
+      }
+      return PersistentVector.create(list);
     } else {
       switch (field.getJavaType()) {
       case ENUM:
@@ -331,7 +338,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         DynamicMessage message = (DynamicMessage) value;
 
         // Total hack because getField() doesn't return an empty array for repeated messages.
-        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList());
+        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList(), use_extensions);
 
         return new PersistentProtocolBufferMap(null, def, message);
       default:
@@ -467,11 +474,7 @@ public IMapEntry entryAt(Object key) {
   }
 
   public Object valAt(Object key) {
-    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null) return null;
-    if (field.isRepeated() && message().getRepeatedFieldCount(field) == 0) return null;
-    if (!field.isRepeated() && !field.hasDefaultValue() && !message().hasField(field)) return null;
-    return fromProtoValue(field, message().getField(field));
+    return getValAt(key, true);
   }
 
   public Object valAt(Object key, Object notFound) {
@@ -479,6 +482,14 @@ public Object valAt(Object key, Object notFound) {
     return (val == null) ? notFound : val;
   }
 
+  public Object getValAt(Object key, boolean use_extensions) {
+    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+    if (field == null) return null;
+    if (field.isRepeated() && message().getRepeatedFieldCount(field) == 0) return null;
+    if (!field.isRepeated() && !field.hasDefaultValue() && !message().hasField(field)) return null;
+    return fromProtoValue(field, message().getField(field), use_extensions);
+  }
+
   public IPersistentMap assoc(Object key, Object val) {
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 3ecbe3d..46a4f82 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -147,7 +147,7 @@
       (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
       (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
 
-(deftest test-counts
+(deftest test-nested-counters
   (let [p (protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
     (is (= 5   (get-in p [:counts "foo" :i])))
     (is (= 5.0 (get-in p [:counts "foo" :d])))
@@ -158,13 +158,32 @@
       (let [p (append p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
         (is (= -1   (get-in p [:counts "foo" :i])))
         (is (= 6.66 (get-in p [:counts "foo" :d])))
-        (is (= 33   (get-in p [:counts "bar" :i])))))))
+        (is (= 33   (get-in p [:counts "bar" :i])))
+        (is (= [{:key "foo", :i 5, :d 5.0}
+                {:key "foo", :i 2, :d -2.4}
+                {:key "bar", :i 99}
+                {:key "foo", :i -8, :d 4.06}
+                {:key "bar", :i -66}]
+               (get-raw p :counts)))))))
+
+(deftest test-succession
+  (let [p (protobuf Foo :time {:year 1978 :month 11 :day 24})]
+    (is (= 1978 (get-in p [:time :year])))
+    (is (= 11   (get-in p [:time :month])))
+    (is (= 24   (get-in p [:time :day])))
+    (let [p (append p {:time {:year 1974 :month 1}})]
+      (is (= 1974 (get-in p [:time :year])))
+      (is (= 1    (get-in p [:time :month])))
+      (is (= nil  (get-in p [:time :day])))
+      (is (= [{:year 1978, :month 11, :day 24} {:year 1974, :month 1}]
+             (get-raw p :time))))))
 
 (deftest test-protofields
   (let [fields {:parent    {:repeated false, :type :message},
                 :floats    {:repeated true,  :type :float},
                 :doubles   {:repeated true,  :type :double},
                 :counts    {:repeated true,  :type :message},
+                :time      {:repeated true,  :type :message},
                 :attr-map  {:repeated true,  :type :message},
                 :tag-set   {:repeated true,  :type :message},
                 :item-map  {:repeated true,  :type :message},
@@ -206,7 +225,7 @@
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
-             :pair_map :groups :doubles :floats :item_map :counts :lat :long}
+             :pair_map :groups :doubles :floats :item_map :counts :time :lat :long}
            (set (keys (protofields Foo)))))
 
     (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))

From e636474c464251d3df04b2b9dc01fc058763ad95 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 27 Jun 2011 15:08:50 -0700
Subject: [PATCH 130/525] depot updates

---
 project.clj                | 2 +-
 src/clj/protobuf/tasks.clj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index cce2979..dc163d7 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.5"
+(defproject clojure-protobuf "0.4.6"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 08527f7..0bec2dc 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -45,7 +45,7 @@
   (when (installed?)
     (let [password (prompt-read "Password" :echo false)]
       (ant ExecTask {:dir srcdir :executable "sudo" :input-string (str password "\n")}
-           (args ["-S" "make" "uninstall"])))))
+        (args ["-S" "make" "uninstall"])))))
 
 (defn- proto-dependencies "look for lines starting with import in proto-file"
   [proto-file]
@@ -81,7 +81,7 @@
          (log "Compiling" proto "to" dest)
          (extract-dependencies (file "proto" proto))
          (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
-                   (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
+                (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
               (catch org.apache.tools.ant.BuildException e
                 (throw (Exception. (str "error compiling " proto))))))
        (compile-java (file dest)))))
@@ -102,7 +102,7 @@
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
 (deftask compile-native #{proto})
-(deftask proto #{deps install-protoc}
+(deftask proto #{install-protoc}
   "Compile protocol buffer files located in proto dir."
   (if (= "clojure-protobuf" (:artifact-id *project*))
     (do (invoke fetch-protoc)

From 1028efbebc54f17a2422f6cec611cab7f11a2f44 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 29 Jun 2011 18:21:23 -0700
Subject: [PATCH 131/525] updates for cake depot

---
 project.clj                | 3 ++-
 src/clj/protobuf/tasks.clj | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index dc163d7..5794673 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,7 @@
-(defproject clojure-protobuf "0.4.6"
+(defproject clojure-protobuf "0.4.7-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
   :tasks [protobuf.tasks]
+  :source-path ["src/clj" "src/jvm"]
   :jar-files ["proto"])
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 0bec2dc..9d69f23 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -84,7 +84,7 @@
                 (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
               (catch org.apache.tools.ant.BuildException e
                 (throw (Exception. (str "error compiling " proto))))))
-       (compile-java (file dest)))))
+       (compile-java dest))))
 
 (defn build-protobuf []
   (ant Mkdir {:dir "proto/google/protobuf"})

From 847c3930013ac3967b98f76bc2818fafc29bbd90 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 30 Jun 2011 13:09:37 -0700
Subject: [PATCH 132/525] add support for nested subfields with protofields

---
 src/clj/protobuf.clj   | 32 +++++++++++++++++---------------
 test/protobuf_test.clj |  9 +++++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index d69c764..12cd482 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -17,10 +17,15 @@
 
 (defn protodef
   "Create a protodef from a string or protobuf class."
-  [class]
-  (if (or (protodef? class) (nil? class))
-    class
-    (PersistentProtocolBufferMap$Def/create class)))
+  ([class]
+     (if (or (protodef? class) (nil? class))
+       class
+       (PersistentProtocolBufferMap$Def/create class)))
+  ([class field]
+     (-> (protodef class)
+         (.fieldDescriptor field)
+         .getMessageType
+         protodef)))
 
 (defmacro defprotobuf
   "Helper macro for defining a protodef object."
@@ -45,18 +50,15 @@
 
 (defn protofields
   "Return a map of the protobuf fields to the clojure.protobuf.Extensions metadata for each field."
-  [type]
-  (let [type ^PersistentProtocolBufferMap$Def (protodef type)
-        type ^Descriptors$Descriptor (.getMessageType type)]
+  [& args]
+  (let [type (.getMessageType ^PersistentProtocolBufferMap$Def (apply protodef args))]
     (into {}
-      (for [^Descriptors$FieldDescriptor field (.getFields type)]
-        (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-              field-name  (keyword (PersistentProtocolBufferMap/intern (.getName field)))
-              field-type  (keyword (lower-case (.name (.getJavaType field))))]
-          [field-name (assoc (when-not (empty? meta-string)
-                               (read-string meta-string))
-                        :type     field-type
-                        :repeated (.isRepeated field))])))))
+          (for [^Descriptors$FieldDescriptor field (.getFields ^Descriptors$Descriptor type)]
+            (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
+                  field-name  (PersistentProtocolBufferMap/intern (.getName field))]
+              [field-name (assoc (when (seq meta-string) (read-string meta-string))
+                            :type     (keyword (lower-case (.name (.getJavaType field))))
+                            :repeated (.isRepeated field))])))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 46a4f82..889cdda 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -200,6 +200,15 @@
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
+(deftest test-nested-protofields
+  (is (= {:year   {:repeated false, :type :int},
+          :month  {:repeated false, :type :int},
+          :day    {:repeated false, :type :int},
+          :hour   {:repeated false, :type :int},
+          :minute {:repeated false, :type :int}}
+         (protofields Foo :time))))
+
+
 (deftest test-protodefault
   (is (= 43    (protodefault Foo :id)))
   (is (= 0.0   (protodefault Foo :lat)))

From 4148afae36a70fac927fe5d842215f89111f10fa Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 30 Jun 2011 15:54:44 -0700
Subject: [PATCH 133/525] add enum :values and arbitrarily deep nested field
 support to protofields

---
 src/clj/protobuf.clj                          | 28 +++++++---
 .../protobuf/PersistentProtocolBufferMap.java |  3 +-
 test/protobuf_test.clj                        | 55 ++++++++++---------
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 12cd482..3f2d33f 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -21,11 +21,16 @@
      (if (or (protodef? class) (nil? class))
        class
        (PersistentProtocolBufferMap$Def/create class)))
-  ([class field]
-     (-> (protodef class)
-         (.fieldDescriptor field)
-         .getMessageType
-         protodef)))
+  ([class & fields]
+     (loop [type   (protodef class)
+            fields fields]
+       (if (empty? fields)
+         type
+         (recur (-> type
+                    (.fieldDescriptor (first fields))
+                    .getMessageType
+                    protodef)
+                (rest fields))))))
 
 (defmacro defprotobuf
   "Helper macro for defining a protodef object."
@@ -55,10 +60,15 @@
     (into {}
           (for [^Descriptors$FieldDescriptor field (.getFields ^Descriptors$Descriptor type)]
             (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-                  field-name  (PersistentProtocolBufferMap/intern (.getName field))]
-              [field-name (assoc (when (seq meta-string) (read-string meta-string))
-                            :type     (keyword (lower-case (.name (.getJavaType field))))
-                            :repeated (.isRepeated field))])))))
+                  field-name  (PersistentProtocolBufferMap/intern (.getName field))
+                  field-type  (keyword (lower-case (.name (.getJavaType field))))]
+              [field-name (merge (when (seq meta-string) (read-string meta-string))
+                                 {:type field-type}
+                                 (when (.isRepeated field)
+                                   {:repeated true})
+                                 (when (= :enum field-type)
+                                   {:values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
+                                                      (.. field getEnumType getValues)))}))])))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index 79b7ea4..f9f29fc 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -221,7 +221,7 @@ static public Keyword intern(String name) {
 
   static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword =
      new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
-  static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
+  static public Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
     Keyword keyword = enum_to_keyword.get(enum_value);
     if (keyword == null) {
       keyword = intern(enum_value.getName());
@@ -230,7 +230,6 @@ static protected Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_valu
     return keyword;
   }
 
-
   static Keyword k_null = Keyword.intern(Symbol.intern(""));
   static ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword> map_field_by =
      new ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword>();
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 889cdda..dd713e3 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -179,35 +179,40 @@
              (get-raw p :time))))))
 
 (deftest test-protofields
-  (let [fields {:parent    {:repeated false, :type :message},
-                :floats    {:repeated true,  :type :float},
-                :doubles   {:repeated true,  :type :double},
-                :counts    {:repeated true,  :type :message},
-                :time      {:repeated true,  :type :message},
-                :attr-map  {:repeated true,  :type :message},
-                :tag-set   {:repeated true,  :type :message},
-                :item-map  {:repeated true,  :type :message},
-                :groups    {:repeated true,  :type :message},
-                :responses {:repeated true,  :type :enum},
-                :lat       {:repeated false, :type :double},
-                :pair-map  {:repeated true,  :type :message},
-                :foo-by-id {:repeated true,  :type :message},
-                :label     {:repeated false, :type :string, :a 1, :b 2, :c 3},
-                :id        {:repeated false, :type :int},
-                :long      {:repeated false, :type :float},
-                :deleted   {:repeated false, :type :boolean},
-                :tags      {:repeated true,  :type :string}}]
+  (let [fields {:floats    {:type :float,   :repeated true},
+                :doubles   {:type :double,  :repeated true},
+                :counts    {:type :message, :repeated true},
+                :time      {:type :message, :repeated true},
+                :attr-map  {:type :message, :repeated true},
+                :tag-set   {:type :message, :repeated true},
+                :item-map  {:type :message, :repeated true},
+                :groups    {:type :message, :repeated true},
+                :responses {:type :enum,    :repeated true, :values #{:yes :no :maybe :not-sure}},
+                :pair-map  {:type :message, :repeated true},
+                :foo-by-id {:type :message, :repeated true},
+                :tags      {:type :string,  :repeated true},
+                :label     {:type :string, :a 1, :b 2, :c 3},
+                :id        {:type :int},
+                :parent    {:type :message},
+                :lat       {:type :double},
+                :long      {:type :float},
+                :deleted   {:type :boolean}}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields clojure.protobuf.Test$Foo)))))
 
 (deftest test-nested-protofields
-  (is (= {:year   {:repeated false, :type :int},
-          :month  {:repeated false, :type :int},
-          :day    {:repeated false, :type :int},
-          :hour   {:repeated false, :type :int},
-          :minute {:repeated false, :type :int}}
-         (protofields Foo :time))))
-
+  (is (= {:year   {:type :int},
+          :month  {:type :int},
+          :day    {:type :int},
+          :hour   {:type :int},
+          :minute {:type :int}}
+         (protofields Foo :time)))
+  (is (= {:year   {:type :int},
+          :month  {:type :int},
+          :day    {:type :int},
+          :hour   {:type :int},
+          :minute {:type :int}}
+         (protofields Foo :parent :foo-by-id :time))))
 
 (deftest test-protodefault
   (is (= 43    (protodefault Foo :id)))

From a3960121c0a6a1f0e7f3796792de17c2b72ec647 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 1 Jul 2011 13:16:42 -0700
Subject: [PATCH 134/525] rename project to protobuf

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 5794673..97d0393 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-protobuf "0.4.7-SNAPSHOT"
+(defproject protobuf "0.4.7-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 95d79ed58b8908253858cccb4ae39b8415e195e6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 12 Jul 2011 14:25:19 -0700
Subject: [PATCH 135/525] 0.5.0-alpha1

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 97d0393..8087cf5 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.4.7-SNAPSHOT"
+(defproject protobuf "0.5.0-alpha1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 76894ce08bb4c537fa2f71122ee0607db197b6c8 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 19 Jul 2011 17:12:08 -0500
Subject: [PATCH 136/525] Add cake-marginalia.

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 8087cf5..0283c26 100644
--- a/project.clj
+++ b/project.clj
@@ -2,6 +2,7 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
-  :tasks [protobuf.tasks]
+  :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.1"]]
+  :tasks [protobuf.tasks cake-marginalia.tasks]
   :source-path ["src/clj" "src/jvm"]
   :jar-files ["proto"])

From 4b37c78cd63007de208a999eebcf9c1b38c20604 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 19 Jul 2011 17:13:21 -0500
Subject: [PATCH 137/525] Add docs to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 79b5bdd..a2e3401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pom.xml
 *.jar
 *.class
 proto/google/protobuf/descriptor.proto
+docs

From 735a4be6416b35d2d3b692ed213be8a67fca5f7b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 18 Aug 2011 17:40:33 -0700
Subject: [PATCH 138/525] bump cake-marginalia

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 0283c26..a5579de 100644
--- a/project.clj
+++ b/project.clj
@@ -2,7 +2,7 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
-  :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.1"]]
+  :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.3"]]
   :tasks [protobuf.tasks cake-marginalia.tasks]
   :source-path ["src/clj" "src/jvm"]
   :jar-files ["proto"])

From 171dadc50280ad0a890641892b82f2a528a849aa Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 19 Aug 2011 12:04:12 -0700
Subject: [PATCH 139/525] fix proto task within protobuf project

---
 src/clj/protobuf/tasks.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
index 9d69f23..132b36c 100644
--- a/src/clj/protobuf/tasks.clj
+++ b/src/clj/protobuf/tasks.clj
@@ -104,7 +104,7 @@
 (deftask compile-native #{proto})
 (deftask proto #{install-protoc}
   "Compile protocol buffer files located in proto dir."
-  (if (= "clojure-protobuf" (:artifact-id *project*))
+  (if (= "protobuf" (:artifact-id *project*))
     (do (invoke fetch-protoc)
         (build-protobuf))
     (protoc (or (:proto *opts*) (proto-files (file "proto"))))))

From a3770a98931b77cf9d1549dc1d842b00f2df69d9 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 19 Aug 2011 13:43:17 -0700
Subject: [PATCH 140/525] add support for nullable fields

---
 project.clj                                   |   2 +-
 proto/clojure/protobuf/extensions.proto       |  18 ++-
 proto/clojure/protobuf/test.proto             |  11 ++
 .../protobuf/PersistentProtocolBufferMap.java | 110 ++++++++++--------
 test/protobuf_test.clj                        |  32 ++++-
 5 files changed, 118 insertions(+), 55 deletions(-)

diff --git a/project.clj b/project.clj
index a5579de..74dc6f8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-alpha1"
+(defproject protobuf "0.5.0-alpha2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
diff --git a/proto/clojure/protobuf/extensions.proto b/proto/clojure/protobuf/extensions.proto
index a56dd34..f72066e 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/clojure/protobuf/extensions.proto
@@ -4,10 +4,16 @@ option java_package = "clojure.protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
-  optional bool   set        = 52001;
-  optional bool   map        = 52002;
-  optional string map_by     = 52003;
-  optional bool   counter    = 52004;
-  optional bool   succession = 52005;
-  optional string meta       = 52010;
+  optional bool   set         = 52001;
+  optional bool   map         = 52002;
+  optional string map_by      = 52003;
+  optional bool   counter     = 52004;
+  optional bool   succession  = 52005;
+  optional string meta        = 52010;
+  optional bool   nullable    = 52020;
+  optional string null_string = 52021;
+  optional sint32 null_int    = 52022;
+  optional sint64 null_long   = 52023;
+  optional float  null_float  = 52024;
+  optional double null_double = 52025;
 }
diff --git a/proto/clojure/protobuf/test.proto b/proto/clojure/protobuf/test.proto
index 08aee2b..7149e8d 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/clojure/protobuf/test.proto
@@ -36,6 +36,17 @@ message Foo {
   optional bool  deleted   = 26 [default  = false];
 }
 
+message Bar {
+  optional int32  int  = 1 [(nullable) = true, (null_int)    = -1];
+  optional int64  long = 2 [(nullable) = true, (null_long)   = -999999999999];
+  optional float  flt  = 3 [(nullable) = true, (null_float)  = -0.0001];
+  optional double dbl  = 4 [(nullable) = true, (null_double) = -0.00000001];
+  optional string str  = 5 [(nullable) = true, (null_string) = "NULL"];
+
+  repeated string label  = 6 [(nullable) = true, (null_string) = "", (succession) = true];
+  repeated string labels = 7 [(nullable) = true, (null_string) = ""];
+}
+
 message Time {
   optional sint32 year   = 1;
   optional int32  month  = 2;
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index f9f29fc..a724aad 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -24,6 +24,7 @@
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.GeneratedMessage;
 
 public class PersistentProtocolBufferMap extends APersistentMap {
   public static class Def {
@@ -262,13 +263,13 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         if (map_field_by != null) {
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
-            PersistentProtocolBufferMap val = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
-            Object key = val.valAt(map_field_by);
-            PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(key);
+            PersistentProtocolBufferMap v = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
+            Object k = v.valAt(map_field_by);
+            PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(k);
             if (existing != null) {
-              map.assoc(key, existing.append(val));
+              map.assoc(k, existing.append(v));
             } else {
-              map.assoc(key, val);
+              map.assoc(k, v);
             }
           }
           return map.persistent();
@@ -288,13 +289,13 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
             DynamicMessage message = (DynamicMessage) iterator.next();
-            Object key = fromProtoValue(key_field, message.getField(key_field));
-            Object val = fromProtoValue(val_field, message.getField(val_field));
-            Object existing = map.valAt(key);
+            Object k = fromProtoValue(key_field, message.getField(key_field));
+            Object v = fromProtoValue(val_field, message.getField(val_field));
+            Object existing = map.valAt(k);
             if (existing != null && existing instanceof IPersistentCollection) {
-              map.assoc(key, ((IPersistentCollection) existing).cons(val));
+              map.assoc(k, ((IPersistentCollection) existing).cons(v));
             } else {
-              map.assoc(key, val);
+              map.assoc(k, v);
             }
           }
           return map.persistent();
@@ -341,21 +342,26 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
 
         return new PersistentProtocolBufferMap(null, def, message);
       default:
+        if (use_extensions &&
+            field.getOptions().getExtension(Extensions.nullable) &&
+            field.getOptions().getExtension(nullExtension(field)).equals(value))
+          return null;
         return value;
       }
     }
   }
 
   static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
+    if (value == null && field.getOptions().getExtension(Extensions.nullable))
+      value = field.getOptions().getExtension(nullExtension(field));
+
     switch (field.getJavaType()) {
     case LONG:
       if (value instanceof Long) return value;
-      Integer i = (Integer) value;
-      return new Long(i.longValue());
+      return new Long(((Integer) value).longValue());
     case INT:
       if (value instanceof Integer) return value;
-      Long l = (Long) value;
-      return new Integer(l.intValue());
+      return new Integer(((Long) value).intValue());
     case FLOAT:
       if (value instanceof Integer) return new Float((Integer) value * 1.0);
       if (value instanceof Double)  return new Float((Double) value);
@@ -388,23 +394,35 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
     }
   }
 
-  protected void addField(DynamicMessage.Builder builder, Object key, Object val) {
-    if (key == null || val == null) return;
+  static protected GeneratedMessage.GeneratedExtension nullExtension(Descriptors.FieldDescriptor field) {
+    switch (field.getJavaType()) {
+    case LONG:   return Extensions.nullLong;
+    case INT:    return Extensions.nullInt;
+    case FLOAT:  return Extensions.nullFloat;
+    case DOUBLE: return Extensions.nullDouble;
+    case STRING: return Extensions.nullString;
+    }
+    return null;
+  }
+
+  protected void addField(DynamicMessage.Builder builder, Object key, Object value) {
+    if (key == null) return;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return;
+    if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) return;
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
       builder.clearField(field);
-      if (val instanceof Sequential && !set) {
-        for (ISeq s = RT.seq(val); s != null; s = s.next()) {
-          Object value = toProtoValue(field, s.first());
-          builder.addRepeatedField(field, value);
+      if (value instanceof Sequential && !set) {
+        for (ISeq s = RT.seq(value); s != null; s = s.next()) {
+          Object v = toProtoValue(field, s.first());
+          builder.addRepeatedField(field, v);
         }
       } else {
         Keyword map_field_by = mapFieldBy(field);
         if (map_field_by != null) {
-          for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+          for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             IPersistentMap map = (IPersistentMap) e.getValue();
             Object k = e.getKey();
@@ -412,38 +430,38 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object val)
             builder.addRepeatedField(field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
-          for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+          for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
-            Object value = toProtoValue(field, new PersistentArrayMap(map));
-            builder.addRepeatedField(field, value);
+            Object v = toProtoValue(field, new PersistentArrayMap(map));
+            builder.addRepeatedField(field, v);
           }
         } else if (set) {
-          if (val instanceof IPersistentMap) {
-            for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+          if (value instanceof IPersistentMap) {
+            for (ISeq s = RT.seq(value); s != null; s = s.next()) {
               Map.Entry e = (Map.Entry) s.first();
               Object[] map = {k_item, e.getKey(), k_exists, e.getValue()};
-              Object value = toProtoValue(field, new PersistentArrayMap(map));
-              builder.addRepeatedField(field, value);
+              Object v = toProtoValue(field, new PersistentArrayMap(map));
+              builder.addRepeatedField(field, v);
             }
           } else {
-            for (ISeq s = RT.seq(val); s != null; s = s.next()) {
+            for (ISeq s = RT.seq(value); s != null; s = s.next()) {
               Object[] map = {k_item, s.first(), k_exists, true};
-              Object value = toProtoValue(field, new PersistentArrayMap(map));
-              builder.addRepeatedField(field, value);
+              Object v = toProtoValue(field, new PersistentArrayMap(map));
+              builder.addRepeatedField(field, v);
             }
           }
         } else {
-          Object value = toProtoValue(field, val);
-          builder.addRepeatedField(field, value);
+          Object v = toProtoValue(field, value);
+          builder.addRepeatedField(field, v);
         }
       }
     } else {
-      Object value = toProtoValue(field, val);
-      if (value instanceof DynamicMessage) {
-        value = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) value).build();
+      Object v = toProtoValue(field, value);
+      if (v instanceof DynamicMessage) {
+        v = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) v).build();
       }
-      builder.setField(field, value);
+      builder.setField(field, v);
     }
   }
 
@@ -477,8 +495,8 @@ public Object valAt(Object key) {
   }
 
   public Object valAt(Object key, Object notFound) {
-    Object val = valAt(key);
-    return (val == null) ? notFound : val;
+    Object value = valAt(key);
+    return (value == null) ? notFound : value;
   }
 
   public Object getValAt(Object key, boolean use_extensions) {
@@ -489,17 +507,17 @@ public Object getValAt(Object key, boolean use_extensions) {
     return fromProtoValue(field, message().getField(field), use_extensions);
   }
 
-  public IPersistentMap assoc(Object key, Object val) {
+  public IPersistentMap assoc(Object key, Object value) {
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
-    addField(builder, field, val);
+    addField(builder, field, value);
     return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
-  public IPersistentMap assocEx(Object key, Object val) throws Exception {
+  public IPersistentMap assocEx(Object key, Object value) throws Exception {
     if(containsKey(key)) throw new Exception("Key already present");
-    return assoc(key, val);
+    return assoc(key, value);
   }
 
   public IPersistentCollection cons(Object o) {
@@ -575,9 +593,9 @@ static class Seq extends ASeq {
     static public Seq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
       for (ISeq s = fields; s != null; s = s.next()) {
         Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
-        Keyword key = intern(field.getName());
-        Object  val = proto.valAt(key);
-        if (val != null) return new Seq(meta, proto, new MapEntry(key, val), s);
+        Keyword k = intern(field.getName());
+        Object  v = proto.valAt(k);
+        if (v != null) return new Seq(meta, proto, new MapEntry(k, v), s);
       }
       return null;
     }
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index dd713e3..8b4dea4 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -4,6 +4,7 @@
   (:import (java.io PipedInputStream PipedOutputStream)))
 
 (defprotobuf Foo clojure.protobuf.Test Foo)
+(defprotobuf Bar clojure.protobuf.Test Bar)
 (defprotobuf Response clojure.protobuf.Test Response)
 (defprotobuf ErrorMsg clojure.protobuf.Test ErrorMsg)
 
@@ -17,8 +18,7 @@
       (is (= "bar" (:label p)))
       (is (= ["little" "yellow"] (:tags p)))
       (is (= [1.2 3.4 5.6] (:doubles p)))
-      (is (= [(float 0.01) (float 0.02) (float 0.03)] (:floats  p)))
-      )
+      (is (= [(float 0.01) (float 0.02) (float 0.03)] (:floats  p))))
     (let [p (conj p {:tags ["different"]})]
       (is (= ["different"] (:tags p))))
     (let [p (conj p {:tags ["little" "yellow" "different"] :label "very"})]
@@ -178,6 +178,34 @@
       (is (= [{:year 1978, :month 11, :day 24} {:year 1974, :month 1}]
              (get-raw p :time))))))
 
+(deftest test-nullable
+  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo")]
+    (is (= 1            (get p :int)))
+    (is (= 330000000000 (get p :long)))
+    (is (= (float 1.23) (get p :flt)))
+    (is (= 9.87654321   (get p :dbl)))
+    (is (= "foo"        (get p :str)))
+    (is (= [:int :long :flt :dbl :str] (keys p)))
+    (let [p (append p {:int nil :long nil :flt nil :dbl nil :str nil})]
+      (is (= nil (get p :int)))
+      (is (= nil (get p :long)))
+      (is (= nil (get p :flt)))
+      (is (= nil (get p :dbl)))
+      (is (= nil (get p :str)))
+      (is (= nil (keys p))))
+    (testing "nullable successions"
+      (let [p (protobuf Bar :label "foo")]
+        (is (= "foo" (get p :label)))
+        (let [p (append p {:label nil})]
+          (is (= nil        (get     p :label)))
+          (is (= ["foo" ""] (get-raw p :label))))))
+    (testing "repeated nullable"
+      (let [p (protobuf Bar :labels ["foo" "bar"])]
+        (is (= ["foo" "bar"] (get p :labels)))
+        (let [p (append p {:labels [nil]})]
+          (is (= ["foo" "bar" nil] (get     p :labels)))
+          (is (= ["foo" "bar" ""]  (get-raw p :labels))))))))
+
 (deftest test-protofields
   (let [fields {:floats    {:type :float,   :repeated true},
                 :doubles   {:type :double,  :repeated true},

From 554edcd230a573c87663b3298788ff3c7c2368fd Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 26 Aug 2011 19:00:53 -0700
Subject: [PATCH 141/525] fix pom

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 74dc6f8..0575280 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-alpha2"
+(defproject protobuf "0.5.0-alpha3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From c86857bd5a5f6f7b084b3b2887e732cab7ddb889 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 20 Sep 2011 19:40:30 -0700
Subject: [PATCH 142/525] alpha4

---
 project.clj                |   7 ++-
 src/clj/protobuf/tasks.clj | 110 -------------------------------------
 2 files changed, 4 insertions(+), 113 deletions(-)
 delete mode 100644 src/clj/protobuf/tasks.clj

diff --git a/project.clj b/project.clj
index 0575280..200576b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,9 @@
-(defproject protobuf "0.5.0-alpha3"
+(defproject protobuf "0.5.0-alpha4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
-  :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.3"]]
-  :tasks [protobuf.tasks cake-marginalia.tasks]
+;; :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.3"]]
+  :cake-plugins [[cake-protobuf "0.5.0-alpha4"]]
+;; :tasks [cake-marginalia.tasks]
   :source-path ["src/clj" "src/jvm"]
   :jar-files ["proto"])
diff --git a/src/clj/protobuf/tasks.clj b/src/clj/protobuf/tasks.clj
deleted file mode 100644
index 132b36c..0000000
--- a/src/clj/protobuf/tasks.clj
+++ /dev/null
@@ -1,110 +0,0 @@
-(ns protobuf.tasks
-  (:use cake cake.core uncle.core
-        [cake.file :only [file]]
-        [bake.core :only [log os-name]]
-        [cake.utils :only [prompt-read]]
-        [cake.tasks.compile :only [compile-java]]
-        [clojure.java.shell :only [sh]]
-        [clojure.java.io :only [reader]]
-        [bake.io :only [extract-resource]])
-  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]))
-
-(def version "2.3.0")
-(def srcdir  (format "lib/protobuf-%s" version))
-(def tarfile (format "lib/protobuf-%s.tar.gz" version))
-(def url     (java.net.URL. (format "http://protobuf.googlecode.com/files/protobuf-%s.tar.gz" version)))
-
-(defn installed? []
-  (try (.contains (:out (sh "protoc" "--version")) version)
-       (catch java.io.IOException e)))
-
-(deftask fetch-protoc
-  (when-not (.exists (file srcdir))
-    (ant Get   {:src url :dest tarfile})
-    (ant Untar {:src tarfile :dest "lib" :compression "gzip"})))
-
-(deftask install-protoc
-  "Compile and install protoc to /usr/local."
-  (when-not (installed?)
-    (invoke fetch-protoc)
-    (when-not (.exists (file srcdir "src" "protoc"))
-      (ant Chmod {:file (file srcdir "configure")  :perm "+x"})
-      (ant Chmod {:file (file srcdir "install-sh") :perm "+x"})
-      (ant ExecTask {:dir srcdir :executable "./configure"})
-      (ant ExecTask {:dir srcdir :executable "make"}))
-    (let [password (prompt-read "Password" :echo false)
-          opts     {:dir srcdir :input-string (str password "\n")}]
-      (if (= "linux" (os-name))
-        (ant ExecTask (assoc opts :executable "script")
-             (argline "-q -c 'sudo -S make install' /dev/null"))
-        (ant ExecTask (assoc opts :executable "sudo")
-             (args ["-S" "make" "install"]))))))
-
-(deftask uninstall-protoc
-  "Remove protoc if it is installed."
-  (when (installed?)
-    (let [password (prompt-read "Password" :echo false)]
-      (ant ExecTask {:dir srcdir :executable "sudo" :input-string (str password "\n")}
-        (args ["-S" "make" "uninstall"])))))
-
-(defn- proto-dependencies "look for lines starting with import in proto-file"
-  [proto-file]
-  (for [line (line-seq (reader proto-file)) :when (.startsWith line "import")]
-    (second (re-matches #".*\"(.*)\".*" line))))
-
-(defn extract-dependencies "extract all files proto is dependent on"
-  [proto-file]
-  (loop [files (vec (proto-dependencies proto-file))]
-    (when-not (empty? files)
-      (let [proto (peek files)
-            files (pop files)]
-        (if (or (.exists (file "proto" proto)) (.exists (file "build/proto" proto)))
-          (recur files)
-          (let [proto-file (extract-resource (str "proto/" proto) "build")]
-            (recur (into files (proto-dependencies proto-file)))))))))
-
-(defn modtime [dir]
-  (let [files (rest (file-seq (file dir)))]
-    (if (empty? files)
-      0
-      (apply max (map #(.lastModified %) files)))))
-
-(defn protoc
-  ([protos] (protoc protos "build/protosrc"))
-  ([protos dest]
-     (when (or (:force *opts*)
-               (> (modtime "proto") (modtime dest))
-               (> (modtime "proto") (modtime "classes")))
-       (ant Mkdir {:dir dest})
-       (ant Mkdir {:dir "build/proto"})
-       (doseq [proto protos]
-         (log "Compiling" proto "to" dest)
-         (extract-dependencies (file "proto" proto))
-         (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
-                (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
-              (catch org.apache.tools.ant.BuildException e
-                (throw (Exception. (str "error compiling " proto))))))
-       (compile-java dest))))
-
-(defn build-protobuf []
-  (ant Mkdir {:dir "proto/google/protobuf"})
-  (ant Copy {:file (str srcdir "/src/google/protobuf/descriptor.proto") :todir "proto/google/protobuf"})
-  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java"))
-  (protoc ["clojure/protobuf/extensions.proto" "clojure/protobuf/test.proto"]))
-
-(defn proto-file? [file]
-  (let [name (.getName file)]
-    (and (.endsWith name ".proto")
-         (not (.startsWith name ".")))))
-
-(defn proto-files [dir]
-  (for [file (rest (file-seq dir)) :when (proto-file? file)]
-    (.substring (.getPath file) (inc (count (.getPath dir))))))
-
-(deftask compile-native #{proto})
-(deftask proto #{install-protoc}
-  "Compile protocol buffer files located in proto dir."
-  (if (= "protobuf" (:artifact-id *project*))
-    (do (invoke fetch-protoc)
-        (build-protobuf))
-    (protoc (or (:proto *opts*) (proto-files (file "proto"))))))

From 901f273dc22d8002f4a9fded3ff67756dea11952 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 20 Sep 2011 21:45:58 -0700
Subject: [PATCH 143/525] bump versions

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 200576b..590d054 100644
--- a/project.clj
+++ b/project.clj
@@ -1,9 +1,9 @@
-(defproject protobuf "0.5.0-alpha4"
+(defproject protobuf "0.5.0-alpha5"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
 ;; :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.3"]]
-  :cake-plugins [[cake-protobuf "0.5.0-alpha4"]]
+  :cake-plugins [[cake-protobuf "0.5.0-alpha5"]]
 ;; :tasks [cake-marginalia.tasks]
   :source-path ["src/clj" "src/jvm"]
   :jar-files ["proto"])

From 335a1dee9a372d0867e970b90a17d869683e8384 Mon Sep 17 00:00:00 2001
From: lance bradley <l@ncebradley.org>
Date: Wed, 21 Sep 2011 19:23:39 -0700
Subject: [PATCH 144/525] add load-stream

---
 project.clj          | 2 +-
 src/clj/protobuf.clj | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 590d054..24ab2b8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-alpha5"
+(defproject protobuf "0.5.0-alpha6"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index 3f2d33f..b709ccc 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -80,6 +80,12 @@
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
          (PersistentProtocolBufferMap/parseFrom type in)))))
 
+(defn protobuf-load-stream
+  "Load a protobuf of the given type from an InputStream."
+  [^PersistentProtocolBufferMap$Def type ^InputStream stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom type in))))
 
 (defn protobuf-dump
   "Return the byte representation of the given protobuf."

From d0a5aad2ac27900263da7f1055981c5383c22071 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <github@justinbalthrop.com>
Date: Sun, 25 Sep 2011 07:49:10 -0700
Subject: [PATCH 145/525] Update readme to mention cake-protobuf

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8e262ca..2c26154 100644
--- a/README.md
+++ b/README.md
@@ -94,11 +94,10 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-Add the `clojure-protobuf` to your [Cake](http://github.com/ninjudd/cake) project.clj:
+Add `clojure-protobuf` and the `cake-protobuf` plugin to your [Cake](http://github.com/ninjudd/cake) project.clj:
 
     :dependencies [[clojure-protobuf "LATEST"]]
-    :dev-dependencies [[clojure-protobuf "LATEST"]]
-    :tasks [protobuf.tasks]
-
+    :cake-plugins [[cake-protobuf "LATEST"]]
+    
 You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
 to update this every time I bump the version, so I'm not going to put an actual number here.
\ No newline at end of file

From e0a4ef9e917861db82a9216dec8066cc2357a9d4 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <github@justinbalthrop.com>
Date: Tue, 4 Oct 2011 16:17:15 -0700
Subject: [PATCH 146/525] Edited README.md via GitHub

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2c26154..f1deaa4 100644
--- a/README.md
+++ b/README.md
@@ -94,10 +94,11 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-Add `clojure-protobuf` and the `cake-protobuf` plugin to your [Cake](http://github.com/ninjudd/cake) project.clj:
+As of cake 0.7.0, add `protobuf` and the `cake-protobuf` plugin to your [Cake](http://github.com/ninjudd/cake) project.clj:
 
-    :dependencies [[clojure-protobuf "LATEST"]]
+    :dependencies [[protobuf "LATEST"]]
     :cake-plugins [[cake-protobuf "LATEST"]]
     
 You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
-to update this every time I bump the version, so I'm not going to put an actual number here.
\ No newline at end of file
+to update this every time I bump the version, so I'm not going to put an actual number here. You can
+find the lastest versions here (https://clojars.org/cake-protobuf https://clojars.org/protobuf).
\ No newline at end of file

From c9812a4604d9509ce0d8ec4095690c6992b8b922 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <github@justinbalthrop.com>
Date: Tue, 4 Oct 2011 16:18:20 -0700
Subject: [PATCH 147/525] Edited README.md via GitHub

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f1deaa4..6e0cf95 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Then you can access the maps in clojure:
 
 ## Installation
 
-As of cake 0.7.0, add `protobuf` and the `cake-protobuf` plugin to your [Cake](http://github.com/ninjudd/cake) project.clj:
+As of [Cake](http://github.com/ninjudd/cake) 0.7.0, add `protobuf` and the `cake-protobuf` plugin to your project.clj:
 
     :dependencies [[protobuf "LATEST"]]
     :cake-plugins [[cake-protobuf "LATEST"]]

From 778697e7fb1aaeae53c55aeb7b730832fe6713b8 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <github@justinbalthrop.com>
Date: Fri, 7 Oct 2011 12:59:14 -0700
Subject: [PATCH 148/525] Edited README.md via GitHub

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e0cf95..f19e672 100644
--- a/README.md
+++ b/README.md
@@ -101,4 +101,6 @@ As of [Cake](http://github.com/ninjudd/cake) 0.7.0, add `protobuf` and the `cake
     
 You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
 to update this every time I bump the version, so I'm not going to put an actual number here. You can
-find the lastest versions here (https://clojars.org/cake-protobuf https://clojars.org/protobuf).
\ No newline at end of file
+find the lastest versions here (https://clojars.org/cake-protobuf https://clojars.org/protobuf).
+
+If you have any questions or need help, you can find us on IRC in [#flatland](irc://irc.freenode.net/#flatland).

From e440ff2e6ca718cf2f557baac5f6ed37e9d7c49d Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 10 Oct 2011 16:38:46 -0700
Subject: [PATCH 149/525] remove adjoin

---
 src/clj/protobuf.clj                           |  5 -----
 .../protobuf/PersistentProtocolBufferMap.java  |  9 ---------
 test/protobuf_test.clj                         | 18 ------------------
 3 files changed, 32 deletions(-)

diff --git a/src/clj/protobuf.clj b/src/clj/protobuf.clj
index b709ccc..1607525 100644
--- a/src/clj/protobuf.clj
+++ b/src/clj/protobuf.clj
@@ -116,11 +116,6 @@
   [^PersistentProtocolBufferMap p map]
   (.append p map))
 
-(defn adjoin
-  "Merge the given map into the protobuf. Like append, except default values in map will be used if it i."
-  [^PersistentProtocolBufferMap p map]
-  (.adjoin p map))
-
 (defn get-raw
   "Get value at key ignoring extension fields."
   [^PersistentProtocolBufferMap p key]
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
index a724aad..ba7389a 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
@@ -548,15 +548,6 @@ public PersistentProtocolBufferMap append(IPersistentMap map) {
     return new PersistentProtocolBufferMap(meta(), def, builder().mergeFrom(proto.message()));
   }
 
-  public PersistentProtocolBufferMap adjoin(IPersistentMap map) {
-    if (map instanceof PersistentProtocolBufferMap) {
-      PersistentProtocolBufferMap proto = (PersistentProtocolBufferMap) map;
-      return append(construct(def, proto.seq()));
-    } else {
-      return append(map);
-    }
-  }
-
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) return this;
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 8b4dea4..77a6fb1 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -43,24 +43,6 @@
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
 
-(deftest test-adjoin
-  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
-    (let [p (adjoin p {:label "bar"})]
-      (is (= 5     (:id p)))
-      (is (= "bar" (:label p)))
-      (is (= false (:deleted p)))
-      (is (= ["little" "yellow"] (:tags p))))
-    (let [p (adjoin (assoc p :deleted true) p)]
-      (is (= false (:deleted p))))
-    (let [p (adjoin p {:tags ["different"]})]
-      (is (= ["little" "yellow" "different"] (:tags p))))
-    (let [p (adjoin p {:tags ["different"] :label "very"})]
-      (is (= ["little" "yellow" "different"] (:tags p)))
-      (is (= "very" (:label p))))
-    (let [p (adjoin p {:doubles [3.4] :floats [0.02]})]
-      (is (= [1.2 3.4] (:doubles p)))
-      (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
-
 (deftest test-assoc
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
     (let [p (assoc p :label "baz" :tags ["nuprin"])]

From c6b343315658768e336e058f6a24eed1ec53a9a6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 10 Oct 2011 16:57:09 -0700
Subject: [PATCH 150/525] move to protobuf.core

---
 README.md                                      |  2 +-
 project.clj                                    |  7 ++-----
 .../core}/extensions.proto                     |  2 +-
 .../protobuf => protobuf/core}/test.proto      |  4 ++--
 src/jvm/.gitignore                             |  1 -
 src/{clj/protobuf.clj => protobuf/core.clj}    |  4 ++--
 .../core}/PersistentProtocolBufferMap.java     |  2 +-
 tasks.clj                                      | 14 ++++++++++++++
 test/protobuf_test.clj                         | 18 +++++++++---------
 9 files changed, 32 insertions(+), 22 deletions(-)
 rename proto/{clojure/protobuf => protobuf/core}/extensions.proto (93%)
 rename proto/{clojure/protobuf => protobuf/core}/test.proto (96%)
 delete mode 100644 src/jvm/.gitignore
 rename src/{clj/protobuf.clj => protobuf/core.clj} (97%)
 rename src/{jvm/clojure/protobuf => protobuf/core}/PersistentProtocolBufferMap.java (99%)
 create mode 100644 tasks.clj

diff --git a/README.md b/README.md
index f19e672..070cbfd 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ As of [Cake](http://github.com/ninjudd/cake) 0.7.0, add `protobuf` and the `cake
 
     :dependencies [[protobuf "LATEST"]]
     :cake-plugins [[cake-protobuf "LATEST"]]
-    
+
 You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
 to update this every time I bump the version, so I'm not going to put an actual number here. You can
 find the lastest versions here (https://clojars.org/cake-protobuf https://clojars.org/protobuf).
diff --git a/project.clj b/project.clj
index 24ab2b8..812adbb 100644
--- a/project.clj
+++ b/project.clj
@@ -1,9 +1,6 @@
-(defproject protobuf "0.5.0-alpha6"
+(defproject protobuf "0.5.0-beta1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
-;; :dev-dependencies [[org.clojars.flatland/cake-marginalia "0.6.3"]]
-  :cake-plugins [[cake-protobuf "0.5.0-alpha5"]]
-;; :tasks [cake-marginalia.tasks]
-  :source-path ["src/clj" "src/jvm"]
+  :cake-plugins [[cake-protobuf "0.5.0-beta1"]]
   :jar-files ["proto"])
diff --git a/proto/clojure/protobuf/extensions.proto b/proto/protobuf/core/extensions.proto
similarity index 93%
rename from proto/clojure/protobuf/extensions.proto
rename to proto/protobuf/core/extensions.proto
index f72066e..9d61025 100644
--- a/proto/clojure/protobuf/extensions.proto
+++ b/proto/protobuf/core/extensions.proto
@@ -1,6 +1,6 @@
 import "google/protobuf/descriptor.proto";
 
-option java_package = "clojure.protobuf";
+option java_package = "protobuf.core";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
diff --git a/proto/clojure/protobuf/test.proto b/proto/protobuf/core/test.proto
similarity index 96%
rename from proto/clojure/protobuf/test.proto
rename to proto/protobuf/core/test.proto
index 7149e8d..df6e255 100644
--- a/proto/clojure/protobuf/test.proto
+++ b/proto/protobuf/core/test.proto
@@ -1,6 +1,6 @@
-import "clojure/protobuf/extensions.proto";
+import "protobuf/core/extensions.proto";
 
-option java_package = "clojure.protobuf";
+option java_package = "protobuf.core";
 option java_outer_classname = "Test";
 
 message Foo {
diff --git a/src/jvm/.gitignore b/src/jvm/.gitignore
deleted file mode 100644
index e2cb692..0000000
--- a/src/jvm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Collections.java
\ No newline at end of file
diff --git a/src/clj/protobuf.clj b/src/protobuf/core.clj
similarity index 97%
rename from src/clj/protobuf.clj
rename to src/protobuf/core.clj
index 1607525..2a2ef37 100644
--- a/src/clj/protobuf.clj
+++ b/src/protobuf/core.clj
@@ -1,7 +1,7 @@
-(ns protobuf
+(ns protobuf.core
   (:use [clojure.java.io :only [input-stream output-stream]]
         [clojure.string :only [lower-case]])
-  (:import (clojure.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
+  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)
            (java.io InputStream OutputStream)))
 
diff --git a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
similarity index 99%
rename from src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
rename to src/protobuf/core/PersistentProtocolBufferMap.java
index ba7389a..3cc9a4b 100644
--- a/src/jvm/clojure/protobuf/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -8,7 +8,7 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-package clojure.protobuf;
+package protobuf.core;
 
 import clojure.lang.*;
 import java.util.*;
diff --git a/tasks.clj b/tasks.clj
new file mode 100644
index 0000000..5b37b4e
--- /dev/null
+++ b/tasks.clj
@@ -0,0 +1,14 @@
+(ns tasks
+  (:use [cake.core :only [deftask]]
+        [cake.file :only [file cp mkdir]]
+        [cake.tasks.protobuf :only [protoc srcdir]]))
+
+(defn build-protobuf []
+  (protoc ["protobuf/core/extensions.proto" "clojure/protobuf/test.proto"]))
+
+(deftask protobuf.google
+  (mkdir "proto/google/protobuf")
+  (cp (str srcdir "/src/google/protobuf/descriptor.proto") "proto/google/protobuf")
+  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
+
+(deftask proto #{protobuf.google})
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index 77a6fb1..ffbf02a 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -1,12 +1,12 @@
 (ns protobuf-test
-  (:use protobuf)
+  (:use protobuf.core)
   (:use clojure.test)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
-(defprotobuf Foo clojure.protobuf.Test Foo)
-(defprotobuf Bar clojure.protobuf.Test Bar)
-(defprotobuf Response clojure.protobuf.Test Response)
-(defprotobuf ErrorMsg clojure.protobuf.Test ErrorMsg)
+(defprotobuf Foo protobuf.core.Test Foo)
+(defprotobuf Bar protobuf.core.Test Bar)
+(defprotobuf Response protobuf.core.Test Response)
+(defprotobuf ErrorMsg protobuf.core.Test ErrorMsg)
 
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
@@ -208,7 +208,7 @@
                 :long      {:type :float},
                 :deleted   {:type :boolean}}]
     (is (= fields (protofields Foo)))
-    (is (= fields (protofields clojure.protobuf.Test$Foo)))))
+    (is (= fields (protofields protobuf.core.Test$Foo)))))
 
 (deftest test-nested-protofields
   (is (= {:year   {:type :int},
@@ -237,14 +237,14 @@
   (is (= {}    (protodefault Foo :groups)))
   (is (= {}    (protodefault Foo :item-map)))
   (is (= false (protodefault Foo :deleted)))
-  (is (= {}    (protodefault clojure.protobuf.Test$Foo :groups))))
+  (is (= {}    (protodefault protobuf.core.Test$Foo :groups))))
 
 (deftest test-use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
     (is (= '(:id :responses :tag-set :deleted)   (keys p)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses p)))
 
-    (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores true)
+    (protobuf.core.PersistentProtocolBufferMap/setUseUnderscores true)
     (is (= '(:id :responses :tag_set :deleted)   (keys p)))
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
 
@@ -252,7 +252,7 @@
              :pair_map :groups :doubles :floats :item_map :counts :time :lat :long}
            (set (keys (protofields Foo)))))
 
-    (clojure.protobuf.PersistentProtocolBufferMap/setUseUnderscores false)))
+    (protobuf.core.PersistentProtocolBufferMap/setUseUnderscores false)))
 
 (deftest test-protobuf-nested-message
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]

From 8f51eed3b72f48991024f21588e02886a08a54b2 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 21 Oct 2011 16:12:37 -0700
Subject: [PATCH 151/525] fix reflection warnings

---
 src/protobuf/core.clj                         | 28 +++++++++++--------
 .../core/PersistentProtocolBufferMap.java     | 10 -------
 test/protobuf_test.clj                        | 11 ++++----
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 2a2ef37..6b80841 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -2,8 +2,10 @@
   (:use [clojure.java.io :only [input-stream output-stream]]
         [clojure.string :only [lower-case]])
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
-           (com.google.protobuf Descriptors$Descriptor Descriptors$FieldDescriptor CodedInputStream)
-           (java.io InputStream OutputStream)))
+           (com.google.protobuf GeneratedMessage CodedInputStream
+                                Descriptors$Descriptor Descriptors$FieldDescriptor)
+           (java.io InputStream OutputStream)
+           (clojure.lang Reflector)))
 
 (defn protobuf?
   "Is the given object a PersistentProtocolBufferMap?"
@@ -17,16 +19,20 @@
 
 (defn protodef
   "Create a protodef from a string or protobuf class."
-  ([class]
-     (if (or (protodef? class) (nil? class))
-       class
-       (PersistentProtocolBufferMap$Def/create class)))
-  ([class & fields]
-     (loop [type   (protodef class)
+  ([def]
+     (if (or (protodef? def) (nil? def))
+       def
+       (PersistentProtocolBufferMap$Def/create
+        ^Descriptors.Descriptor
+        (if (instance? Descriptors$Descriptor def)
+          def
+          (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil))))))
+  ([def & fields]
+     (loop [^PersistentProtocolBufferMap$Def def (protodef def)
             fields fields]
        (if (empty? fields)
-         type
-         (recur (-> type
+         def
+         (recur (-> def
                     (.fieldDescriptor (first fields))
                     .getMessageType
                     protodef)
@@ -35,7 +41,7 @@
 (defmacro defprotobuf
   "Helper macro for defining a protodef object."
   [sym & args]
-  (let [class (apply str (interpose "$" (map name args)))]
+  (let [class (symbol (apply str (interpose "$" (map name args))))]
     `(def ~sym (protodef ~class))))
 
 (defn protobuf
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 3cc9a4b..65326e6 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -32,16 +32,6 @@ public static class Def {
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
     static ConcurrentHashMap<Descriptors.Descriptor, Def> type_to_def = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
 
-    public static Def create(String class_name) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, ClassNotFoundException {
-      Class<?> c = Class.forName(class_name);
-      return create(c);
-    }
-
-    public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-      Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
-      return create(type);
-    }
-
     public static Def create(Descriptors.Descriptor type) {
       Def def = type_to_def.get(type);
       if (def == null) {
diff --git a/test/protobuf_test.clj b/test/protobuf_test.clj
index ffbf02a..38de66e 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf_test.clj
@@ -1,12 +1,11 @@
 (ns protobuf-test
-  (:use protobuf.core)
-  (:use clojure.test)
+  (:use protobuf.core clojure.test)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
-(defprotobuf Foo protobuf.core.Test Foo)
-(defprotobuf Bar protobuf.core.Test Bar)
-(defprotobuf Response protobuf.core.Test Response)
-(defprotobuf ErrorMsg protobuf.core.Test ErrorMsg)
+(def Foo      (protodef protobuf.core.Test$Foo))
+(def Bar      (protodef protobuf.core.Test$Bar))
+(def Response (protodef protobuf.core.Test$Response))
+(def ErrorMsg (protodef protobuf.core.Test$ErrorMsg))
 
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))

From 38e2fef4ead0b738cd7bb6763d6b26da8462fccb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 21 Oct 2011 16:17:50 -0700
Subject: [PATCH 152/525] beta2

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 812adbb..38607fe 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-beta1"
+(defproject protobuf "0.5.0-beta2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]

From 45f12c87ecfa29811f0a891721ba41dbbfec3521 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 28 Oct 2011 18:26:36 -0700
Subject: [PATCH 153/525] add gloss support

---
 project.clj                                   |  4 +-
 proto/protobuf/test/codec.proto               | 44 +++++++++++++++++
 .../{core/test.proto => test/core.proto}      |  4 +-
 src/protobuf/codec.clj                        | 24 ++++++++++
 src/protobuf/core.clj                         |  6 ---
 .../core/PersistentProtocolBufferMap.java     |  5 ++
 test/protobuf/codec_test.clj                  | 47 +++++++++++++++++++
 .../core_test.clj}                            | 10 ++--
 8 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 proto/protobuf/test/codec.proto
 rename proto/protobuf/{core/test.proto => test/core.proto} (96%)
 create mode 100644 src/protobuf/codec.clj
 create mode 100644 test/protobuf/codec_test.clj
 rename test/{protobuf_test.clj => protobuf/core_test.clj} (98%)

diff --git a/project.clj b/project.clj
index 38607fe..b749b8a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,8 @@
-(defproject protobuf "0.5.0-beta2"
+(defproject protobuf "0.5.0-beta3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]]
+  :test-dependencies [[gloss "0.2.0-rc1"]
+                      [io "0.1.0-alpha1"]]
   :cake-plugins [[cake-protobuf "0.5.0-beta1"]]
   :jar-files ["proto"])
diff --git a/proto/protobuf/test/codec.proto b/proto/protobuf/test/codec.proto
new file mode 100644
index 0000000..7c4a911
--- /dev/null
+++ b/proto/protobuf/test/codec.proto
@@ -0,0 +1,44 @@
+import "protobuf/core/extensions.proto";
+
+option java_package = "protobuf.test";
+option java_outer_classname = "Codec";
+
+message Foo {
+  optional int32 foo = 1;
+  optional int32 bar = 2;
+  optional int32 baz = 3;
+
+  repeated string tags    = 4;
+  repeated Item   tag_set = 5 [(set) = true];
+  repeated Entry  num_map = 6 [(map) = true];
+
+  optional Foo nested = 7;
+
+  optional int32 rev = 8;
+}
+
+message Item {
+  required string item   = 1;
+  required bool   exists = 2 [default = true];
+}
+
+message Entry {
+  required int32  key = 1;
+  required string val = 2;
+}
+
+message Edge {
+  required string to_id   = 1;
+  optional string a       = 2;
+  optional string b       = 3;
+  optional bool   deleted = 4;
+}
+
+message Node {
+  optional string id    = 1;
+  repeated Edge   edges = 2 [(map_by) = "to_id"];
+  optional int32  rev   = 3;
+  optional int32  foo   = 4;
+  optional string bar   = 5;
+  repeated int32  baz   = 6;
+}
\ No newline at end of file
diff --git a/proto/protobuf/core/test.proto b/proto/protobuf/test/core.proto
similarity index 96%
rename from proto/protobuf/core/test.proto
rename to proto/protobuf/test/core.proto
index df6e255..8b8040a 100644
--- a/proto/protobuf/core/test.proto
+++ b/proto/protobuf/test/core.proto
@@ -1,7 +1,7 @@
 import "protobuf/core/extensions.proto";
 
-option java_package = "protobuf.core";
-option java_outer_classname = "Test";
+option java_package = "protobuf.test";
+option java_outer_classname = "Core";
 
 message Foo {
   optional uint32   id        = 1 [default = 43];
diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
new file mode 100644
index 0000000..dd55025
--- /dev/null
+++ b/src/protobuf/codec.clj
@@ -0,0 +1,24 @@
+(ns protobuf.codec
+  (:use protobuf.core
+        [gloss.core.protocols :only [Reader Writer]]
+        [gloss.core.formats :only [to-buf-seq]]
+        [clojure.java.io :only [input-stream]])
+  (:require io.core))
+
+(defn protobuf-codec [proto & {:keys [validator]}]
+  (let [proto (protodef proto)]
+    (reify
+      Reader
+      (read-bytes [this buf-seq]
+        [true (protobuf-load-stream proto (input-stream buf-seq)) nil])
+
+      Writer
+      (sizeof [this] nil)
+      (write-bytes [this _ val]
+        (when (and validator (not (validator val)))
+          (throw (IllegalStateException. "Invalid value in protobuf-codec")))
+        (to-buf-seq
+         (protobuf-dump
+          (if (protobuf? val)
+            val
+            (protobuf proto val))))))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 6b80841..546c061 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -38,12 +38,6 @@
                     protodef)
                 (rest fields))))))
 
-(defmacro defprotobuf
-  "Helper macro for defining a protodef object."
-  [sym & args]
-  (let [class (symbol (apply str (interpose "$" (map name args))))]
-    `(def ~sym (protodef ~class))))
-
 (defn protobuf
   "Construct a protobuf of the given type."
   ([^PersistentProtocolBufferMap$Def type]
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 65326e6..3fc0ac3 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -32,6 +32,11 @@ public static class Def {
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
     static ConcurrentHashMap<Descriptors.Descriptor, Def> type_to_def = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
 
+    public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+      Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
+      return create(type);
+    }
+
     public static Def create(Descriptors.Descriptor type) {
       Def def = type_to_def.get(type);
       if (def == null) {
diff --git a/test/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
new file mode 100644
index 0000000..c5adfd3
--- /dev/null
+++ b/test/protobuf/codec_test.clj
@@ -0,0 +1,47 @@
+(ns protobuf.codec-test
+  (:use clojure.test gloss.io cereal.core protobuf.codec)
+  (:import (java.nio ByteBuffer)))
+
+(deftest protobuf-codec-test
+  (let [codec (protobuf-codec protobuf.test.Codec$Foo)]
+    (testing "decode an encoded data structure"
+      (let [val {:foo 1 :bar 2}]
+        (is (= val (decode codec (encode codec val))))))
+
+    (testing "append two simple encoded data structures"
+      (let [data1 (encode codec {:foo 1 :bar 2})
+            data2 (encode codec {:foo 4 :baz 8})]
+        (is (= {:foo 4 :bar 2 :baz 8}
+               (decode codec (concat data1 data2))))))
+
+    (testing "concat lists when appending"
+      (let [data1 (encode codec {:tags ["foo" "bar"] :foo 1})
+            data2 (encode codec {:tags ["baz" "foo"] :foo 2})]
+        (is (= {:foo 2 :tags ["foo" "bar" "baz" "foo"]}
+               (decode codec (concat data1 data2))))))
+
+    (testing "merge maps when appending"
+      (let [data1 (encode codec {:num-map {1 "one" 3 "three"}})
+            data2 (encode codec {:num-map {2 "dos" 3 "tres"}})
+            data3 (encode codec {:num-map {3 "san" 6 "roku"}})]
+        (is (= {:num-map {1 "one" 2 "dos" 3 "san" 6 "roku"}}
+               (decode codec (concat data1 data2 data3))))))
+
+    (testing "merge sets when appending"
+      (let [data1 (encode codec {:tag-set #{"foo" "bar"}})
+            data2 (encode codec {:tag-set #{"baz" "foo"}})]
+        (is (= {:tag-set #{"foo" "bar" "baz"}}
+               (decode codec (concat data1 data2))))))
+
+    (testing "support set deletion using existence map"
+      (let [data1 (encode codec {:tag-set #{"foo" "bar" "baz"}})
+            data2 (encode codec {:tag-set {"baz" false "foo" true "zap" true "bam" false}})]
+        (is (= {:tag-set #{"foo" "bar" "zap"}}
+               (decode codec (concat data1 data2))))))
+
+    (testing "merge and append nested data structures when appending"
+      (let [data1 (encode codec {:nested {:foo 1 :tags ["bar"] :nested {:tag-set #{"a" "c"}}}})
+            data2 (encode codec {:nested {:foo 4 :tags ["baz"] :bar 3}})
+            data3 (encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
+        (is (= {:nested {:foo 4 :bar 3 :baz 5 :tags ["bar" "baz" "foo"] :nested {:tag-set #{"a" "b"}}}}
+               (decode codec (concat data1 data2 data3))))))))
diff --git a/test/protobuf_test.clj b/test/protobuf/core_test.clj
similarity index 98%
rename from test/protobuf_test.clj
rename to test/protobuf/core_test.clj
index 38de66e..6b60a83 100644
--- a/test/protobuf_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,11 +1,11 @@
-(ns protobuf-test
+(ns protobuf.core-test
   (:use protobuf.core clojure.test)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
-(def Foo      (protodef protobuf.core.Test$Foo))
-(def Bar      (protodef protobuf.core.Test$Bar))
-(def Response (protodef protobuf.core.Test$Response))
-(def ErrorMsg (protodef protobuf.core.Test$ErrorMsg))
+(def Foo      (protodef protobuf.test.Core$Foo))
+(def Bar      (protodef protobuf.test.Core$Bar))
+(def Response (protodef protobuf.test.Core$Response))
+(def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
 
 (defn catbytes [& args]
   (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))

From c9a8631bfbfe37b63ccb6a9e8a437e8e5acf3a6e Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 31 Oct 2011 14:40:51 -0700
Subject: [PATCH 154/525] add support for repeated protobuf-codec using :_len
 prefix

---
 project.clj                     |  3 +-
 proto/protobuf/test/codec.proto |  3 +-
 src/protobuf/codec.clj          | 49 +++++++++++++++++++++------------
 src/protobuf/core.clj           |  6 ++--
 test/protobuf/codec_test.clj    | 14 +++++++++-
 5 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/project.clj b/project.clj
index b749b8a..2b90d0f 100644
--- a/project.clj
+++ b/project.clj
@@ -1,7 +1,8 @@
 (defproject protobuf "0.5.0-beta3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
-                 [ordered-set "0.2.2"]]
+                 [ordered-set "0.2.2"]
+                 [useful "0.7.4-alpha4"]]
   :test-dependencies [[gloss "0.2.0-rc1"]
                       [io "0.1.0-alpha1"]]
   :cake-plugins [[cake-protobuf "0.5.0-beta1"]]
diff --git a/proto/protobuf/test/codec.proto b/proto/protobuf/test/codec.proto
index 7c4a911..02b1a65 100644
--- a/proto/protobuf/test/codec.proto
+++ b/proto/protobuf/test/codec.proto
@@ -14,7 +14,8 @@ message Foo {
 
   optional Foo nested = 7;
 
-  optional int32 rev = 8;
+  repeated int32 revisions = 8;
+  optional fixed32 _len = 9;
 }
 
 message Item {
diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index dd55025..1b15a24 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -2,23 +2,38 @@
   (:use protobuf.core
         [gloss.core.protocols :only [Reader Writer]]
         [gloss.core.formats :only [to-buf-seq]]
+        [useful.fn :only [fix]]
         [clojure.java.io :only [input-stream]])
-  (:require io.core))
+  (:require io.core
+            [gloss.core :as gloss]))
 
-(defn protobuf-codec [proto & {:keys [validator]}]
-  (let [proto (protodef proto)]
-    (reify
-      Reader
-      (read-bytes [this buf-seq]
-        [true (protobuf-load-stream proto (input-stream buf-seq)) nil])
+(declare protobuf-codec)
+
+(defn length-prefix [proto]
+  (let [proto (protodef proto)
+        min   (alength (protobuf-dump proto {:_len 0}))
+        max   (alength (protobuf-dump proto {:_len Integer/MAX_VALUE}))]
+    (when-not (= min max)
+      (throw (Exception. "_len must be of type fixed32 or fixed64")))
+    (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
+                         #(hash-map :_len %)
+                         :_len)))
 
-      Writer
-      (sizeof [this] nil)
-      (write-bytes [this _ val]
-        (when (and validator (not (validator val)))
-          (throw (IllegalStateException. "Invalid value in protobuf-codec")))
-        (to-buf-seq
-         (protobuf-dump
-          (if (protobuf? val)
-            val
-            (protobuf proto val))))))))
+(defn protobuf-codec [proto & {:keys [validator repeated]}]
+  (let [proto (protodef proto)]
+    (-> (reify
+          Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf-load-stream proto (input-stream buf-seq)) nil])
+          Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException. "Invalid value in protobuf-codec")))
+            (to-buf-seq
+             (protobuf-dump
+              (if (protobuf? val)
+                val
+                (protobuf proto val))))))
+        (fix repeated
+             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %) :prefix :none)))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 546c061..3242fd3 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -89,8 +89,10 @@
 
 (defn protobuf-dump
   "Return the byte representation of the given protobuf."
-  [^PersistentProtocolBufferMap p]
-  (.toByteArray p))
+  ([^PersistentProtocolBufferMap p]
+     (.toByteArray p))
+  ([^PersistentProtocolBufferMap$Def type m]
+     (protobuf-dump (PersistentProtocolBufferMap/construct type m))))
 
 (defn protobuf-seq
   "Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream."
diff --git a/test/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
index c5adfd3..4c062c9 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/protobuf/codec_test.clj
@@ -1,5 +1,5 @@
 (ns protobuf.codec-test
-  (:use clojure.test gloss.io cereal.core protobuf.codec)
+  (:use clojure.test gloss.io protobuf.codec)
   (:import (java.nio ByteBuffer)))
 
 (deftest protobuf-codec-test
@@ -45,3 +45,15 @@
             data3 (encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
         (is (= {:nested {:foo 4 :bar 3 :baz 5 :tags ["bar" "baz" "foo"] :nested {:tag-set #{"a" "b"}}}}
                (decode codec (concat data1 data2 data3))))))))
+
+(deftest repeated-protobufs
+  (let [len   (length-prefix protobuf.test.Codec$Foo)
+        codec (protobuf-codec protobuf.test.Codec$Foo :repeated true)]
+    (testing "length-prefix"
+      (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
+        (is (= i (decode len (encode len i))))))
+    (testing "repeated"
+      (let [data1 (encode codec [{:foo 1 :bar 2}])
+            data2 (encode codec [{:foo 4 :baz 8}])]
+        (is (= [{:foo 1 :bar 2} {:foo 4 :baz 8}]
+               (decode codec (concat data1 data2))))))))
\ No newline at end of file

From 32d8cd832cd3561f6b7aace23240d3f477008c94 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 31 Oct 2011 14:41:48 -0700
Subject: [PATCH 155/525] beta4

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2b90d0f..4f8271b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-beta3"
+(defproject protobuf "0.5.0-beta4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]

From 3e98aa5068919bcaaf8c68b1dcd022ea04b09ac7 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 22 Nov 2011 16:02:23 -0600
Subject: [PATCH 156/525] WIP on getting things on Leiningen. Also got rid of a
 bunch of ant tasks.

---
 project.clj                |  10 ++-
 src/leiningen/protobuf.clj | 153 +++++++++++++++++++++++++++++++++++++
 tasks.clj                  |  14 ----
 3 files changed, 159 insertions(+), 18 deletions(-)
 create mode 100644 src/leiningen/protobuf.clj
 delete mode 100644 tasks.clj

diff --git a/project.clj b/project.clj
index 4f8271b..8adb113 100644
--- a/project.clj
+++ b/project.clj
@@ -2,8 +2,10 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]
-                 [useful "0.7.4-alpha4"]]
-  :test-dependencies [[gloss "0.2.0-rc1"]
-                      [io "0.1.0-alpha1"]]
-  :cake-plugins [[cake-protobuf "0.5.0-beta1"]]
+                 [useful "0.7.4-alpha4"]
+                 [uncle "0.1.0"]
+                 [classlojure "0.6.3"]]
+  :dev-dependencies [[gloss "0.2.0-rc1"]
+                     [io "0.1.0-alpha1"]]
+  :eval-in-leiningen true
   :jar-files ["proto"])
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
new file mode 100644
index 0000000..01b1572
--- /dev/null
+++ b/src/leiningen/protobuf.clj
@@ -0,0 +1,153 @@
+(ns leiningen.protobuf
+  (:use [clojure.java.shell :only [sh]]
+        [clojure.string :only [join]]
+        [leiningen.help :only [help-for]]
+        [leiningen.javac :only [javac]]
+        [leiningen.util.paths :only [get-os]]
+        [leiningen.core :only [prepend-tasks]]
+        uncle.core)
+  (:require [clojure.java.io :as io])
+  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]
+           java.util.zip.ZipFile))
+
+(def version "2.3.0")
+(def srcdir  (format "lib/protobuf-%s" version))
+(def zipfile (format "lib/protobuf-%s.zip" version))
+(def url     (java.net.URL.
+              (format
+               "http://protobuf.googlecode.com/files/protobuf-%s.zip"
+               version)))
+
+(defn- unzip [source target-dir] 
+  (let [zip (ZipFile. source)
+        entries (enumeration-seq (.entries zip))
+        target-file #(io/file target-dir (.getName %))]
+    (doseq [entry entries :when (not (.isDirectory entry))
+            :let [f (target-file entry)]]
+      (.mkdirs (.getParentFile f))
+      (io/copy (.getInputStream zip entry) f))))
+
+(defn- proto-dependencies "look for lines starting with import in proto-file"
+  [proto-file]
+  (for [line (line-seq (io/reader proto-file)) :when (.startsWith line "import")]
+    (second (re-matches #".*\"(.*)\".*" line))))
+
+(defn extract-dependencies "extract all files proto is dependent on"
+  [proto-file]
+  (loop [files (vec (proto-dependencies proto-file))]
+    (when-not (empty? files)
+      (let [proto (peek files)
+            files (pop files)]
+        (if (or (.exists (io/file "proto" proto)) (.exists (io/file "build/proto" proto)))
+          (recur files)
+          (let [location (str "proto/" proto)
+                proto-file (io/file "build" location)]
+            (io/copy (io/reader (io/resource location)) proto-file)
+            (recur (into files (proto-dependencies proto-file)))))))))
+
+(defn modtime [dir]
+  (let [files (rest (file-seq (io/file dir)))]
+    (if (empty? files)
+      0
+      (apply max (map #(.lastModified %) files)))))
+
+(defn proto-file? [file]
+  (let [name (.getName file)]
+    (and (.endsWith name ".proto")
+         (not (.startsWith name ".")))))
+
+(defn proto-files [dir]
+  (for [file (rest (file-seq dir)) :when (proto-file? file)]
+    (.substring (.getPath file) (inc (count (.getPath dir))))))
+
+(defn installed? []
+  (try (.contains (:out (sh "protoc" "--version")) version)
+       (catch java.io.IOException e)))
+
+(defn read-pass []
+  (print "Password: ")
+  (flush)
+  (join (.readPassword (System/console))))
+
+(defn fetch [project]
+  (when-not (.exists (io/file srcdir))
+    (with-open [stream (.openStream url)]
+      (io/copy stream (io/file zipfile)))
+    (unzip (io/file zipfile) "lib")))
+
+(defn uninstall
+  "Remove protoc if it is installed."
+  [project]
+  (when (installed?)
+    (let [password (read-pass)]
+      (sh "sudo" "-S" "make" "uninstall"
+          :dir srcdir :in (str password "\n")))))
+
+(defn install
+  "Compile and install protoc to /usr/local."
+  [project]
+  (when-not (installed?)
+    (fetch nil)
+    (when-not (.exists (io/file srcdir "src" "protoc"))
+      (.setExecutable (io/file srcdir "configure") true)
+      (.setExecutable (io/file srcdir "install-sh") true)
+      (println "Configuring protoc...")
+      (sh "./configure" :dir srcdir)
+      (println "Running 'make'...")
+      (sh "make" :dir srcdir))
+    (let [password (str (read-pass) "\n")
+          opts     {:dir srcdir :input-string (str password "\n")}]
+      (println "Installing...")
+      (if (= :linux (get-os))
+        (sh "script" "-q" "-c" "sudo -S make install" "/dev/null"
+            :dir srcdir :in password)
+        (sh "sudo" "-S" "make" "install"
+            :dir srcdir :in password)))))
+
+(defn protoc
+  ([project protos] (protoc project "build/protosrc" protos))
+  ([project dest protos]
+     (when (or (> (modtime "proto") (modtime dest))
+               (> (modtime "proto") (modtime "classes")))
+       (.mkdirs (io/file dest))
+       (.mkdir (io/file "build" "proto"))
+       (doseq [proto protos]
+         (println "Compiling" proto "to" dest)
+         (extract-dependencies (io/file "proto" proto))
+         (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
+                (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
+              (catch org.apache.tools.ant.BuildException e
+                (throw (Exception. (str "error compiling " proto))))))
+       (javac project dest))))
+
+(defn compile
+  "Compile protocol buffer files located in proto dir."
+  ([project] (compile project (proto-files (io/file "proto"))))
+  ([project files]
+     (install)
+     (protoc project files)))
+
+(defn google
+  [project]
+  (let [proto-files (io/file "proto/google/protobuf")]
+    (.mkdirs proto-files)
+    (io/copy
+     (io/reader
+      (str srcdir "/src/google/protobuf/descriptor.proto"))
+     proto-files))
+  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
+
+(prepend-tasks #'javac compile)
+
+(defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
+        :help-arglists '([subtask & args])
+        :subtasks [#'fetch #'install #'uninstall #'compile]}
+  protobuf
+  ([project] (println (help-for "protobuf")))
+  ([project subtask & args]
+     (case subtask
+       "proto"     (apply google project args)
+       "fetch"     (apply fetch project args)
+       "install"   (apply install project args)
+       "uninstall" (apply uninstall project args)
+       "compile"   (apply compile project args))))
\ No newline at end of file
diff --git a/tasks.clj b/tasks.clj
deleted file mode 100644
index 5b37b4e..0000000
--- a/tasks.clj
+++ /dev/null
@@ -1,14 +0,0 @@
-(ns tasks
-  (:use [cake.core :only [deftask]]
-        [cake.file :only [file cp mkdir]]
-        [cake.tasks.protobuf :only [protoc srcdir]]))
-
-(defn build-protobuf []
-  (protoc ["protobuf/core/extensions.proto" "clojure/protobuf/test.proto"]))
-
-(deftask protobuf.google
-  (mkdir "proto/google/protobuf")
-  (cp (str srcdir "/src/google/protobuf/descriptor.proto") "proto/google/protobuf")
-  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
-
-(deftask proto #{protobuf.google})

From 7b052df698e0a9819f9bf9cf362ba0e126cc5a75 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 22 Nov 2011 17:09:06 -0600
Subject: [PATCH 157/525] Newlines are cool.

---
 src/leiningen/protobuf.clj | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 01b1572..154de86 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -38,7 +38,8 @@
     (when-not (empty? files)
       (let [proto (peek files)
             files (pop files)]
-        (if (or (.exists (io/file "proto" proto)) (.exists (io/file "build/proto" proto)))
+        (if (or (.exists (io/file "proto" proto))
+                (.exists (io/file "build/proto" proto)))
           (recur files)
           (let [location (str "proto/" proto)
                 proto-file (io/file "build" location)]
@@ -69,7 +70,7 @@
   (flush)
   (join (.readPassword (System/console))))
 
-(defn fetch [project]
+(defn fetch []
   (when-not (.exists (io/file srcdir))
     (with-open [stream (.openStream url)]
       (io/copy stream (io/file zipfile)))
@@ -77,7 +78,7 @@
 
 (defn uninstall
   "Remove protoc if it is installed."
-  [project]
+  []
   (when (installed?)
     (let [password (read-pass)]
       (sh "sudo" "-S" "make" "uninstall"
@@ -85,9 +86,9 @@
 
 (defn install
   "Compile and install protoc to /usr/local."
-  [project]
+  []
   (when-not (installed?)
-    (fetch nil)
+    (fetch)
     (when-not (.exists (io/file srcdir "src" "protoc"))
       (.setExecutable (io/file srcdir "configure") true)
       (.setExecutable (io/file srcdir "install-sh") true)
@@ -128,7 +129,7 @@
      (protoc project files)))
 
 (defn google
-  [project]
+  []
   (let [proto-files (io/file "proto/google/protobuf")]
     (.mkdirs proto-files)
     (io/copy
@@ -146,8 +147,8 @@
   ([project] (println (help-for "protobuf")))
   ([project subtask & args]
      (case subtask
-       "proto"     (apply google project args)
-       "fetch"     (apply fetch project args)
-       "install"   (apply install project args)
-       "uninstall" (apply uninstall project args)
-       "compile"   (apply compile project args))))
\ No newline at end of file
+       "proto"     (apply google args)
+       "fetch"     (apply fetch args)
+       "install"   (apply install args)
+       "uninstall" (apply uninstall args)
+       "compile"   (apply compile args))))
\ No newline at end of file

From 895d3df25b63b7f6ebf38ed0ea0bf17e88770a4d Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 22 Nov 2011 17:19:39 -0600
Subject: [PATCH 158/525] eval-in-project.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 8adb113..f148802 100644
--- a/project.clj
+++ b/project.clj
@@ -7,5 +7,5 @@
                  [classlojure "0.6.3"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha1"]]
-  :eval-in-leiningen true
+  :eval-in-project true
   :jar-files ["proto"])

From e18fa4f25565474fb77388ec612fad8cc456d3a5 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 23 Nov 2011 15:42:38 -0600
Subject: [PATCH 159/525] Almost done, slightly broken.

---
 project.clj                |  2 +-
 src/leiningen/protobuf.clj | 38 +++++++++++++++-----------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/project.clj b/project.clj
index f148802..5ab8627 100644
--- a/project.clj
+++ b/project.clj
@@ -3,9 +3,9 @@
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]
                  [useful "0.7.4-alpha4"]
-                 [uncle "0.1.0"]
                  [classlojure "0.6.3"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha1"]]
   :eval-in-project true
+  :java-source-path "build/protosrc"
   :jar-files ["proto"])
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 154de86..b18d74b 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -4,11 +4,9 @@
         [leiningen.help :only [help-for]]
         [leiningen.javac :only [javac]]
         [leiningen.util.paths :only [get-os]]
-        [leiningen.core :only [prepend-tasks]]
-        uncle.core)
+        [leiningen.core :only [prepend-tasks]])
   (:require [clojure.java.io :as io])
-  (:import [org.apache.tools.ant.taskdefs Chmod Copy ExecTask Get Javac Mkdir Untar]
-           java.util.zip.ZipFile))
+  (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
 (def srcdir  (format "lib/protobuf-%s" version))
@@ -106,8 +104,8 @@
             :dir srcdir :in password)))))
 
 (defn protoc
-  ([project protos] (protoc project "build/protosrc" protos))
-  ([project dest protos]
+  ([project protos] (protoc project protos "build/protosrc"))
+  ([project protos dest]
      (when (or (> (modtime "proto") (modtime dest))
                (> (modtime "proto") (modtime "classes")))
        (.mkdirs (io/file dest))
@@ -115,30 +113,24 @@
        (doseq [proto protos]
          (println "Compiling" proto "to" dest)
          (extract-dependencies (io/file "proto" proto))
-         (try (ant ExecTask {:executable "protoc" :dir "proto" :failonerror true}
-                (args [proto (str "--java_out=../" dest) "-I." "-I../build/proto"]))
-              (catch org.apache.tools.ant.BuildException e
-                (throw (Exception. (str "error compiling " proto))))))
-       (javac project dest))))
+         (sh "protoc" proto (str "--java_out=../" dest) "-I." "-I../build/proto"
+             :dir "proto"))
+       (javac (assoc project :java-source-path dest)))))
 
-(defn compile
+(defn compile-protos
   "Compile protocol buffer files located in proto dir."
-  ([project] (compile project (proto-files (io/file "proto"))))
+  ([project] (compile-protos project (proto-files (io/file "proto"))))
   ([project files]
      (install)
      (protoc project files)))
 
 (defn google
-  []
+  [project]
   (let [proto-files (io/file "proto/google/protobuf")]
     (.mkdirs proto-files)
-    (io/copy
-     (io/reader
-      (str srcdir "/src/google/protobuf/descriptor.proto"))
-     proto-files))
-  (protoc ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
-
-(prepend-tasks #'javac compile)
+    (io/copy (io/file (str srcdir "/src/google/protobuf/descriptor.proto"))
+             (io/file proto-files "descriptor.proto")))
+  (protoc project ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
 
 (defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
         :help-arglists '([subtask & args])
@@ -147,8 +139,8 @@
   ([project] (println (help-for "protobuf")))
   ([project subtask & args]
      (case subtask
-       "proto"     (apply google args)
+       "google"    (apply google project args)
        "fetch"     (apply fetch args)
        "install"   (apply install args)
        "uninstall" (apply uninstall args)
-       "compile"   (apply compile args))))
\ No newline at end of file
+       "compile"   (apply compile-protos project args))))
\ No newline at end of file

From cbb9720e8110f39d3303d689fc23662500b868f1 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 23 Nov 2011 15:21:18 -0800
Subject: [PATCH 160/525] compile works now

---
 src/leiningen/protobuf.clj | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index b18d74b..a831b2d 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -1,4 +1,5 @@
 (ns leiningen.protobuf
+  (:refer-clojure :exclude [compile])
   (:use [clojure.java.shell :only [sh]]
         [clojure.string :only [join]]
         [leiningen.help :only [help-for]]
@@ -16,7 +17,7 @@
                "http://protobuf.googlecode.com/files/protobuf-%s.zip"
                version)))
 
-(defn- unzip [source target-dir] 
+(defn- unzip [source target-dir]
   (let [zip (ZipFile. source)
         entries (enumeration-seq (.entries zip))
         target-file #(io/file target-dir (.getName %))]
@@ -68,7 +69,9 @@
   (flush)
   (join (.readPassword (System/console))))
 
-(defn fetch []
+(defn fetch
+  "Fetch protocol-buffer source and unzip it."
+  []
   (when-not (.exists (io/file srcdir))
     (with-open [stream (.openStream url)]
       (io/copy stream (io/file zipfile)))
@@ -104,6 +107,7 @@
             :dir srcdir :in password)))))
 
 (defn protoc
+  "Create .java and .class files from the provided .proto files."
   ([project protos] (protoc project protos "build/protosrc"))
   ([project protos dest]
      (when (or (> (modtime "proto") (modtime dest))
@@ -117,20 +121,26 @@
              :dir "proto"))
        (javac (assoc project :java-source-path dest)))))
 
-(defn compile-protos
-  "Compile protocol buffer files located in proto dir."
-  ([project] (compile-protos project (proto-files (io/file "proto"))))
-  ([project files]
-     (install)
-     (protoc project files)))
-
-(defn google
+(defn compile-google-protobuf
+  "Compile com.google.protobuf.*"
   [project]
   (let [proto-files (io/file "proto/google/protobuf")]
     (.mkdirs proto-files)
     (io/copy (io/file (str srcdir "/src/google/protobuf/descriptor.proto"))
              (io/file proto-files "descriptor.proto")))
-  (protoc project ["google/protobuf/descriptor.proto"] (str srcdir "/java/src/main/java")))
+  (protoc project
+          ["google/protobuf/descriptor.proto"]
+          (str srcdir "/java/src/main/java")))
+
+(defn compile
+  "Compile protocol buffer files located in proto dir."
+  ([project] (compile project (proto-files (io/file "proto"))))
+  ([project files]
+     (install)
+     (fetch)
+     (when (= "protobuf" (:name project))
+       (compile-google-protobuf project))
+     (protoc project files)))
 
 (defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
         :help-arglists '([subtask & args])
@@ -139,8 +149,6 @@
   ([project] (println (help-for "protobuf")))
   ([project subtask & args]
      (case subtask
-       "google"    (apply google project args)
-       "fetch"     (apply fetch args)
        "install"   (apply install args)
        "uninstall" (apply uninstall args)
-       "compile"   (apply compile-protos project args))))
\ No newline at end of file
+       "compile"   (apply compile project args))))
\ No newline at end of file

From ed0fe41e1d9ef7ebdb6838d7a75f433d32e0cd2e Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 28 Nov 2011 17:25:11 -0600
Subject: [PATCH 161/525] Use target-dir for everything.

---
 src/leiningen/protobuf.clj | 128 ++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index a831b2d..9c0266b 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -10,12 +10,12 @@
   (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
-(def srcdir  (format "lib/protobuf-%s" version))
-(def zipfile (format "lib/protobuf-%s.zip" version))
-(def url     (java.net.URL.
-              (format
-               "http://protobuf.googlecode.com/files/protobuf-%s.zip"
-               version)))
+(def srcdir  (str "protobuf-" version))
+(def zipfile (format "protobuf-%s.zip" version))
+
+(def url
+  (java.net.URL.
+   (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
 
 (defn- unzip [source target-dir]
   (let [zip (ZipFile. source)
@@ -26,27 +26,29 @@
       (.mkdirs (.getParentFile f))
       (io/copy (.getInputStream zip entry) f))))
 
-(defn- proto-dependencies "look for lines starting with import in proto-file"
+(defn- proto-dependencies
+  "look for lines starting with import in proto-file"
   [proto-file]
   (for [line (line-seq (io/reader proto-file)) :when (.startsWith line "import")]
     (second (re-matches #".*\"(.*)\".*" line))))
 
-(defn extract-dependencies "extract all files proto is dependent on"
-  [proto-file]
+(defn extract-dependencies
+  "extract all files proto is dependent on"
+  [proto-file target]
   (loop [files (vec (proto-dependencies proto-file))]
     (when-not (empty? files)
       (let [proto (peek files)
             files (pop files)]
         (if (or (.exists (io/file "proto" proto))
-                (.exists (io/file "build/proto" proto)))
+                (.exists (io/file target "proto" proto)))
           (recur files)
           (let [location (str "proto/" proto)
-                proto-file (io/file "build" location)]
+                proto-file (io/file target location)]
             (io/copy (io/reader (io/resource location)) proto-file)
             (recur (into files (proto-dependencies proto-file)))))))))
 
 (defn modtime [dir]
-  (let [files (rest (file-seq (io/file dir)))]
+  (let [files (-> dir io/file file-seq rest)]
     (if (empty? files)
       0
       (apply max (map #(.lastModified %) files)))))
@@ -71,73 +73,85 @@
 
 (defn fetch
   "Fetch protocol-buffer source and unzip it."
-  []
-  (when-not (.exists (io/file srcdir))
-    (with-open [stream (.openStream url)]
-      (io/copy stream (io/file zipfile)))
-    (unzip (io/file zipfile) "lib")))
+  [project]
+  (let [target (:target-dir project)]
+    (when-not (.exists (io/file target srcdir)) 
+      (let [zipped (io/file target zipfile)]
+        (with-open [stream (.openStream url)]
+          (io/copy stream (io/file zipped)))
+        (unzip (io/file zipped) (:target-dir project))))))
 
 (defn uninstall
   "Remove protoc if it is installed."
-  []
+  [project]
   (when (installed?)
     (let [password (read-pass)]
       (sh "sudo" "-S" "make" "uninstall"
-          :dir srcdir :in (str password "\n")))))
+          :dir (io/file (:target-dir project) srcdir)
+          :in (str password "\n")))))
 
 (defn install
   "Compile and install protoc to /usr/local."
-  []
+  [project]
   (when-not (installed?)
-    (fetch)
-    (when-not (.exists (io/file srcdir "src" "protoc"))
-      (.setExecutable (io/file srcdir "configure") true)
-      (.setExecutable (io/file srcdir "install-sh") true)
-      (println "Configuring protoc...")
-      (sh "./configure" :dir srcdir)
-      (println "Running 'make'...")
-      (sh "make" :dir srcdir))
-    (let [password (str (read-pass) "\n")
-          opts     {:dir srcdir :input-string (str password "\n")}]
-      (println "Installing...")
-      (if (= :linux (get-os))
-        (sh "script" "-q" "-c" "sudo -S make install" "/dev/null"
-            :dir srcdir :in password)
-        (sh "sudo" "-S" "make" "install"
-            :dir srcdir :in password)))))
+    (fetch project)
+    (let [source (io/file (:target-dir project) srcdir)]
+      (when-not (.exists (io/file source "src" "protoc"))
+        (.setExecutable (io/file source "configure") true)
+        (.setExecutable (io/file source "install-sh") true)
+        (println "Configuring protoc...")
+        (sh "./configure" :dir source)
+        (println "Running 'make'...")
+        (sh "make" :dir source))
+      (let [password (str (read-pass) "\n")
+            opts     {:dir source :input-string (str password "\n")}]
+        (println "Installing...")
+        (if (= :linux (get-os))
+          (sh "script" "-q" "-c" "sudo -S make install" "/dev/null"
+              :dir source :in password)
+          (sh "sudo" "-S" "make" "install"
+              :dir source :in password))))))
 
 (defn protoc
   "Create .java and .class files from the provided .proto files."
-  ([project protos] (protoc project protos "build/protosrc"))
+  ([project protos]
+     (protoc project protos (io/file (:target-dir project) "protosrc")))
   ([project protos dest]
-     (when (or (> (modtime "proto") (modtime dest))
-               (> (modtime "proto") (modtime "classes")))
-       (.mkdirs (io/file dest))
-       (.mkdir (io/file "build" "proto"))
-       (doseq [proto protos]
-         (println "Compiling" proto "to" dest)
-         (extract-dependencies (io/file "proto" proto))
-         (sh "protoc" proto (str "--java_out=../" dest) "-I." "-I../build/proto"
-             :dir "proto"))
-       (javac (assoc project :java-source-path dest)))))
+     (let [target (:target-dir project)
+           dest-path (.getPath dest)]
+       (when (or (> (modtime "proto") (modtime dest))
+                 (> (modtime "proto") (modtime "classes")))
+         (.mkdirs dest)
+         (.mkdir (io/file target "proto"))
+         (doseq [proto protos]
+           (println "Compiling" proto "to" dest-path)
+           (extract-dependencies (io/file "proto" proto) target)
+           (sh "protoc"
+               proto
+               (str "--java_out=../" dest-path)
+               "-I."
+               (str "-I../" target "/proto")
+               :dir "proto"))
+         (javac (assoc project :java-source-path dest-path))))))
 
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"
   [project]
-  (let [proto-files (io/file "proto/google/protobuf")]
+  (let [proto-files (io/file "proto/google/protobuf")
+        target (:target-dir project)]
     (.mkdirs proto-files)
-    (io/copy (io/file (str srcdir "/src/google/protobuf/descriptor.proto"))
-             (io/file proto-files "descriptor.proto")))
-  (protoc project
-          ["google/protobuf/descriptor.proto"]
-          (str srcdir "/java/src/main/java")))
+    (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
+             (io/file proto-files "descriptor.proto"))
+    (protoc project
+            ["google/protobuf/descriptor.proto"]
+            (io/file target srcdir "java/src/main/java"))))
 
 (defn compile
   "Compile protocol buffer files located in proto dir."
   ([project] (compile project (proto-files (io/file "proto"))))
   ([project files]
-     (install)
-     (fetch)
+     (install project)
+     (fetch project)
      (when (= "protobuf" (:name project))
        (compile-google-protobuf project))
      (protoc project files)))
@@ -149,6 +163,6 @@
   ([project] (println (help-for "protobuf")))
   ([project subtask & args]
      (case subtask
-       "install"   (apply install args)
-       "uninstall" (apply uninstall args)
+       "install"   (apply install project args)
+       "uninstall" (apply uninstall project args)
        "compile"   (apply compile project args))))
\ No newline at end of file

From 69a018e83c8ad8bf932f90e7f3670be29aad0a88 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 28 Nov 2011 17:25:22 -0600
Subject: [PATCH 162/525] Add protobuf-* and .lein* to gitignore.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a2e3401..2777733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.lein*
 .cake
 *~
 lib
@@ -8,3 +9,4 @@ pom.xml
 *.class
 proto/google/protobuf/descriptor.proto
 docs
+protobuf-*
\ No newline at end of file

From 00e8b36b5e95e7b8ed6d3b6d840f8b872a15119a Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 28 Nov 2011 17:52:13 -0600
Subject: [PATCH 163/525] More logging, less ellipsis.

---
 src/leiningen/protobuf.clj | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 9c0266b..75ddf84 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -77,9 +77,11 @@
   (let [target (:target-dir project)]
     (when-not (.exists (io/file target srcdir)) 
       (let [zipped (io/file target zipfile)]
+        (println "Downloading" zipfile)
         (with-open [stream (.openStream url)]
           (io/copy stream (io/file zipped)))
-        (unzip (io/file zipped) (:target-dir project))))))
+        (println "Unzipping" zipfile "to" target)
+        (unzip (io/file zipped) target)))))
 
 (defn uninstall
   "Remove protoc if it is installed."
@@ -99,13 +101,13 @@
       (when-not (.exists (io/file source "src" "protoc"))
         (.setExecutable (io/file source "configure") true)
         (.setExecutable (io/file source "install-sh") true)
-        (println "Configuring protoc...")
+        (println "Configuring protoc")
         (sh "./configure" :dir source)
-        (println "Running 'make'...")
+        (println "Running 'make'")
         (sh "make" :dir source))
+      (println "Installing")
       (let [password (str (read-pass) "\n")
             opts     {:dir source :input-string (str password "\n")}]
-        (println "Installing...")
         (if (= :linux (get-os))
           (sh "script" "-q" "-c" "sudo -S make install" "/dev/null"
               :dir source :in password)

From aade3e87dc5bdb43202788652ab95764b00a0f62 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 16:23:11 -0600
Subject: [PATCH 164/525] io version inc.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 5ab8627..2bf7c2d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,11 +1,11 @@
-(defproject protobuf "0.5.0-beta4"
+(defproject protobuf "0.5.0-beta5"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]
                  [useful "0.7.4-alpha4"]
                  [classlojure "0.6.3"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
-                     [io "0.1.0-alpha1"]]
+                     [io "0.1.0-alpha2"]]
   :eval-in-project true
   :java-source-path "build/protosrc"
   :jar-files ["proto"])

From 5e6d4fd90dfcbd17bb3a6b16bb7ae8e3ee4f6d94 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 16:27:29 -0600
Subject: [PATCH 165/525] Don't fetch and install. Install does that.

---
 src/leiningen/protobuf.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 75ddf84..31f5dc8 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -153,7 +153,6 @@
   ([project] (compile project (proto-files (io/file "proto"))))
   ([project files]
      (install project)
-     (fetch project)
      (when (= "protobuf" (:name project))
        (compile-google-protobuf project))
      (protoc project files)))

From 43330349a271abf7b3102d4fb86a015268a6d5f5 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 16:29:59 -0600
Subject: [PATCH 166/525] Fetch from compile if necessary and in the protobuf
 project (because we need to compile google protobufs).

---
 src/leiningen/protobuf.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 31f5dc8..275c01d 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -154,6 +154,7 @@
   ([project files]
      (install project)
      (when (= "protobuf" (:name project))
+       (fetch project)
        (compile-google-protobuf project))
      (protoc project files)))
 

From f26bf65dd62b00c910ea2140ca0e38eec5d9fd42 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 17:41:41 -0600
Subject: [PATCH 167/525] Fix some messed up paths.

---
 src/leiningen/protobuf.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 275c01d..cf33424 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -130,9 +130,9 @@
            (extract-dependencies (io/file "proto" proto) target)
            (sh "protoc"
                proto
-               (str "--java_out=../" dest-path)
+               (str "--java_out=" dest-path)
                "-I."
-               (str "-I../" target "/proto")
+               (str "-I" target "/proto")
                :dir "proto"))
          (javac (assoc project :java-source-path dest-path))))))
 

From 5bba1890c8f88ac5be087db74a32cb8d3b3bf56f Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 17:43:13 -0600
Subject: [PATCH 168/525] Remove :java-source-path since it isn't used.

---
 project.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2bf7c2d..207e75e 100644
--- a/project.clj
+++ b/project.clj
@@ -7,5 +7,4 @@
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
   :eval-in-project true
-  :java-source-path "build/protosrc"
   :jar-files ["proto"])

From 6bc739855f0568234ce7fbed07525f527277b71e Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 19:59:12 -0600
Subject: [PATCH 169/525] Make sure parent directories exist.

---
 src/leiningen/protobuf.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index cf33424..bfac2ba 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -44,6 +44,7 @@
           (recur files)
           (let [location (str "proto/" proto)
                 proto-file (io/file target location)]
+            (.mkdirs (.getParentFile proto-file))
             (io/copy (io/reader (io/resource location)) proto-file)
             (recur (into files (proto-dependencies proto-file)))))))))
 

From ad313eec2ddc6cf121397cc3ea19b260145d7059 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 19:59:19 -0600
Subject: [PATCH 170/525] Symlink protos so it ends up in the jar.

---
 resources/proto | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 resources/proto

diff --git a/resources/proto b/resources/proto
new file mode 120000
index 0000000..4d1e2d8
--- /dev/null
+++ b/resources/proto
@@ -0,0 +1 @@
+../proto/
\ No newline at end of file

From e14db1c818a71e6437bf5802d4ba9e8b42357095 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 20:09:54 -0600
Subject: [PATCH 171/525] Restructured things so that src/clj holds Clojure
 source and src/java holds Java source. Toto, we're not in Kan(Cake)sas
 anymore.

---
 project.clj                                                   | 2 ++
 src/{ => clj}/leiningen/protobuf.clj                          | 0
 src/{ => clj}/protobuf/codec.clj                              | 0
 src/{ => clj}/protobuf/core.clj                               | 0
 src/{ => java}/protobuf/core/PersistentProtocolBufferMap.java | 0
 5 files changed, 2 insertions(+)
 rename src/{ => clj}/leiningen/protobuf.clj (100%)
 rename src/{ => clj}/protobuf/codec.clj (100%)
 rename src/{ => clj}/protobuf/core.clj (100%)
 rename src/{ => java}/protobuf/core/PersistentProtocolBufferMap.java (100%)

diff --git a/project.clj b/project.clj
index 207e75e..ada417b 100644
--- a/project.clj
+++ b/project.clj
@@ -7,4 +7,6 @@
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
   :eval-in-project true
+  :source-path "src/clj"
+  :java-source-path "src/java"
   :jar-files ["proto"])
diff --git a/src/leiningen/protobuf.clj b/src/clj/leiningen/protobuf.clj
similarity index 100%
rename from src/leiningen/protobuf.clj
rename to src/clj/leiningen/protobuf.clj
diff --git a/src/protobuf/codec.clj b/src/clj/protobuf/codec.clj
similarity index 100%
rename from src/protobuf/codec.clj
rename to src/clj/protobuf/codec.clj
diff --git a/src/protobuf/core.clj b/src/clj/protobuf/core.clj
similarity index 100%
rename from src/protobuf/core.clj
rename to src/clj/protobuf/core.clj
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/java/protobuf/core/PersistentProtocolBufferMap.java
similarity index 100%
rename from src/protobuf/core/PersistentProtocolBufferMap.java
rename to src/java/protobuf/core/PersistentProtocolBufferMap.java

From b37cf9b85def590ff817a14b1b1ffc34366a769a Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 9 Dec 2011 20:10:16 -0600
Subject: [PATCH 172/525] :jar-files doesn't work in Leiningen and we don't
 need it anymore.

---
 project.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index ada417b..846e730 100644
--- a/project.clj
+++ b/project.clj
@@ -8,5 +8,4 @@
                      [io "0.1.0-alpha2"]]
   :eval-in-project true
   :source-path "src/clj"
-  :java-source-path "src/java"
-  :jar-files ["proto"])
+  :java-source-path "src/java")

From 986669e0ac5b4223b4232e37c84640d0d87536a5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 12 Dec 2011 12:45:01 -0800
Subject: [PATCH 173/525] 0.6.0-beta1

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 846e730..51d8297 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.5.0-beta5"
+(defproject protobuf "0.6.0-beta1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]

From 609894d7a5b759f3dd28e2dce24a2016806f4415 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 12 Dec 2011 13:49:33 -0800
Subject: [PATCH 174/525] fix tests

---
 test/protobuf/core_test.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 6b60a83..9c05399 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -207,7 +207,7 @@
                 :long      {:type :float},
                 :deleted   {:type :boolean}}]
     (is (= fields (protofields Foo)))
-    (is (= fields (protofields protobuf.core.Test$Foo)))))
+    (is (= fields (protofields protobuf.test.Core$Foo)))))
 
 (deftest test-nested-protofields
   (is (= {:year   {:type :int},
@@ -236,7 +236,7 @@
   (is (= {}    (protodefault Foo :groups)))
   (is (= {}    (protodefault Foo :item-map)))
   (is (= false (protodefault Foo :deleted)))
-  (is (= {}    (protodefault protobuf.core.Test$Foo :groups))))
+  (is (= {}    (protodefault protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]

From af8a05ae111a785330fc1ad62a1d8a82b38e8139 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 13 Jan 2012 17:40:12 -0800
Subject: [PATCH 175/525] add better exceptions for encoding errors

---
 .../core/PersistentProtocolBufferMap.java     | 38 +++++++++++++++----
 test/protobuf/core_test.clj                   |  6 +++
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/java/protobuf/core/PersistentProtocolBufferMap.java b/src/java/protobuf/core/PersistentProtocolBufferMap.java
index 3fc0ac3..f629b60 100644
--- a/src/java/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/java/protobuf/core/PersistentProtocolBufferMap.java
@@ -370,7 +370,7 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       name = name.toUpperCase().replaceAll("-","_");
       Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
       Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
-			if (enum_value == null) {
+      if (enum_value == null) {
         PrintWriter err = (PrintWriter) RT.ERR.deref();
         err.format("invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
       }
@@ -400,6 +400,28 @@ static protected GeneratedMessage.GeneratedExtension nullExtension(Descriptors.F
     return null;
   }
 
+  protected void addRepeatedField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {
+    try {
+      builder.addRepeatedField(field, value);
+    } catch (IllegalArgumentException e) {
+      String msg = String.format("error adding %s to %s field %s",
+                                 value, field.getJavaType().toString().toLowerCase(),
+                                 field.getFullName());
+      throw new IllegalArgumentException(msg, e);
+    }
+  }
+
+  protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {
+    try {
+      builder.setField(field, value);
+    } catch (IllegalArgumentException e) {
+      String msg = String.format("error setting %s field %s to %s",
+                                 field.getJavaType().toString().toLowerCase(),
+                                 field.getFullName(), value);
+      throw new IllegalArgumentException(msg, e);
+    }
+  }
+
   protected void addField(DynamicMessage.Builder builder, Object key, Object value) {
     if (key == null) return;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
@@ -412,7 +434,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
       if (value instanceof Sequential && !set) {
         for (ISeq s = RT.seq(value); s != null; s = s.next()) {
           Object v = toProtoValue(field, s.first());
-          builder.addRepeatedField(field, v);
+          addRepeatedField(builder,field, v);
         }
       } else {
         Keyword map_field_by = mapFieldBy(field);
@@ -422,14 +444,14 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
             IPersistentMap map = (IPersistentMap) e.getValue();
             Object k = e.getKey();
             Object v = toProtoValue(field, map.assoc(map_field_by, k).assoc(map_field_by.getName(), k));
-            builder.addRepeatedField(field, v);
+            addRepeatedField(builder, field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
             Object v = toProtoValue(field, new PersistentArrayMap(map));
-            builder.addRepeatedField(field, v);
+            addRepeatedField(builder, field, v);
           }
         } else if (set) {
           if (value instanceof IPersistentMap) {
@@ -437,18 +459,18 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
               Map.Entry e = (Map.Entry) s.first();
               Object[] map = {k_item, e.getKey(), k_exists, e.getValue()};
               Object v = toProtoValue(field, new PersistentArrayMap(map));
-              builder.addRepeatedField(field, v);
+              addRepeatedField(builder, field, v);
             }
           } else {
             for (ISeq s = RT.seq(value); s != null; s = s.next()) {
               Object[] map = {k_item, s.first(), k_exists, true};
               Object v = toProtoValue(field, new PersistentArrayMap(map));
-              builder.addRepeatedField(field, v);
+              addRepeatedField(builder, field, v);
             }
           }
         } else {
           Object v = toProtoValue(field, value);
-          builder.addRepeatedField(field, v);
+          addRepeatedField(builder, field, v);
         }
       }
     } else {
@@ -456,7 +478,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
       if (v instanceof DynamicMessage) {
         v = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) v).build();
       }
-      builder.setField(field, v);
+      setField(builder, field, v);
     }
   }
 
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 9c05399..c77816f 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -271,3 +271,9 @@
     (.close out)
     (is (= [{:id 1, :label "foo"} {:id 2, :label "bar"} {:id 3, :label "baz"}]
            (protobuf-seq Foo in)))))
+
+(deftest test-encoding-errors
+  (is (thrown-with-msg? IllegalArgumentException #"error setting string field Foo.label to 8"
+        (protobuf Foo :label 8)))
+  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field Foo.tags"
+        (protobuf Foo :tags [1 2 3]))))
\ No newline at end of file

From 647f52bde81049b4a3a2e2a8187d67fa71a9313f Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 13 Jan 2012 18:06:46 -0800
Subject: [PATCH 176/525] 0.6.0-beta2

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 51d8297..d01c760 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta1"
+(defproject protobuf "0.6.0-beta2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]

From 612cadc5b3cbcae53c9e39d2178c2afd231d08f5 Mon Sep 17 00:00:00 2001
From: Paul Ingles <paul@oobaloo.co.uk>
Date: Wed, 18 Jan 2012 16:06:10 +0000
Subject: [PATCH 177/525] allow protocol buffer source files to be specified in
 the project's :proto-path

---
 src/clj/leiningen/protobuf.clj | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/clj/leiningen/protobuf.clj b/src/clj/leiningen/protobuf.clj
index bfac2ba..66abbd0 100644
--- a/src/clj/leiningen/protobuf.clj
+++ b/src/clj/leiningen/protobuf.clj
@@ -121,20 +121,21 @@
      (protoc project protos (io/file (:target-dir project) "protosrc")))
   ([project protos dest]
      (let [target (:target-dir project)
-           dest-path (.getPath dest)]
-       (when (or (> (modtime "proto") (modtime dest))
-                 (> (modtime "proto") (modtime "classes")))
+           dest-path (.getPath dest)
+           proto-path (or (:proto-path project) "proto")]
+       (when (or (> (modtime proto-path) (modtime dest))
+                 (> (modtime proto-path) (modtime "classes")))
          (.mkdirs dest)
          (.mkdir (io/file target "proto"))
          (doseq [proto protos]
            (println "Compiling" proto "to" dest-path)
-           (extract-dependencies (io/file "proto" proto) target)
+           (extract-dependencies (io/file proto-path proto) target)
            (sh "protoc"
                proto
                (str "--java_out=" dest-path)
                "-I."
                (str "-I" target "/proto")
-               :dir "proto"))
+               :dir proto-path))
          (javac (assoc project :java-source-path dest-path))))))
 
 (defn compile-google-protobuf
@@ -151,7 +152,8 @@
 
 (defn compile
   "Compile protocol buffer files located in proto dir."
-  ([project] (compile project (proto-files (io/file "proto"))))
+  ([project]
+     (compile project (proto-files (io/file (or (:proto-path project) "proto")))))
   ([project files]
      (install project)
      (when (= "protobuf" (:name project))

From 1a6d33d1ede579632e932b2036cad838a00cf279 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 13 Dec 2011 14:53:48 -0600
Subject: [PATCH 178/525] Restructure the project again since the
 :java-source-path in :source-path + jar Leiningen bug was fixed.

---
 project.clj                                                | 7 +++++--
 src/{clj => }/leiningen/protobuf.clj                       | 2 ++
 src/{clj => }/protobuf/codec.clj                           | 0
 src/{clj => }/protobuf/core.clj                            | 0
 .../protobuf/core/PersistentProtocolBufferMap.java         | 0
 5 files changed, 7 insertions(+), 2 deletions(-)
 rename src/{clj => }/leiningen/protobuf.clj (99%)
 rename src/{clj => }/protobuf/codec.clj (100%)
 rename src/{clj => }/protobuf/core.clj (100%)
 rename src/{java => }/protobuf/core/PersistentProtocolBufferMap.java (100%)

diff --git a/project.clj b/project.clj
index d01c760..8f7e1d8 100644
--- a/project.clj
+++ b/project.clj
@@ -7,5 +7,8 @@
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
   :eval-in-project true
-  :source-path "src/clj"
-  :java-source-path "src/java")
+  ;; Bug in the current 1.x branch of Leiningen causes
+  ;; jar to implicitly clean no matter what, wiping stuff.
+  ;; This prevents that.
+  :disable-implicit-clean true
+  :java-source-path "src")
diff --git a/src/clj/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
similarity index 99%
rename from src/clj/leiningen/protobuf.clj
rename to src/leiningen/protobuf.clj
index 66abbd0..ab45424 100644
--- a/src/clj/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -138,6 +138,8 @@
                :dir proto-path))
          (javac (assoc project :java-source-path dest-path))))))
 
+
+
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"
   [project]
diff --git a/src/clj/protobuf/codec.clj b/src/protobuf/codec.clj
similarity index 100%
rename from src/clj/protobuf/codec.clj
rename to src/protobuf/codec.clj
diff --git a/src/clj/protobuf/core.clj b/src/protobuf/core.clj
similarity index 100%
rename from src/clj/protobuf/core.clj
rename to src/protobuf/core.clj
diff --git a/src/java/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
similarity index 100%
rename from src/java/protobuf/core/PersistentProtocolBufferMap.java
rename to src/protobuf/core/PersistentProtocolBufferMap.java

From b984f6e3bf07aa8e14365f407491d218082348e1 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 13 Dec 2011 16:10:47 -0600
Subject: [PATCH 179/525] Use fs for file systemy things rather than
 duplicating functionality.

---
 project.clj                |  6 +++---
 src/leiningen/protobuf.clj | 20 ++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/project.clj b/project.clj
index 8f7e1d8..48f814e 100644
--- a/project.clj
+++ b/project.clj
@@ -3,12 +3,12 @@
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]
                  [useful "0.7.4-alpha4"]
-                 [classlojure "0.6.3"]]
+                 [fs "1.0.0"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
-  :eval-in-project true
+  :eval-in-leiningen true
   ;; Bug in the current 1.x branch of Leiningen causes
   ;; jar to implicitly clean no matter what, wiping stuff.
   ;; This prevents that.
   :disable-implicit-clean true
-  :java-source-path "src")
+  :java-source-path "src")
\ No newline at end of file
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index ab45424..3e26b4b 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -6,7 +6,8 @@
         [leiningen.javac :only [javac]]
         [leiningen.util.paths :only [get-os]]
         [leiningen.core :only [prepend-tasks]])
-  (:require [clojure.java.io :as io])
+  (:require [clojure.java.io :as io]
+            [fs.core :as fs])
   (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
@@ -17,15 +18,6 @@
   (java.net.URL.
    (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
 
-(defn- unzip [source target-dir]
-  (let [zip (ZipFile. source)
-        entries (enumeration-seq (.entries zip))
-        target-file #(io/file target-dir (.getName %))]
-    (doseq [entry entries :when (not (.isDirectory entry))
-            :let [f (target-file entry)]]
-      (.mkdirs (.getParentFile f))
-      (io/copy (.getInputStream zip entry) f))))
-
 (defn- proto-dependencies
   "look for lines starting with import in proto-file"
   [proto-file]
@@ -52,7 +44,7 @@
   (let [files (-> dir io/file file-seq rest)]
     (if (empty? files)
       0
-      (apply max (map #(.lastModified %) files)))))
+      (apply max (map fs/mod-time files)))))
 
 (defn proto-file? [file]
   (let [name (.getName file)]
@@ -82,7 +74,7 @@
         (with-open [stream (.openStream url)]
           (io/copy stream (io/file zipped)))
         (println "Unzipping" zipfile "to" target)
-        (unzip (io/file zipped) target)))))
+        (fs/unzip zipped target)))))
 
 (defn uninstall
   "Remove protoc if it is installed."
@@ -100,8 +92,8 @@
     (fetch project)
     (let [source (io/file (:target-dir project) srcdir)]
       (when-not (.exists (io/file source "src" "protoc"))
-        (.setExecutable (io/file source "configure") true)
-        (.setExecutable (io/file source "install-sh") true)
+        (fs/chmod "+x" (io/file source "configure"))
+        (fs/chmod "+x" (io/file source "install-sh"))
         (println "Configuring protoc")
         (sh "./configure" :dir source)
         (println "Running 'make'")

From 746c13a0a4d37a1b21d1bec7304839288674e8ae Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 18 Jan 2012 17:14:05 -0600
Subject: [PATCH 180/525] Hook the javac task so that things are compiled when
 it is ran.

---
 project.clj                |  1 +
 src/leiningen/protobuf.clj | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 48f814e..facee20 100644
--- a/project.clj
+++ b/project.clj
@@ -6,6 +6,7 @@
                  [fs "1.0.0"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
+  :hooks [leiningen.protobuf]
   :eval-in-leiningen true
   ;; Bug in the current 1.x branch of Leiningen causes
   ;; jar to implicitly clean no matter what, wiping stuff.
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 3e26b4b..df77980 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -5,7 +5,7 @@
         [leiningen.help :only [help-for]]
         [leiningen.javac :only [javac]]
         [leiningen.util.paths :only [get-os]]
-        [leiningen.core :only [prepend-tasks]])
+        [robert.hooke :only [add-hook]])
   (:require [clojure.java.io :as io]
             [fs.core :as fs])
   (:import java.util.zip.ZipFile))
@@ -14,6 +14,8 @@
 (def srcdir  (str "protobuf-" version))
 (def zipfile (format "protobuf-%s.zip" version))
 
+(def ^{:dynamic true} *compile?* true)
+
 (def url
   (java.net.URL.
    (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
@@ -128,9 +130,8 @@
                "-I."
                (str "-I" target "/proto")
                :dir proto-path))
-         (javac (assoc project :java-source-path dest-path))))))
-
-
+         (binding [*compile?* false]
+           (javac (assoc project :java-source-path dest-path)))))))
 
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"
@@ -155,6 +156,12 @@
        (compile-google-protobuf project))
      (protoc project files)))
 
+(add-hook #'javac
+          (fn [f & args]
+            (when *compile?*
+              (compile (first args)))
+            (apply f args)))
+
 (defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
         :help-arglists '([subtask & args])
         :subtasks [#'fetch #'install #'uninstall #'compile]}
@@ -164,4 +171,4 @@
      (case subtask
        "install"   (apply install project args)
        "uninstall" (apply uninstall project args)
-       "compile"   (apply compile project args))))
\ No newline at end of file
+       "compile"   (apply compile project args))))

From 72fd3720a2cdd78ee31804658e1365952614ed32 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 18 Jan 2012 17:40:44 -0600
Subject: [PATCH 181/525] Inc beta.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index facee20..9bd89fe 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta2"
+(defproject protobuf "0.6.0-beta3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.2"]
@@ -12,4 +12,4 @@
   ;; jar to implicitly clean no matter what, wiping stuff.
   ;; This prevents that.
   :disable-implicit-clean true
-  :java-source-path "src")
\ No newline at end of file
+  :java-source-path "src")

From e7317540c01ee69dc703769a24c1381164d72565 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 18 Jan 2012 19:20:20 -0600
Subject: [PATCH 182/525] Added a .lein-classpath to fix `lein test`

This was necessary because we :eval-in-leiningen.
---
 .gitignore      | 6 ++++--
 .lein-classpath | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .lein-classpath

diff --git a/.gitignore b/.gitignore
index 2777733..2b9dd56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-.lein*
+.lein-deps-sum
+.lein-failures
 .cake
 *~
 lib
@@ -9,4 +10,5 @@ pom.xml
 *.class
 proto/google/protobuf/descriptor.proto
 docs
-protobuf-*
\ No newline at end of file
+protobuf-*
+protosrc
diff --git a/.lein-classpath b/.lein-classpath
new file mode 100644
index 0000000..90b07e9
--- /dev/null
+++ b/.lein-classpath
@@ -0,0 +1 @@
+classes

From 60823e7d4a1e6d3dbe82a5fa6fa1a45ab9e72f45 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 19 Jan 2012 16:34:11 -0600
Subject: [PATCH 183/525] Rewrote a portion of the README to reflect the swich
 to Leiningen tasks.

---
 README.md | 154 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 93 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 070cbfd..c76071d 100644
--- a/README.md
+++ b/README.md
@@ -6,36 +6,42 @@ they are WAY faster to serialize and deserialize than standard Clojure objects.
 
 Write a `.proto` file:
 
-    message Person {
-      required int32  id    = 1;
-      required string name  = 2;
-      optional string email = 3;
-      repeated string likes = 4;
-    }
+```java
+message Person {
+  required int32  id    = 1;
+  required string name  = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}
+```
 
-If you put it in the proto directory of your project, you can compile it with cake:
+If you put it in the proto directory of your project, you can compile it with [leiningen](https://github.com/technomancy/leiningen):
 
-    cake proto example.proto
+```
+lein protobuf compile example.proto
+```
 
 Now you can use the protocol buffer in clojure:
 
-    (use 'protobuf)
-    (defprotobuf Person Example$Person)
+```clojure
+(use 'protobuf)
+(defprotobuf Person Example$Person)
 
-    (def p (protobuf Person :id 4 :name "Bob" :email "bob@example.com"))
-    => {:id 4, :name "Bob", :email "bob@example.com"}
+(def p (protobuf Person :id 4 :name "Bob" :email "bob@example.com"))
+=> {:id 4, :name "Bob", :email "bob@example.com"}
 
-    (assoc p :name "Bill"))
-    => {:id 4, :name "Bill", :email "bob@example.com"}
+(assoc p :name "Bill"))
+=> {:id 4, :name "Bill", :email "bob@example.com"}
 
-    (assoc p :likes ["climbing" "running" "jumping"])
-    => {:id 4, name "Bob", :email "bob@example.com", :likes ["climbing" "running" "jumping"]}
+(assoc p :likes ["climbing" "running" "jumping"])
+=> {:id 4, name "Bob", :email "bob@example.com", :likes ["climbing" "running" "jumping"]}
 
-    (def b (protobuf-dump p))
-    => #<byte[] [B@7cbe41ec>
+(def b (protobuf-dump p))
+=> #<byte[] [B@7cbe41ec>
 
-    (protobuf-load Person b)
-    => {:id 4, :name "Bob", :email "bob@example.com"}
+(protobuf-load Person b)
+=> {:id 4, :name "Bob", :email "bob@example.com"}
+```clojure
 
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
@@ -46,61 +52,87 @@ Clojure-protobuf supports extensions to protocol buffers which provide sets and
 repeated fields. You can also provide metadata on protobuf fields using clojure syntax. To
 use these, you must import the extension file and include it when compiling. For example:
 
-    import "clojure/protobuf/extensions.proto";
-    message Photo {
-      required int32  id     = 1;
-      required string path   = 2;
-      repeated string labels = 3 [(set)    = true];
-      repeated Attr   attrs  = 4 [(map)    = true];
-      repeated Tag    tags   = 5 [(map_by) = "person_id"];
-
-      message Attr {
-        required string key = 1;
-        optional string val = 2;
-      }
-
-      message Tag {
-        required int32 person_id = 1;
-        optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
-        optional int32 y_coord   = 3;
-        optional int32 width     = 4;
-        optional int32 height    = 5;
-      }
-    }
+```java
+import "clojure/protobuf/extensions.proto";
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated string labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+```
 
 Compile the file:
 
-     cake proto example.proto
+```
+lein protobuf compile example.proto
+```
 
 Then you can access the maps in clojure:
 
-    (use 'protobuf)
-    (defprotobuf Photo Example$Photo)
-    (defprotobuf Tag Example$Photo$Tag)
+```clojure
+(use 'protobuf)
+(defprotobuf Photo Example$Photo)
+(defprotobuf Tag Example$Photo$Tag)
 
-    (def p (protobuf Photo :id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
-                           :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-                           :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
-    => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
+(def p (protobuf Photo :id 7  :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
+                       :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                       :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+=> {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
-    (def b (protobuf-dump p))
-    => #<byte[] [B@7cbe41ec>
+(def b (protobuf-dump p))
+=> #<byte[] [B@7cbe41ec>
 
-    (protobuf-load Photo b)
-    => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
+(protobuf-load Photo b)
+=> {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
-    (:x-coord (protofields Tag))
-    => {:max 100.0 :min -100.0}
+(:x-coord (protofields Tag))
+=> {:max 100.0 :min -100.0}
+```
 
 ## Installation
 
-As of [Cake](http://github.com/ninjudd/cake) 0.7.0, add `protobuf` and the `cake-protobuf` plugin to your project.clj:
+You'll want to use this with the Leiningen build tool. You can get it by
+putting it in your `:dependencies` and/or `:dev-dependencies`. If you
+want to use the Leiningen plugin portion of clojure-protobuf, it has to
+be in your dev-dependencies.
 
-    :dependencies [[protobuf "LATEST"]]
-    :cake-plugins [[cake-protobuf "LATEST"]]
+```clojure
+:dev-dependencies [[protobuf "x.x.x"]]
+```
 
-You should probably replace `"LATEST"` with whatever the latest version is, but I'm going to forget
-to update this every time I bump the version, so I'm not going to put an actual number here. You can
-find the lastest versions here (https://clojars.org/cake-protobuf https://clojars.org/protobuf).
+Replace `"x.x.x"` with the actual latest version, which you can find on
+[clojars](http://clojars.org/protobuf) 
+
+**NOTE: clojure-protobuf requires bugfixes introduced in the 1.x branch
+of Leiningen. Until the 1.7.0 release, you'll have to use Leiningen off
+of the latest 1.x branch in order to use the Leiningen tasks provided
+with this library.**
+
+## History
+
+The build tool tasks provided with this library were originally for the
+cake build tool. In 2011, the authors of that tool decided that their
+time would be better spent working on a single, canonical build tool.
+Leiningen was already the standard for Clojure, so that's where we are
+now. As of version 0.6.0 (which has yet to see an final release, but is
+usable), all of the cake-specific functionality has been rewritten for
+Leiningen. Any version before that will not work with Leiningen.
+
+## Getting Help
 
 If you have any questions or need help, you can find us on IRC in [#flatland](irc://irc.freenode.net/#flatland).

From a5344a92722baa50931ff9ab822b8aabaeb9bc87 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 19 Jan 2012 19:36:03 -0800
Subject: [PATCH 184/525] update ordered-set to fix tests

---
 project.clj                                        | 2 +-
 src/protobuf/core/PersistentProtocolBufferMap.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 9bd89fe..a86987b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,7 +1,7 @@
 (defproject protobuf "0.6.0-beta3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
-                 [ordered-set "0.2.2"]
+                 [ordered-set "0.2.3"]
                  [useful "0.7.4-alpha4"]
                  [fs "1.0.0"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index f629b60..00ccdf7 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -11,6 +11,7 @@
 package protobuf.core;
 
 import clojure.lang.*;
+import ordered_set.core.OrderedSet;
 import java.util.*;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -299,7 +300,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
           Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
 
-          ITransientSet set = (ITransientSet) PersistentOrderedSet.EMPTY.asTransient();
+          ITransientSet set = (ITransientSet) OrderedSet.EMPTY.asTransient();
           while (iterator.hasNext()) {
             DynamicMessage message = (DynamicMessage) iterator.next();
             Object  item   = fromProtoValue(item_field, message.getField(item_field));

From ca2a0c6159979f6a8edefbb45c93d5ba6c001d1a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 19 Jan 2012 19:36:23 -0800
Subject: [PATCH 185/525] 0.6.0-beta4

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index a86987b..f07896e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta3"
+(defproject protobuf "0.6.0-beta4"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From ab8ee723e2a8e26fe1a392c2f7e37ec9bf5eadd2 Mon Sep 17 00:00:00 2001
From: Paul Ingles <paul@oobaloo.co.uk>
Date: Wed, 18 Jan 2012 16:25:48 +0000
Subject: [PATCH 186/525] capture result of calling protoc- print error
 messages if the compiler fails

---
 src/leiningen/protobuf.clj | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index df77980..f94d014 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -122,16 +122,19 @@
          (.mkdirs dest)
          (.mkdir (io/file target "proto"))
          (doseq [proto protos]
-           (println "Compiling" proto "to" dest-path)
+           (print "Compiling" proto "to" dest-path "... ")
            (extract-dependencies (io/file proto-path proto) target)
-           (sh "protoc"
-               proto
-               (str "--java_out=" dest-path)
-               "-I."
-               (str "-I" target "/proto")
-               :dir proto-path))
-         (binding [*compile?* false]
-           (javac (assoc project :java-source-path dest-path)))))))
+           (let [protoc-result (sh "protoc"
+                                   proto
+                                   (str "--java_out=" dest-path)
+                                   "-I."
+                                   (str "-I" target "/proto")
+                                   :dir proto-path)]
+             (if (= (:exit protoc-result) 0)
+               (println "Success")
+               (do (println "Error")
+                   (println (:err protoc-result))))))
+         (javac (assoc project :java-source-path dest-path))))))
 
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"

From d803b36c4273101cc3efdbbec6962cc0375fae93 Mon Sep 17 00:00:00 2001
From: Paul Ingles <paul@oobaloo.co.uk>
Date: Wed, 18 Jan 2012 17:01:11 +0000
Subject: [PATCH 187/525] print the protoc command thats run, makes it easier
 to figure out what happened; fix another proto-path issue

---
 src/leiningen/protobuf.clj | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index f94d014..ba27c39 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -122,18 +122,13 @@
          (.mkdirs dest)
          (.mkdir (io/file target "proto"))
          (doseq [proto protos]
-           (print "Compiling" proto "to" dest-path "... ")
+           (println "Compiling" proto "to" dest-path "... ")
            (extract-dependencies (io/file proto-path proto) target)
-           (let [protoc-result (sh "protoc"
-                                   proto
-                                   (str "--java_out=" dest-path)
-                                   "-I."
-                                   (str "-I" target "/proto")
-                                   :dir proto-path)]
-             (if (= (:exit protoc-result) 0)
-               (println "Success")
-               (do (println "Error")
-                   (println (:err protoc-result))))))
+           (let [args ["protoc" proto (str "--java_out=" dest-path) "-I." (str "-I" target proto-path)]]
+             (println (apply str " > " (interpose " " args)))
+             (let [protoc-result (apply sh (concat args [:dir proto-path]))]
+               (if (not (= (:exit protoc-result) 0))
+                 (println " > ERROR: " (:err protoc-result))))))
          (javac (assoc project :java-source-path dest-path))))))
 
 (defn compile-google-protobuf

From c67b20ed1888462d6f4fd0c0b10f7cac6fa33a77 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 25 Jan 2012 22:58:58 -0600
Subject: [PATCH 188/525] Switch to conch for shelling out.

---
 project.clj                |  3 ++-
 src/leiningen/protobuf.clj | 44 +++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/project.clj b/project.clj
index f07896e..4475eb6 100644
--- a/project.clj
+++ b/project.clj
@@ -3,7 +3,8 @@
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]
                  [useful "0.7.4-alpha4"]
-                 [fs "1.0.0"]]
+                 [fs "1.0.0"]
+                 [conch "0.2.0"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
   :hooks [leiningen.protobuf]
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index ba27c39..b80cdd5 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -1,13 +1,13 @@
 (ns leiningen.protobuf
   (:refer-clojure :exclude [compile])
-  (:use [clojure.java.shell :only [sh]]
-        [clojure.string :only [join]]
+  (:use [clojure.string :only [join]]
         [leiningen.help :only [help-for]]
         [leiningen.javac :only [javac]]
         [leiningen.util.paths :only [get-os]]
         [robert.hooke :only [add-hook]])
   (:require [clojure.java.io :as io]
-            [fs.core :as fs])
+            [fs.core :as fs]
+            [conch.core :as sh])
   (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
@@ -58,7 +58,7 @@
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
 (defn installed? []
-  (try (.contains (:out (sh "protoc" "--version")) version)
+  (try (.contains (sh/stream-to-string (sh/proc "protoc" "--version") :out) version)
        (catch java.io.IOException e)))
 
 (defn read-pass []
@@ -82,10 +82,11 @@
   "Remove protoc if it is installed."
   [project]
   (when (installed?)
-    (let [password (read-pass)]
-      (sh "sudo" "-S" "make" "uninstall"
-          :dir (io/file (:target-dir project) srcdir)
-          :in (str password "\n")))))
+    (let [password (read-pass)
+          proc (sh/proc "sudo" "-S" "make" "uninstall"
+                        :dir (io/file (:target-dir project) srcdir))]
+      (sh/feed-from-string proc (str password "\n"))
+      (sh/stream-to-out proc :out))))
 
 (defn install
   "Compile and install protoc to /usr/local."
@@ -97,17 +98,19 @@
         (fs/chmod "+x" (io/file source "configure"))
         (fs/chmod "+x" (io/file source "install-sh"))
         (println "Configuring protoc")
-        (sh "./configure" :dir source)
+        (sh/stream-to-out (sh/proc "./configure" :dir source) :out)
         (println "Running 'make'")
-        (sh "make" :dir source))
+        (sh/stream-to-out (sh/proc "make" :dir source) :out))
       (println "Installing")
       (let [password (str (read-pass) "\n")
-            opts     {:dir source :input-string (str password "\n")}]
-        (if (= :linux (get-os))
-          (sh "script" "-q" "-c" "sudo -S make install" "/dev/null"
-              :dir source :in password)
-          (sh "sudo" "-S" "make" "install"
-              :dir source :in password))))))
+            opts     {:dir source :input-string (str password "\n")}
+            proc     (if (= :linux (get-os))
+                       (sh/proc "script" "-q" "-c" "sudo -S make install" "/dev/null"
+                                :dir source)
+                       (sh/proc "sudo" "-S" "make" "install"
+                                :dir source))]
+        (sh/feed-from-string proc password)
+        (sh/stream-to-out proc :out)))))
 
 (defn protoc
   "Create .java and .class files from the provided .proto files."
@@ -126,10 +129,11 @@
            (extract-dependencies (io/file proto-path proto) target)
            (let [args ["protoc" proto (str "--java_out=" dest-path) "-I." (str "-I" target proto-path)]]
              (println (apply str " > " (interpose " " args)))
-             (let [protoc-result (apply sh (concat args [:dir proto-path]))]
-               (if (not (= (:exit protoc-result) 0))
-                 (println " > ERROR: " (:err protoc-result))))))
-         (javac (assoc project :java-source-path dest-path))))))
+             (let [protoc-result (apply sh/proc (concat args [:dir proto-path]))]
+               (if (not (= (sh/exit-code protoc-result) 0))
+                 (println " > ERROR: " (sh/stream-to-string protoc-result :err))))))
+         (binding [*compile?* false]
+           (javac (assoc project :java-source-path dest-path)))))))
 
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"

From 4f2d8e0c2491c52456d3c31f37803fa34a69c4e6 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 26 Jan 2012 17:41:54 -0600
Subject: [PATCH 189/525] 0.6.0-beta5

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4475eb6..42d2b8c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta4"
+(defproject protobuf "0.6.0-beta5"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From fa2d36e2f980f55c2a53376caeedf48c17163c4b Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 26 Jan 2012 17:42:28 -0600
Subject: [PATCH 190/525] Pass files to compile properly. Fixes #16.

---
 src/leiningen/protobuf.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index b80cdd5..9d0cc90 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -151,7 +151,7 @@
   "Compile protocol buffer files located in proto dir."
   ([project]
      (compile project (proto-files (io/file (or (:proto-path project) "proto")))))
-  ([project files]
+  ([project & files]
      (install project)
      (when (= "protobuf" (:name project))
        (fetch project)

From f7228ab87c0fa3a25f45f79c7ba1a7977bff4bd7 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 26 Jan 2012 17:42:45 -0600
Subject: [PATCH 191/525] 0.6.0-beta6

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 42d2b8c..5acf391 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta5"
+(defproject protobuf "0.6.0-beta6"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From 8925a8ae5098a26d4b487634b012fd0f77b38ef0 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 26 Jan 2012 17:51:22 -0600
Subject: [PATCH 192/525] apply compile because, as it turns out, a lazy seq
 isn't a file.

---
 src/leiningen/protobuf.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 9d0cc90..3ce526b 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -150,7 +150,7 @@
 (defn compile
   "Compile protocol buffer files located in proto dir."
   ([project]
-     (compile project (proto-files (io/file (or (:proto-path project) "proto")))))
+     (apply compile project (proto-files (io/file (or (:proto-path project) "proto")))))
   ([project & files]
      (install project)
      (when (= "protobuf" (:name project))

From 5b94eed6d750f8820a141789b3c1b7ca7caf31fc Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 26 Jan 2012 23:49:20 -0600
Subject: [PATCH 193/525] Added a failing test for example.proto

---
 proto/protobuf/test/example.proto | 25 +++++++++++++++++++++++++
 test/protobuf/example_test.clj    | 11 +++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 proto/protobuf/test/example.proto
 create mode 100644 test/protobuf/example_test.clj

diff --git a/proto/protobuf/test/example.proto b/proto/protobuf/test/example.proto
new file mode 100644
index 0000000..914b2d2
--- /dev/null
+++ b/proto/protobuf/test/example.proto
@@ -0,0 +1,25 @@
+import "protobuf/core/extensions.proto";
+
+option java_package = "protobuf.test";
+option java_outer_classname = "Example";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated string labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
new file mode 100644
index 0000000..f3886b9
--- /dev/null
+++ b/test/protobuf/example_test.clj
@@ -0,0 +1,11 @@
+(ns protobuf.example-test
+  (:use protobuf.core clojure.test))
+
+(def Photo (protodef protobuf.test.Example$Photo))
+(def Tag   (protodef protobuf.test.Example$Photo$Tag))
+
+;; Haven't seen correct output so I have nothing to compare to.
+(deftest example-test
+  (is (protobuf Photo :id 7  :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
+                      :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                      :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}})))

From 0359c39ded063b82b4eb349ce9eb9d499d2a1def Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 27 Jan 2012 12:57:46 -0800
Subject: [PATCH 194/525] fix example test

---
 proto/protobuf/test/example.proto | 7 ++++++-
 test/protobuf/example_test.clj    | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/proto/protobuf/test/example.proto b/proto/protobuf/test/example.proto
index 914b2d2..7c568b5 100644
--- a/proto/protobuf/test/example.proto
+++ b/proto/protobuf/test/example.proto
@@ -6,10 +6,15 @@ option java_outer_classname = "Example";
 message Photo {
   required int32  id     = 1;
   required string path   = 2;
-  repeated string labels = 3 [(set)    = true];
+  repeated Label  labels = 3 [(set)    = true];
   repeated Attr   attrs  = 4 [(map)    = true];
   repeated Tag    tags   = 5 [(map_by) = "person_id"];
 
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
   message Attr {
     required string key = 1;
     optional string val = 2;
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
index f3886b9..59ae31b 100644
--- a/test/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -2,7 +2,6 @@
   (:use protobuf.core clojure.test))
 
 (def Photo (protodef protobuf.test.Example$Photo))
-(def Tag   (protodef protobuf.test.Example$Photo$Tag))
 
 ;; Haven't seen correct output so I have nothing to compare to.
 (deftest example-test

From e5f6da1f2697f3744b928fcfdce7c6bafc65f019 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 27 Jan 2012 16:41:22 -0600
Subject: [PATCH 195/525] Updated README.md

---
 README.md | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c76071d..1b028bc 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,10 @@ lein protobuf compile example.proto
 Now you can use the protocol buffer in clojure:
 
 ```clojure
-(use 'protobuf)
-(defprotobuf Person Example$Person)
+(use 'protobuf.core)
+(import Example$Person)
+
+(def Person (protodef Example$Person))
 
 (def p (protobuf Person :id 4 :name "Bob" :email "bob@example.com"))
 => {:id 4, :name "Bob", :email "bob@example.com"}
@@ -41,7 +43,7 @@ Now you can use the protocol buffer in clojure:
 
 (protobuf-load Person b)
 => {:id 4, :name "Bob", :email "bob@example.com"}
-```clojure
+```
 
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
@@ -53,14 +55,20 @@ repeated fields. You can also provide metadata on protobuf fields using clojure
 use these, you must import the extension file and include it when compiling. For example:
 
 ```java
-import "clojure/protobuf/extensions.proto";
+import "protobuf/core/extensions.proto";
+
 message Photo {
   required int32  id     = 1;
   required string path   = 2;
-  repeated string labels = 3 [(set)    = true];
+  repeated Label  labels = 3 [(set)    = true];
   repeated Attr   attrs  = 4 [(map)    = true];
   repeated Tag    tags   = 5 [(map_by) = "person_id"];
 
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
   message Attr {
     required string key = 1;
     optional string val = 2;
@@ -86,8 +94,11 @@ Then you can access the maps in clojure:
 
 ```clojure
 (use 'protobuf)
-(defprotobuf Photo Example$Photo)
-(defprotobuf Tag Example$Photo$Tag)
+(import Example$Photo)
+(import Example$Photo$Tag)
+
+(def Photo (protodef Example$Photo))
+(def Tag (protodef Example$Photo$Tag))
 
 (def p (protobuf Photo :id 7  :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
                        :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}

From 56c4be49079f705591dc33ec66bd348a66b43970 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 27 Jan 2012 16:46:13 -0600
Subject: [PATCH 196/525] Update example-test with expected output.

Also cleaned up the test significantly.
---
 test/protobuf/example_test.clj | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
index 59ae31b..46aa5fb 100644
--- a/test/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -3,8 +3,9 @@
 
 (def Photo (protodef protobuf.test.Example$Photo))
 
-;; Haven't seen correct output so I have nothing to compare to.
+(def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"}, 
+           :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"}, 
+           :tags {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}})
+
 (deftest example-test
-  (is (protobuf Photo :id 7  :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
-                      :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-                      :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}})))
+  (is (= data (apply protobuf Photo (apply concat data)))))

From 85f10bc10399abedeb7e3af7ecbf7f07df04a99d Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 8 Feb 2012 17:38:06 -0600
Subject: [PATCH 197/525] Update README since 1.7.0 was released.

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1b028bc..5765f33 100644
--- a/README.md
+++ b/README.md
@@ -129,10 +129,8 @@ be in your dev-dependencies.
 Replace `"x.x.x"` with the actual latest version, which you can find on
 [clojars](http://clojars.org/protobuf) 
 
-**NOTE: clojure-protobuf requires bugfixes introduced in the 1.x branch
-of Leiningen. Until the 1.7.0 release, you'll have to use Leiningen off
-of the latest 1.x branch in order to use the Leiningen tasks provided
-with this library.**
+**NOTE: clojure-protobuf requires at least version 1.7.0 of Leiningen.
+It will not work in earlier versions.**
 
 ## History
 

From 2696cc8bf76af362ee9e238ca3ac3ad2fd838cdd Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 8 Feb 2012 17:48:28 -0600
Subject: [PATCH 198/525] Clean output a bit.

---
 src/leiningen/protobuf.clj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 3ce526b..a777325 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -125,13 +125,12 @@
          (.mkdirs dest)
          (.mkdir (io/file target "proto"))
          (doseq [proto protos]
-           (println "Compiling" proto "to" dest-path "... ")
            (extract-dependencies (io/file proto-path proto) target)
            (let [args ["protoc" proto (str "--java_out=" dest-path) "-I." (str "-I" target proto-path)]]
-             (println (apply str " > " (interpose " " args)))
+             (println " > " (join " " args))
              (let [protoc-result (apply sh/proc (concat args [:dir proto-path]))]
                (if (not (= (sh/exit-code protoc-result) 0))
-                 (println " > ERROR: " (sh/stream-to-string protoc-result :err))))))
+                 (println "ERROR: " (sh/stream-to-string protoc-result :err))))))
          (binding [*compile?* false]
            (javac (assoc project :java-source-path dest-path)))))))
 

From dee89feafd0365db55daf1d440d97115f45f3647 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 8 Feb 2012 17:50:21 -0600
Subject: [PATCH 199/525] 0.6.0-beta7.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 5acf391..9811875 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta6"
+(defproject protobuf "0.6.0-beta7"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From da816f7ad769ba029d2f5477d92ba2cfaf1d68b3 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 1 Mar 2012 16:53:12 -0600
Subject: [PATCH 200/525] Put generated files in target. Closes #22.

---
 src/leiningen/protobuf.clj | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index a777325..cb20f6b 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -20,6 +20,14 @@
   (java.net.URL.
    (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
 
+;; In lein 1 there was a :target-dir key that defaulted to "." and wasn't really
+;; used much. In lein 2, things that are generated by plugins and such are
+;; supposed to go in :target-path. This will default to 'target'. We don't want
+;; to wait for this, so we'll simulate it here.
+(defn target [project]
+  (doto (io/file (or (:target-path project) "target"))
+    .mkdirs))
+
 (defn- proto-dependencies
   "look for lines starting with import in proto-file"
   [proto-file]
@@ -33,6 +41,7 @@
     (when-not (empty? files)
       (let [proto (peek files)
             files (pop files)]
+        ;; TODO Somehow check for :proto-path too?
         (if (or (.exists (io/file "proto" proto))
                 (.exists (io/file target "proto" proto)))
           (recur files)
@@ -69,8 +78,8 @@
 (defn fetch
   "Fetch protocol-buffer source and unzip it."
   [project]
-  (let [target (:target-dir project)]
-    (when-not (.exists (io/file target srcdir)) 
+  (let [target (target project)]
+    (when-not (.exists (io/file target srcdir))
       (let [zipped (io/file target zipfile)]
         (println "Downloading" zipfile)
         (with-open [stream (.openStream url)]
@@ -84,7 +93,7 @@
   (when (installed?)
     (let [password (read-pass)
           proc (sh/proc "sudo" "-S" "make" "uninstall"
-                        :dir (io/file (:target-dir project) srcdir))]
+                        :dir (io/file (target project) srcdir))]
       (sh/feed-from-string proc (str password "\n"))
       (sh/stream-to-out proc :out))))
 
@@ -93,7 +102,7 @@
   [project]
   (when-not (installed?)
     (fetch project)
-    (let [source (io/file (:target-dir project) srcdir)]
+    (let [source (io/file (target project) srcdir)]
       (when-not (.exists (io/file source "src" "protoc"))
         (fs/chmod "+x" (io/file source "configure"))
         (fs/chmod "+x" (io/file source "install-sh"))
@@ -115,18 +124,20 @@
 (defn protoc
   "Create .java and .class files from the provided .proto files."
   ([project protos]
-     (protoc project protos (io/file (:target-dir project) "protosrc")))
+     (protoc project protos (io/file (target project) "protosrc")))
   ([project protos dest]
-     (let [target (:target-dir project)
+     (let [target (target project)
+           dest (.getAbsoluteFile dest)
            dest-path (.getPath dest)
-           proto-path (or (:proto-path project) "proto")]
+           proto-path (.getAbsoluteFile (io/file (or (:proto-path project) "proto")))]
        (when (or (> (modtime proto-path) (modtime dest))
                  (> (modtime proto-path) (modtime "classes")))
          (.mkdirs dest)
-         (.mkdir (io/file target "proto"))
+         (.mkdirs proto-path)
          (doseq [proto protos]
            (extract-dependencies (io/file proto-path proto) target)
-           (let [args ["protoc" proto (str "--java_out=" dest-path) "-I." (str "-I" target proto-path)]]
+           (let [args ["protoc" proto (str "--java_out=" dest-path) "-I."
+                       (str "-I" proto-path)]]
              (println " > " (join " " args))
              (let [protoc-result (apply sh/proc (concat args [:dir proto-path]))]
                (if (not (= (sh/exit-code protoc-result) 0))
@@ -138,7 +149,7 @@
   "Compile com.google.protobuf.*"
   [project]
   (let [proto-files (io/file "proto/google/protobuf")
-        target (:target-dir project)]
+        target (target project)]
     (.mkdirs proto-files)
     (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
              (io/file proto-files "descriptor.proto"))

From f7c12925d2627f3176d19f4a3e81408eb8618657 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 9 Feb 2012 17:34:02 -0800
Subject: [PATCH 201/525] Update to new schema type

---
 src/protobuf/codec.clj |  3 ++-
 src/protobuf/core.clj  | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 1b15a24..31b9c97 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -36,4 +36,5 @@
                 val
                 (protobuf proto val))))))
         (fix repeated
-             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %) :prefix :none)))))
+             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %) :prefix :none))
+        (with-meta {:schema {:type :map :fields (protofields proto)}}))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 3242fd3..ca0977e 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -1,5 +1,6 @@
 (ns protobuf.core
-  (:use [clojure.java.io :only [input-stream output-stream]]
+  (:use [useful.fn :only [fix]]
+        [clojure.java.io :only [input-stream output-stream]]
         [clojure.string :only [lower-case]])
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf GeneratedMessage CodedInputStream
@@ -61,14 +62,16 @@
           (for [^Descriptors$FieldDescriptor field (.getFields ^Descriptors$Descriptor type)]
             (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
                   field-name  (PersistentProtocolBufferMap/intern (.getName field))
-                  field-type  (keyword (lower-case (.name (.getJavaType field))))]
-              [field-name (merge (when (seq meta-string) (read-string meta-string))
-                                 {:type field-type}
-                                 (when (.isRepeated field)
-                                   {:repeated true})
-                                 (when (= :enum field-type)
-                                   {:values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
-                                                      (.. field getEnumType getValues)))}))])))))
+                  field-type  (keyword (lower-case (.name (.getJavaType field))))
+                  descriptor  (merge (when (seq meta-string) (read-string meta-string))
+                                     {:type (fix field-type
+                                                 #{:message} (constantly :map))}
+                                     (when (= :enum field-type)
+                                       {:values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
+                                                          (.. field getEnumType getValues)))}))]
+              [field-name (if (.isRepeated field)
+                            {:type :list :item-type descriptor}
+                            descriptor)])))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."

From 3aac8649bc85be81eba5830fcb87a8a128dd932f Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 10 Feb 2012 11:08:17 -0800
Subject: [PATCH 202/525] beta 8

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 9811875..57e897d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta7"
+(defproject protobuf "0.6.0-beta8"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From 0b2b3877eab191d82b9540f38738a83fe4a4629b Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 14 Feb 2012 17:45:14 -0800
Subject: [PATCH 203/525] More aggressive error messages

---
 src/protobuf/codec.clj | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 31b9c97..b0baf30 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -13,8 +13,13 @@
   (let [proto (protodef proto)
         min   (alength (protobuf-dump proto {:_len 0}))
         max   (alength (protobuf-dump proto {:_len Integer/MAX_VALUE}))]
-    (when-not (= min max)
-      (throw (Exception. "_len must be of type fixed32 or fixed64")))
+    (letfn [(check [test msg]
+              (when test
+                (throw (Exception. (format "In %s: %s" (.getFullName proto) msg)))))]
+      (check (zero? min)
+             "_len field is required for repeated protobufs")
+      (check (= min max)
+             "_len must be of type fixed32 or fixed64"))
     (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
                          #(hash-map :_len %)
                          :_len)))

From 43be0038bfa760af0d506705551c0bbe1574131e Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 15 Feb 2012 12:11:22 -0800
Subject: [PATCH 204/525] Only define the length field once

---
 src/protobuf/codec.clj | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index b0baf30..c5e8ea5 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -9,20 +9,22 @@
 
 (declare protobuf-codec)
 
-(defn length-prefix [proto]
-  (let [proto (protodef proto)
-        min   (alength (protobuf-dump proto {:_len 0}))
-        max   (alength (protobuf-dump proto {:_len Integer/MAX_VALUE}))]
-    (letfn [(check [test msg]
-              (when test
-                (throw (Exception. (format "In %s: %s" (.getFullName proto) msg)))))]
-      (check (zero? min)
-             "_len field is required for repeated protobufs")
-      (check (= min max)
-             "_len must be of type fixed32 or fixed64"))
-    (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
-                         #(hash-map :_len %)
-                         :_len)))
+(let [len-key :proto_length]
+  (defn length-prefix [proto]
+    (let [proto (protodef proto)
+          min   (alength (protobuf-dump proto {len-key 0}))
+          max   (alength (protobuf-dump proto {len-key Integer/MAX_VALUE}))]
+      (letfn [(check [test msg]
+                (when test
+                  (throw (Exception. (format "In %s: %s %s"
+                                             (.getFullName proto) (name len-key) msg)))))]
+        (check (zero? min)
+               "field is required for repeated protobufs")
+        (check (= min max)
+               "must be of type fixed32 or fixed64"))
+      (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
+                           #(hash-map len-key %)
+                           len-key))))
 
 (defn protobuf-codec [proto & {:keys [validator repeated]}]
   (let [proto (protodef proto)]

From 1cb2435937832fbe867fbd89fe567de2271ec671 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 16 Feb 2012 15:26:20 -0800
Subject: [PATCH 205/525] Fix meta/with-meta

---
 src/protobuf/codec.clj                             | 4 ++--
 src/protobuf/core/PersistentProtocolBufferMap.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index c5e8ea5..9a8a97d 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -15,10 +15,10 @@
           min   (alength (protobuf-dump proto {len-key 0}))
           max   (alength (protobuf-dump proto {len-key Integer/MAX_VALUE}))]
       (letfn [(check [test msg]
-                (when test
+                (when-not test
                   (throw (Exception. (format "In %s: %s %s"
                                              (.getFullName proto) (name len-key) msg)))))]
-        (check (zero? min)
+        (check (pos? min)
                "field is required for repeated protobufs")
         (check (= min max)
                "must be of type fixed32 or fixed64"))
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 00ccdf7..9511b2f 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -27,7 +27,7 @@
 import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.GeneratedMessage;
 
-public class PersistentProtocolBufferMap extends APersistentMap {
+public class PersistentProtocolBufferMap extends APersistentMap implements IObj {
   public static class Def {
     final Descriptors.Descriptor type;
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;

From 372e83956a8a3f6ecc1df5716496e6b847a2edd3 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 22 Feb 2012 18:56:19 -0800
Subject: [PATCH 206/525] protobuf nested schemas. need to fix and add tests
 tomorrow

---
 proto/protobuf/test/codec.proto |  4 +-
 src/protobuf/core.clj           | 26 +++--------
 src/protobuf/schema.clj         | 83 +++++++++++++++++++++++++++++++++
 test/protobuf/core_test.clj     | 47 ++++++++++++-------
 4 files changed, 120 insertions(+), 40 deletions(-)
 create mode 100644 src/protobuf/schema.clj

diff --git a/proto/protobuf/test/codec.proto b/proto/protobuf/test/codec.proto
index 02b1a65..616f645 100644
--- a/proto/protobuf/test/codec.proto
+++ b/proto/protobuf/test/codec.proto
@@ -14,8 +14,8 @@ message Foo {
 
   optional Foo nested = 7;
 
-  repeated int32 revisions = 8;
-  optional fixed32 _len = 9;
+  repeated int32   revisions    = 14;
+  optional fixed32 proto_length = 15;
 }
 
 message Item {
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index ca0977e..ebce268 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -1,10 +1,10 @@
 (ns protobuf.core
-  (:use [useful.fn :only [fix]]
+  (:use [protobuf.schema :only [field-schema]]
+        [useful.fn :only [fix]]
         [clojure.java.io :only [input-stream output-stream]]
         [clojure.string :only [lower-case]])
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
-           (com.google.protobuf GeneratedMessage CodedInputStream
-                                Descriptors$Descriptor Descriptors$FieldDescriptor)
+           (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
            (java.io InputStream OutputStream)
            (clojure.lang Reflector)))
 
@@ -54,24 +54,10 @@
   (let [type ^PersistentProtocolBufferMap$Def (protodef type)]
     (.defaultValue type key)))
 
-(defn protofields
-  "Return a map of the protobuf fields to the clojure.protobuf.Extensions metadata for each field."
+(defn protobuf-schema
+  "Return the schema for the given protodef."
   [& args]
-  (let [type (.getMessageType ^PersistentProtocolBufferMap$Def (apply protodef args))]
-    (into {}
-          (for [^Descriptors$FieldDescriptor field (.getFields ^Descriptors$Descriptor type)]
-            (let [meta-string (.. field getOptions (getExtension (Extensions/meta)))
-                  field-name  (PersistentProtocolBufferMap/intern (.getName field))
-                  field-type  (keyword (lower-case (.name (.getJavaType field))))
-                  descriptor  (merge (when (seq meta-string) (read-string meta-string))
-                                     {:type (fix field-type
-                                                 #{:message} (constantly :map))}
-                                     (when (= :enum field-type)
-                                       {:values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
-                                                          (.. field getEnumType getValues)))}))]
-              [field-name (if (.isRepeated field)
-                            {:type :list :item-type descriptor}
-                            descriptor)])))))
+  (field-schema (apply protodef args)))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
new file mode 100644
index 0000000..b2350fd
--- /dev/null
+++ b/src/protobuf/schema.clj
@@ -0,0 +1,83 @@
+(ns protobuf.schema
+  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
+           (com.google.protobuf Descriptors$Descriptor
+                                Descriptors$FieldDescriptor
+                                Descriptors$FieldDescriptor$Type)))
+
+(defn extension [ext field]
+  (-> field .getOptions (.getExtension ext)))
+
+(defn field-type [field]
+  (condp instance? field
+    Descriptors$FieldDescriptor
+    (if (.isRepeated field)
+      (condp extension field
+        (Extensions/counter)    :counter
+        (Extensions/succession) :succession
+        (Extensions/map)        :map
+        (Extensions/mapBy)      :map-by
+        (Extensions/set)        :set
+        :list)
+      :basic)
+    Descriptors$Descriptor
+    :struct))
+
+(defn struct-schema [struct & [parents]]
+  (let [struct-name (.getFullName struct)]
+    (into {:type :struct
+           :name struct-name}
+          (when (not-any? (partial = struct-name) parents)
+            {:fields (into {}
+                           (for [field (.getFields struct)]
+                             [(PersistentProtocolBufferMap/intern (.getName field))
+                              (field-schema field (conj parents struct-name))]))}))))
+
+(defn basic-schema [field & [parents]]
+  (let [java-type   (keyword (lower-case (.name (.getJavaType field))))
+        meta-string (extension (Extensions/meta) field)]
+    (into (case java-type
+            :message (struct-schema (.getMessageType field) parents)
+            :enum    {:type   :enum
+                      :values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
+                                        (.. field getEnumType getValues)))}
+            {:type java-type})
+          (when meta-string
+            (read-string meta-string)))))
+
+(defn subfield [field field-name]
+  (.getFieldByName (.getMessageType field) (name field-name)))
+
+(defmulti field-schema (fn [field & _] (field-type field)))
+
+(defmethod field-schema :basic [field & [parents]]
+  (basic-schema field parents))
+
+(defmethod field-schema :list [field & [parents]]
+  {:type   :list
+   :values (basic-schema field parents)})
+
+(defmethod field-schema :succession [field & [parents]]
+  (assoc (basic-schema field parents)
+    :succession true))
+
+(defmethod field-schema :counter [field & [parents]]
+  (assoc (basic-schema field parents)
+    :counter true))
+
+(defmethod field-schema :set [field & [parents]]
+  {:type   :set
+   :values (field-schema (subfield field :item) parents)})
+
+(defmethod field-schema :map [field & [parents]]
+  {:type   :map
+   :keys   (field-schema (subfield field :key) parents)
+   :values (field-schema (subfield field :val) parents)})
+
+(defmethod field-schema :map-by [field & [parents]]
+  (let [map-by (extension (Extensions/mapBy) field)]
+    {:type   :map-by
+     :keys   (field-schema (subfield field map-by) parents)
+     :values (basic-schema field parents)}))
+
+(defmethod field-schema :struct [field & [parents]]
+  (struct-schema field parents))
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index c77816f..6dd65e0 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -188,24 +188,35 @@
           (is (= ["foo" "bar" ""]  (get-raw p :labels))))))))
 
 (deftest test-protofields
-  (let [fields {:floats    {:type :float,   :repeated true},
-                :doubles   {:type :double,  :repeated true},
-                :counts    {:type :message, :repeated true},
-                :time      {:type :message, :repeated true},
-                :attr-map  {:type :message, :repeated true},
-                :tag-set   {:type :message, :repeated true},
-                :item-map  {:type :message, :repeated true},
-                :groups    {:type :message, :repeated true},
-                :responses {:type :enum,    :repeated true, :values #{:yes :no :maybe :not-sure}},
-                :pair-map  {:type :message, :repeated true},
-                :foo-by-id {:type :message, :repeated true},
-                :tags      {:type :string,  :repeated true},
-                :label     {:type :string, :a 1, :b 2, :c 3},
-                :id        {:type :int},
-                :parent    {:type :message},
-                :lat       {:type :double},
-                :long      {:type :float},
-                :deleted   {:type :boolean}}]
+  (let [fields {:type :struct
+                :name "Foo"
+                :fields {:parent    {:type :struct},
+                         :floats    {:type :list, :values {:type :float}},
+                         :doubles   {:type :list, :values {:type :double}},
+                         :tags      {:type :list, :values {:type :string}}
+                         :tag-set   {:type :set,  :values {:type :string}},
+                         :counts    {:type   :map
+                                     :keys   {:type :string}
+                                     :values {:type :struct}},
+                         :foo-by-id {:type   :map
+                                     :keys   {:type :integer}
+                                     :values {:type :struct, :name "Foo"}},
+                         :attr-map  {:type   :map
+                                     :keys   {:type :string}
+                                     :values {:type :string}},
+                         :pair-map  {:type :map,
+                                     :keys   {:type :string}
+                                     :item   {:type :struct, :name "Pair",
+                                              :fields {}}},
+                         :groups    {:type :list, :item {:type :map}},
+                         :responses {:type :list, :item {:type :enum, :values #{:no :yes :maybe :not-sure}}},
+                         :lat       {:type :double},
+                         :time      {:type :list, :item {:type :map}},
+                         :label     {:type :string, :a 1, :b 2, :c 3},
+                         :item-map  {:type :list, :item {:type :map}},
+                         :id        {:type :int},
+                         :long      {:type :float},
+                         :deleted   {:type :boolean},}}]
     (is (= fields (protofields Foo)))
     (is (= fields (protofields protobuf.test.Core$Foo)))))
 

From 9a6f38188020da99f6d0e72a47e7384d94fa1094 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 23 Feb 2012 18:24:21 -0800
Subject: [PATCH 207/525] new schema tests passing

---
 README.md                                     |   4 +-
 proto/protobuf/test/codec.proto               |   1 +
 proto/protobuf/test/core.proto                |   2 +
 proto/protobuf/test/example.proto             |   2 +
 src/protobuf/codec.clj                        |   2 +-
 src/protobuf/core.clj                         |  11 +-
 .../core/PersistentProtocolBufferMap.java     |  10 --
 src/protobuf/schema.clj                       |  33 +++--
 test/protobuf/core_test.clj                   | 130 +++++++++---------
 9 files changed, 96 insertions(+), 99 deletions(-)

diff --git a/README.md b/README.md
index 5765f33..a386644 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Then you can access the maps in clojure:
 (protobuf-load Photo b)
 => {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
 
-(:x-coord (protofields Tag))
+(:x-coord (protobuf-schema Tag))
 => {:max 100.0 :min -100.0}
 ```
 
@@ -127,7 +127,7 @@ be in your dev-dependencies.
 ```
 
 Replace `"x.x.x"` with the actual latest version, which you can find on
-[clojars](http://clojars.org/protobuf) 
+[clojars](http://clojars.org/protobuf)
 
 **NOTE: clojure-protobuf requires at least version 1.7.0 of Leiningen.
 It will not work in earlier versions.**
diff --git a/proto/protobuf/test/codec.proto b/proto/protobuf/test/codec.proto
index 616f645..a367e4d 100644
--- a/proto/protobuf/test/codec.proto
+++ b/proto/protobuf/test/codec.proto
@@ -1,3 +1,4 @@
+package protobuf.test.codec;
 import "protobuf/core/extensions.proto";
 
 option java_package = "protobuf.test";
diff --git a/proto/protobuf/test/core.proto b/proto/protobuf/test/core.proto
index 8b8040a..c380827 100644
--- a/proto/protobuf/test/core.proto
+++ b/proto/protobuf/test/core.proto
@@ -1,3 +1,5 @@
+package protobuf.test.core;
+
 import "protobuf/core/extensions.proto";
 
 option java_package = "protobuf.test";
diff --git a/proto/protobuf/test/example.proto b/proto/protobuf/test/example.proto
index 7c568b5..8f37027 100644
--- a/proto/protobuf/test/example.proto
+++ b/proto/protobuf/test/example.proto
@@ -1,3 +1,5 @@
+package protobuf.test.example;
+
 import "protobuf/core/extensions.proto";
 
 option java_package = "protobuf.test";
diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 9a8a97d..8fe0880 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -44,4 +44,4 @@
                 (protobuf proto val))))))
         (fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %) :prefix :none))
-        (with-meta {:schema {:type :map :fields (protofields proto)}}))))
+        (with-meta {:schema (protobuf-schema proto)}))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index ebce268..c127cf5 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -1,8 +1,7 @@
 (ns protobuf.core
   (:use [protobuf.schema :only [field-schema]]
         [useful.fn :only [fix]]
-        [clojure.java.io :only [input-stream output-stream]]
-        [clojure.string :only [lower-case]])
+        [clojure.java.io :only [input-stream output-stream]])
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
            (java.io InputStream OutputStream)
@@ -48,16 +47,10 @@
   ([^PersistentProtocolBufferMap$Def type k v & kvs]
      (PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
 
-(defn protodefault
-  "Return the default empty protobuf of the given type."
-  [type key]
-  (let [type ^PersistentProtocolBufferMap$Def (protodef type)]
-    (.defaultValue type key)))
-
 (defn protobuf-schema
   "Return the schema for the given protodef."
   [& args]
-  (field-schema (apply protodef args)))
+  (field-schema (.getMessageType (apply protodef args))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 9511b2f..bb28a14 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -103,16 +103,6 @@ public String getFullName() {
     public Descriptors.Descriptor getMessageType() {
       return type;
     }
-
-    public Object defaultValue(Keyword key) {
-      Descriptors.FieldDescriptor field = fieldDescriptor(key);
-      if (field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE) {
-        if (!field.isRepeated()) return null;
-        return PersistentProtocolBufferMap.fromProtoValue(field, new ArrayList());
-      } else {
-        return PersistentProtocolBufferMap.fromProtoValue(field, field.getDefaultValue());
-      }
-    }
   }
 
   final Def def;
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index b2350fd..e9df2da 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -1,11 +1,14 @@
 (ns protobuf.schema
+  (:use [useful.fn :only [fix]]
+        [clojure.string :only [lower-case]])
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf Descriptors$Descriptor
                                 Descriptors$FieldDescriptor
                                 Descriptors$FieldDescriptor$Type)))
-
 (defn extension [ext field]
-  (-> field .getOptions (.getExtension ext)))
+  (-> (.getOptions field)
+      (.getExtension ext)
+      (fix string? not-empty)))
 
 (defn field-type [field]
   (condp instance? field
@@ -22,6 +25,8 @@
     Descriptors$Descriptor
     :struct))
 
+(defmulti field-schema (fn [field & _] (field-type field)))
+
 (defn struct-schema [struct & [parents]]
   (let [struct-name (.getFullName struct)]
     (into {:type :struct
@@ -35,19 +40,19 @@
 (defn basic-schema [field & [parents]]
   (let [java-type   (keyword (lower-case (.name (.getJavaType field))))
         meta-string (extension (Extensions/meta) field)]
-    (into (case java-type
-            :message (struct-schema (.getMessageType field) parents)
-            :enum    {:type   :enum
-                      :values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
-                                        (.. field getEnumType getValues)))}
-            {:type java-type})
-          (when meta-string
-            (read-string meta-string)))))
+    (merge (case java-type
+             :message (struct-schema (.getMessageType field) parents)
+             :enum    {:type   :enum
+                       :values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
+                                         (.. field getEnumType getValues)))}
+             {:type java-type})
+           (when (.hasDefaultValue field)
+             {:default (.getDefaultValue field)})
+           (when meta-string
+             (read-string meta-string)))))
 
 (defn subfield [field field-name]
-  (.getFieldByName (.getMessageType field) (name field-name)))
-
-(defmulti field-schema (fn [field & _] (field-type field)))
+  (.findFieldByName (.getMessageType field) (name field-name)))
 
 (defmethod field-schema :basic [field & [parents]]
   (basic-schema field parents))
@@ -75,7 +80,7 @@
 
 (defmethod field-schema :map-by [field & [parents]]
   (let [map-by (extension (Extensions/mapBy) field)]
-    {:type   :map-by
+    {:type   :map
      :keys   (field-schema (subfield field map-by) parents)
      :values (basic-schema field parents)}))
 
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 6dd65e0..71a5d8d 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -187,67 +187,71 @@
           (is (= ["foo" "bar" nil] (get     p :labels)))
           (is (= ["foo" "bar" ""]  (get-raw p :labels))))))))
 
-(deftest test-protofields
-  (let [fields {:type :struct
-                :name "Foo"
-                :fields {:parent    {:type :struct},
-                         :floats    {:type :list, :values {:type :float}},
-                         :doubles   {:type :list, :values {:type :double}},
-                         :tags      {:type :list, :values {:type :string}}
-                         :tag-set   {:type :set,  :values {:type :string}},
-                         :counts    {:type   :map
-                                     :keys   {:type :string}
-                                     :values {:type :struct}},
-                         :foo-by-id {:type   :map
-                                     :keys   {:type :integer}
-                                     :values {:type :struct, :name "Foo"}},
-                         :attr-map  {:type   :map
-                                     :keys   {:type :string}
-                                     :values {:type :string}},
-                         :pair-map  {:type :map,
-                                     :keys   {:type :string}
-                                     :item   {:type :struct, :name "Pair",
-                                              :fields {}}},
-                         :groups    {:type :list, :item {:type :map}},
-                         :responses {:type :list, :item {:type :enum, :values #{:no :yes :maybe :not-sure}}},
-                         :lat       {:type :double},
-                         :time      {:type :list, :item {:type :map}},
-                         :label     {:type :string, :a 1, :b 2, :c 3},
-                         :item-map  {:type :list, :item {:type :map}},
-                         :id        {:type :int},
-                         :long      {:type :float},
-                         :deleted   {:type :boolean},}}]
-    (is (= fields (protofields Foo)))
-    (is (= fields (protofields protobuf.test.Core$Foo)))))
+(deftest test-protobuf-schema
+  (let [fields
+        {:type :struct
+         :name "protobuf.test.core.Foo"
+         :fields {:id      {:default 43, :type :int}
+                  :deleted {:default false, :type :boolean}
+                  :lat     {:type :double}
+                  :long    {:type :float}
+                  :parent  {:type :struct, :name "protobuf.test.core.Foo"}
+                  :floats  {:type :list, :values {:type :float}}
+                  :doubles {:type :list, :values {:type :double}}
+                  :label   {:type :string, :c 3, :b 2, :a 1}
+                  :tags    {:type :list, :values {:type :string}}
+                  :tag-set {:type :set,  :values {:type :string}}
+                  :counts  {:type   :map
+                            :keys   {:type :string}
+                            :values {:type :struct, :name "protobuf.test.core.Count"
+                                     :fields {:key {:type :string}
+                                              :i {:counter true, :type :int}
+                                              :d {:counter true, :type :double}}}}
+                  :foo-by-id {:type :map
+                              :keys   {:default 43, :type :int}
+                              :values {:type :struct, :name "protobuf.test.core.Foo"}}
+                  :attr-map {:type :map
+                             :keys   {:type :string}
+                             :values {:type :string}}
+                  :pair-map {:type :map
+                             :keys   {:type :string}
+                             :values {:type :struct, :name "protobuf.test.core.Pair"
+                                      :fields {:key {:type :string}
+                                               :val {:type :string}}}}
+                  :groups {:type :map
+                           :keys   {:type :string}
+                           :values {:type :list
+                                    :values {:type :struct, :name "protobuf.test.core.Foo"}}}
+                  :responses {:type :list
+                              :values {:type :enum, :values #{:no :yes :maybe :not-sure}}}
+                  :time {:type :struct, :name "protobuf.test.core.Time", :succession true
+                         :fields {:year   {:type :int}
+                                  :month  {:type :int}
+                                  :day    {:type :int}
+                                  :hour   {:type :int}
+                                  :minute {:type :int}}}
+                  :item-map {:type :map
+                             :keys   {:type :string}
+                             :values {:type :struct, :name "protobuf.test.core.Item"
+                                      :fields {:item   {:type :string},
+                                               :exists {:default true, :type :boolean}}}}}}]
+    (is (= fields (protobuf-schema Foo)))
+    (is (= fields (protobuf-schema protobuf.test.Core$Foo)))))
 
-(deftest test-nested-protofields
-  (is (= {:year   {:type :int},
-          :month  {:type :int},
-          :day    {:type :int},
-          :hour   {:type :int},
-          :minute {:type :int}}
-         (protofields Foo :time)))
-  (is (= {:year   {:type :int},
-          :month  {:type :int},
-          :day    {:type :int},
-          :hour   {:type :int},
-          :minute {:type :int}}
-         (protofields Foo :parent :foo-by-id :time))))
-
-(deftest test-protodefault
-  (is (= 43    (protodefault Foo :id)))
-  (is (= 0.0   (protodefault Foo :lat)))
-  (is (= 0.0   (protodefault Foo :long)))
-  (is (= ""    (protodefault Foo :label)))
-  (is (= []    (protodefault Foo :tags)))
-  (is (= nil   (protodefault Foo :parent)))
-  (is (= []    (protodefault Foo :responses)))
-  (is (= #{}   (protodefault Foo :tag-set)))
-  (is (= {}    (protodefault Foo :foo-by-id)))
-  (is (= {}    (protodefault Foo :groups)))
-  (is (= {}    (protodefault Foo :item-map)))
-  (is (= false (protodefault Foo :deleted)))
-  (is (= {}    (protodefault protobuf.test.Core$Foo :groups))))
+(comment deftest test-default-protobuf
+  (is (= 43    (default-protobuf Foo :id)))
+  (is (= 0.0   (default-protobuf Foo :lat)))
+  (is (= 0.0   (default-protobuf Foo :long)))
+  (is (= ""    (default-protobuf Foo :label)))
+  (is (= []    (default-protobuf Foo :tags)))
+  (is (= nil   (default-protobuf Foo :parent)))
+  (is (= []    (default-protobuf Foo :responses)))
+  (is (= #{}   (default-protobuf Foo :tag-set)))
+  (is (= {}    (default-protobuf Foo :foo-by-id)))
+  (is (= {}    (default-protobuf Foo :groups)))
+  (is (= {}    (default-protobuf Foo :item-map)))
+  (is (= false (default-protobuf Foo :deleted)))
+  (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
   (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
@@ -260,7 +264,7 @@
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
              :pair_map :groups :doubles :floats :item_map :counts :time :lat :long}
-           (set (keys (protofields Foo)))))
+           (-> (protobuf-schema Foo) :fields keys set)))
 
     (protobuf.core.PersistentProtocolBufferMap/setUseUnderscores false)))
 
@@ -284,7 +288,7 @@
            (protobuf-seq Foo in)))))
 
 (deftest test-encoding-errors
-  (is (thrown-with-msg? IllegalArgumentException #"error setting string field Foo.label to 8"
+  (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
         (protobuf Foo :label 8)))
-  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field Foo.tags"
+  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
         (protobuf Foo :tags [1 2 3]))))
\ No newline at end of file

From 68709bbef084b757f692490c2a41a95503d1dc90 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 22 Feb 2012 19:12:34 -0800
Subject: [PATCH 208/525] Fix handling of reset/length fields

---
 src/protobuf/codec.clj | 44 ++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 8fe0880..0d7a4b6 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -9,22 +9,24 @@
 
 (declare protobuf-codec)
 
-(let [len-key :proto_length]
-  (defn length-prefix [proto]
-    (let [proto (protodef proto)
-          min   (alength (protobuf-dump proto {len-key 0}))
-          max   (alength (protobuf-dump proto {len-key Integer/MAX_VALUE}))]
-      (letfn [(check [test msg]
-                (when-not test
-                  (throw (Exception. (format "In %s: %s %s"
-                                             (.getFullName proto) (name len-key) msg)))))]
-        (check (pos? min)
-               "field is required for repeated protobufs")
-        (check (= min max)
-               "must be of type fixed32 or fixed64"))
-      (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
-                           #(hash-map len-key %)
-                           len-key))))
+(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)
+
+(defn length-prefix [proto]
+  (let [proto (protodef proto)
+        min   (alength (protobuf-dump proto {len-key 0}))
+        max   (alength (protobuf-dump proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format "In %s: %s %s"
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             "field is required for repeated protobufs")
+      (check (= min max)
+             "must be of type fixed32 or fixed64"))
+    (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
+                         #(hash-map len-key %)
+                         len-key)))
 
 (defn protobuf-codec [proto & {:keys [validator repeated]}]
   (let [proto (protodef proto)]
@@ -43,5 +45,13 @@
                 val
                 (protobuf proto val))))))
         (fix repeated
-             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %) :prefix :none))
+             #(gloss/compile-frame (gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                                                   :prefix :none)
+                                   identity
+                                   (partial dissoc len-key)))
+        (gloss/compile-frame identity
+                             (fn [data]
+                               (-> data
+                                   (dissoc reset-key :revisions)
+                                   (with-meta (select-keys data [:revisions])))))
         (with-meta {:schema (protobuf-schema proto)}))))

From 7442c3f7e35a78c887770d48e70f405082e15a1a Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 27 Feb 2012 11:58:13 -0800
Subject: [PATCH 209/525] Fix metadata support

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index bb28a14..22597f3 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -475,7 +475,7 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
 
   public PersistentProtocolBufferMap withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
-    return new PersistentProtocolBufferMap(meta(), def, message);
+    return new PersistentProtocolBufferMap(meta, def, message);
   }
 
   public IPersistentMap meta(){

From d2267c97f504dc2ae217ba083e1d3f57d28e9731 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 27 Feb 2012 11:58:39 -0800
Subject: [PATCH 210/525] Make .contains consistent with .getValAt

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 22597f3..d8518e8 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -489,7 +489,7 @@ public boolean containsKey(Object key) {
     } else if (field.isRepeated()) {
       return message().getRepeatedFieldCount(field) > 0;
     } else {
-      return message().hasField(field);
+      return message().hasField(field) || field.hasDefaultValue();
     }
   }
 
@@ -509,10 +509,11 @@ public Object valAt(Object key, Object notFound) {
 
   public Object getValAt(Object key, boolean use_extensions) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null) return null;
-    if (field.isRepeated() && message().getRepeatedFieldCount(field) == 0) return null;
-    if (!field.isRepeated() && !field.hasDefaultValue() && !message().hasField(field)) return null;
-    return fromProtoValue(field, message().getField(field), use_extensions);
+    if (containsKey(key)) {
+      return fromProtoValue(field, message().getField(field), use_extensions);
+    } else {
+      return null;
+    }
   }
 
   public IPersistentMap assoc(Object key, Object value) {

From e44110a93ddeb01c4287b50c1803da483266a0d6 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 27 Feb 2012 13:03:23 -0800
Subject: [PATCH 211/525] Add tests for equality and meta testing

---
 test/protobuf/core_test.clj | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 71a5d8d..a876c65 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -60,6 +60,21 @@
       (is (= nil (:tags p)))
       (is (= nil (:label p))))))
 
+(deftest test-equality
+  (let [m {:id 5 :tags ["fast" "shiny"] :label "nice"}
+        p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+        q (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+    (is (= m p))
+    (is (= q p))))
+
+(deftest test-meta
+  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+        m {:foo :bar}
+        q (with-meta p m)]
+    (is (empty? (meta p)))
+    (is (= p q))
+    (is (= m (meta q)))))
+
 (deftest test-string-keys
   (let [p (protobuf Foo "id" 5 "label" "rad")]
     (is (= 5 (p :id)))

From c23723a75f17c831e298c7092216fd659297242e Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 27 Feb 2012 13:23:33 -0800
Subject: [PATCH 212/525] Manage meta keys better

---
 src/protobuf/codec.clj | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 0d7a4b6..f1d3a73 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -3,6 +3,7 @@
         [gloss.core.protocols :only [Reader Writer]]
         [gloss.core.formats :only [to-buf-seq]]
         [useful.fn :only [fix]]
+        [useful.experimental :only [lift-meta]]
         [clojure.java.io :only [input-stream]])
   (:require io.core
             [gloss.core :as gloss]))
@@ -44,14 +45,9 @@
               (if (protobuf? val)
                 val
                 (protobuf proto val))))))
-        (fix repeated
-             #(gloss/compile-frame (gloss/repeated (gloss/finite-frame (length-prefix proto) %)
-                                                   :prefix :none)
-                                   identity
-                                   (partial dissoc len-key)))
         (gloss/compile-frame identity
-                             (fn [data]
-                               (-> data
-                                   (dissoc reset-key :revisions)
-                                   (with-meta (select-keys data [:revisions])))))
+                             #(dissoc % reset-key))
+        (fix repeated
+             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                              :prefix :none))
         (with-meta {:schema (protobuf-schema proto)}))))

From cf8c034b576545d31f148532de6822fb03ea354d Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 27 Feb 2012 14:37:39 -0800
Subject: [PATCH 213/525] New version of useful

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 57e897d..68c3f20 100644
--- a/project.clj
+++ b/project.clj
@@ -2,7 +2,7 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]
-                 [useful "0.7.4-alpha4"]
+                 [useful "0.8.0-alpha1"]
                  [fs "1.0.0"]
                  [conch "0.2.0"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]

From d0d199425e0b23876873d782193acd5a207e3f94 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 28 Feb 2012 14:13:40 -0800
Subject: [PATCH 214/525] Fix catbytes (a test helper function).

It was written with dependencies on the system's default character encoding,
and wound up working only on OSX.

Only tests were affected; the actual functionality worked all along.
---
 test/protobuf/core_test.clj | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index a876c65..d77d386 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -8,7 +8,14 @@
 (def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
 
 (defn catbytes [& args]
-  (.getBytes (apply str (map (fn [#^bytes b] (String. b)) args))))
+  (let [out-buf (byte-array (reduce + (map count args)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array & more] (seq args)]
+        (let [size (count array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))
 
 (deftest test-conj
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]

From a05634bb82dacc9afe95ec7f0f966fc9abb5b1bf Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 17:09:00 -0800
Subject: [PATCH 215/525] Add an extmap to protobuf maps

---
 .../core/PersistentProtocolBufferMap.java     | 103 ++++++++++++------
 1 file changed, 70 insertions(+), 33 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index d8518e8..79ea7cf 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -105,11 +105,12 @@ public Descriptors.Descriptor getMessageType() {
     }
   }
 
-  final Def def;
-  final DynamicMessage message;
-  final IPersistentMap _meta;
+  private final Def def;
+  private final DynamicMessage message;
+  private final IPersistentMap _meta;
+  private final IPersistentMap ext;
 
-  DynamicMessage built_message;
+  private DynamicMessage built_message;
 
   static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws InvalidProtocolBufferException {
     DynamicMessage message = def.parseFrom(bytes);
@@ -137,18 +138,35 @@ static public PersistentProtocolBufferMap construct(Def def, Object keyvals) {
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
     this._meta   = meta;
+    this.ext     = null;
     this.def     = def;
     this.message = null;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message) {
     this._meta   = meta;
+    this.ext     = null;
+    this.def     = def;
+    this.message = message;
+  }
+
+  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def, DynamicMessage message) {
+    this._meta   = meta;
+    this.ext     = ext;
     this.def     = def;
     this.message = message;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage.Builder builder) {
     this._meta   = meta;
+    this.ext     = null;
+    this.def     = def;
+    this.message = builder.build();
+  }
+
+  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def, DynamicMessage.Builder builder) {
+    this._meta   = meta;
+    this.ext     = ext;
     this.def     = def;
     this.message = builder.build();
   }
@@ -413,11 +431,11 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
     }
   }
 
-  protected void addField(DynamicMessage.Builder builder, Object key, Object value) {
-    if (key == null) return;
+  protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object key, Object value) {
+    if (key == null) return builder;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null) return;
-    if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) return;
+    if (field == null) return builder;
+    if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) return builder;
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
@@ -471,11 +489,13 @@ protected void addField(DynamicMessage.Builder builder, Object key, Object value
       }
       setField(builder, field, v);
     }
+
+    return builder;
   }
 
   public PersistentProtocolBufferMap withMeta(IPersistentMap meta) {
     if (meta == meta()) return this;
-    return new PersistentProtocolBufferMap(meta, def, message);
+    return new PersistentProtocolBufferMap(meta, ext, def, message);
   }
 
   public IPersistentMap meta(){
@@ -483,6 +503,10 @@ public IPersistentMap meta(){
   }
 
   public boolean containsKey(Object key) {
+    return protoContainsKey(key) || RT.booleanCast(RT.contains(ext, key));
+  }
+
+  private boolean protoContainsKey(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) {
       return false;
@@ -493,9 +517,11 @@ public boolean containsKey(Object key) {
     }
   }
 
+  private static final Object sentinel = new Object();
+
   public IMapEntry entryAt(Object key) {
-    Object value = valAt(key);
-    return (value == null) ? null : new MapEntry(key, value);
+    Object value = valAt(key, sentinel);
+    return (value == sentinel) ? null : new MapEntry(key, value);
   }
 
   public Object valAt(Object key) {
@@ -503,16 +529,20 @@ public Object valAt(Object key) {
   }
 
   public Object valAt(Object key, Object notFound) {
-    Object value = valAt(key);
-    return (value == null) ? notFound : value;
+    return getValAt(key, notFound, true);
   }
 
   public Object getValAt(Object key, boolean use_extensions) {
+    Object val = getValAt(key, sentinel, use_extensions);
+    return (val == sentinel) ? null : val;
+  }
+
+  public Object getValAt(Object key, Object notFound, boolean use_extensions) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (containsKey(key)) {
+    if (protoContainsKey(key)) {
       return fromProtoValue(field, message().getField(field), use_extensions);
     } else {
-      return null;
+      return RT.get(ext, key, notFound);
     }
   }
 
@@ -520,8 +550,13 @@ public IPersistentMap assoc(Object key, Object value) {
     DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
-    addField(builder, field, value);
-    return new PersistentProtocolBufferMap(meta(), def, builder);
+    if (field != null) {
+      addField(builder, field, value);
+      return new PersistentProtocolBufferMap(meta(), ext, def, builder);
+    } else {
+      return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value),
+                                             def, builder);
+    }
   }
 
   public IPersistentMap assocEx(Object key, Object value) throws Exception {
@@ -554,17 +589,21 @@ public PersistentProtocolBufferMap append(IPersistentMap map) {
     } else {
       proto = construct(def, map);
     }
-    return new PersistentProtocolBufferMap(meta(), def, builder().mergeFrom(proto.message()));
+    return new PersistentProtocolBufferMap(meta(), ext, def, builder().mergeFrom(proto.message()));
   }
 
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null) return this;
+    if (field == null) {
+      IPersistentMap newExt = (IPersistentMap)RT.dissoc(ext, key);
+      if (newExt == ext) {
+        return this;
+      }
+      return new PersistentProtocolBufferMap(meta(), newExt, def, builder());
+    }
     if (field.isRequired()) throw new Exception("Can't remove required field");
 
-    DynamicMessage.Builder builder = builder();
-    builder.clearField(field);
-    return new PersistentProtocolBufferMap(meta(), def, builder);
+    return new PersistentProtocolBufferMap(meta(), ext, def, builder().clearField(field));
   }
 
   public Iterator iterator() {
@@ -580,24 +619,22 @@ public ISeq seq() {
   }
 
   public IPersistentCollection empty() {
-    DynamicMessage.Builder builder = builder();
-    builder.clear();
-    return new PersistentProtocolBufferMap(meta(), def, builder);
+    return new PersistentProtocolBufferMap(meta(), null, def, builder().clear());
   }
 
-  static class Seq extends ASeq {
-    final PersistentProtocolBufferMap proto;
-    final MapEntry first;
-    final ISeq fields;
+  private static class Seq extends ASeq {
+    private final PersistentProtocolBufferMap proto;
+    private final MapEntry first;
+    private final ISeq fields;
 
-    static public Seq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
+    public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
       for (ISeq s = fields; s != null; s = s.next()) {
         Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
         Keyword k = intern(field.getName());
-        Object  v = proto.valAt(k);
-        if (v != null) return new Seq(meta, proto, new MapEntry(k, v), s);
+        Object  v = proto.valAt(k, sentinel);
+        if (v != sentinel) return new Seq(meta, proto, new MapEntry(k, v), s);
       }
-      return null;
+      return RT.seq(proto.ext);
     }
 
     protected Seq(IPersistentMap meta, PersistentProtocolBufferMap proto, MapEntry first, ISeq fields){

From 4172eae963a5d0359a45ee74ceb1c6a32eb93735 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 17:10:02 -0800
Subject: [PATCH 216/525] Update test for changes to protobuf.

If you assoc nil into a protobuf with a nullable field, the key should
be present but with a value of nil.
---
 test/protobuf/core_test.clj | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d77d386..e3afc80 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -182,20 +182,21 @@
              (get-raw p :time))))))
 
 (deftest test-nullable
-  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo")]
+  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo")
+        keyset #{:int :long :flt :dbl :str}]
     (is (= 1            (get p :int)))
     (is (= 330000000000 (get p :long)))
     (is (= (float 1.23) (get p :flt)))
     (is (= 9.87654321   (get p :dbl)))
     (is (= "foo"        (get p :str)))
-    (is (= [:int :long :flt :dbl :str] (keys p)))
+    (is (= keyset (set (keys p))))
     (let [p (append p {:int nil :long nil :flt nil :dbl nil :str nil})]
       (is (= nil (get p :int)))
       (is (= nil (get p :long)))
       (is (= nil (get p :flt)))
       (is (= nil (get p :dbl)))
       (is (= nil (get p :str)))
-      (is (= nil (keys p))))
+      (is (= keyset (set (keys p)))))
     (testing "nullable successions"
       (let [p (protobuf Bar :label "foo")]
         (is (= "foo" (get p :label)))

From 852fd2e95455fc061732bad212a1996097244033 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 17:12:41 -0800
Subject: [PATCH 217/525] Use result of addField (like a transient) instead of
 bashing builder in-place

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 79ea7cf..96b1d8c 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -547,15 +547,14 @@ public Object getValAt(Object key, Object notFound, boolean use_extensions) {
   }
 
   public IPersistentMap assoc(Object key, Object value) {
-    DynamicMessage.Builder builder = builder();
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
     if (field != null) {
-      addField(builder, field, value);
-      return new PersistentProtocolBufferMap(meta(), ext, def, builder);
+      return new PersistentProtocolBufferMap(meta(), ext, def,
+                                             addField(builder(), field, value));
     } else {
       return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value),
-                                             def, builder);
+                                             def, builder());
     }
   }
 

From 85147572d635ed9bc49683c213924faaf297d8b4 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 19:00:04 -0800
Subject: [PATCH 218/525] Make sure count() includes unset fields with
 defaults.

These will appear in a seq of the map, so they should be included
in the count (and otherwise equality is broken and asymmetrical).
---
 src/protobuf/core/PersistentProtocolBufferMap.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 96b1d8c..43765a5 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -610,7 +610,14 @@ public Iterator iterator() {
   }
 
   public int count() {
-    return message().getAllFields().size();
+    DynamicMessage message = message();
+    int count = RT.count(ext);
+    for (Descriptors.FieldDescriptor field : def.type.getFields()) {
+      if (protoContainsKey(field)) {
+        count++;
+      }
+    }
+    return count;
   }
 
   public ISeq seq() {

From 3d91fe574f875fa57aa84853fb99ee8c9cde9d52 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 19:00:35 -0800
Subject: [PATCH 219/525] Equality should be symmetrical

---
 test/protobuf/core_test.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index e3afc80..85a186d 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -72,6 +72,7 @@
         p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         q (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (is (= m p))
+    (is (= p m))
     (is (= q p))))
 
 (deftest test-meta

From 85ad1a82bf7301b15170a9f94b2dd3985c6f8fd0 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 19:01:01 -0800
Subject: [PATCH 220/525] Comparing for equality should include the default
 values

---
 test/protobuf/core_test.clj | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 85a186d..b1f5aa0 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -59,7 +59,9 @@
     (let [p (assoc p :tags "aspirin")]
       (is (= ["aspirin"] (:tags p))))
     (let [p (assoc p :foo-by-id {3 {:label "three"} 2 {:label "two"}})]
-      (is (= {3 {:id 3, :label "three"} 2 {:id 2, :label "two"}} (:foo-by-id p))))))
+      (is (= {3 {:id 3, :label "three", :deleted false}
+              2 {:id 2, :label "two", :deleted false}}
+             (:foo-by-id p))))))
 
 (deftest test-dissoc
   (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
@@ -68,7 +70,7 @@
       (is (= nil (:label p))))))
 
 (deftest test-equality
-  (let [m {:id 5 :tags ["fast" "shiny"] :label "nice"}
+  (let [m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
         p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         q (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (is (= m p))
@@ -308,7 +310,9 @@
         baz (protobuf Foo :id 3 :label "baz")]
     (protobuf-write out foo bar baz)
     (.close out)
-    (is (= [{:id 1, :label "foo"} {:id 2, :label "bar"} {:id 3, :label "baz"}]
+    (is (= [{:id 1, :label "foo", :deleted false}
+            {:id 2, :label "bar", :deleted false}
+            {:id 3, :label "baz", :deleted false}]
            (protobuf-seq Foo in)))))
 
 (deftest test-encoding-errors

From 4713fa513c15995552faabcf65c8a523468e7274 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 1 Mar 2012 19:01:09 -0800
Subject: [PATCH 221/525] Add test for extmap

---
 test/protobuf/core_test.clj | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index b1f5aa0..c94146f 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -85,6 +85,17 @@
     (is (= p q))
     (is (= m (meta q)))))
 
+(deftest test-extmap
+  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+        m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
+        p2 (assoc p :some-key 10)
+        m2 (assoc m :some-key 10)]
+    (is (= p m))
+    (is (= p2 m2))
+    (is (= m2 p2))
+    (is (= (into {} m2) (into {} p2)))
+    (is (= (set (keys m2)) (set (keys p2))))))
+
 (deftest test-string-keys
   (let [p (protobuf Foo "id" 5 "label" "rad")]
     (is (= 5 (p :id)))

From f0be8fa5614ebaf9840d183b5ce1b2df20ccc062 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 21 Mar 2012 16:21:27 -0700
Subject: [PATCH 222/525] pass proto-path into extract-dependencies

---
 src/leiningen/protobuf.clj | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index cb20f6b..39fded4 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -36,20 +36,20 @@
 
 (defn extract-dependencies
   "extract all files proto is dependent on"
-  [proto-file target]
-  (loop [files (vec (proto-dependencies proto-file))]
-    (when-not (empty? files)
-      (let [proto (peek files)
-            files (pop files)]
-        ;; TODO Somehow check for :proto-path too?
-        (if (or (.exists (io/file "proto" proto))
-                (.exists (io/file target "proto" proto)))
-          (recur files)
-          (let [location (str "proto/" proto)
-                proto-file (io/file target location)]
-            (.mkdirs (.getParentFile proto-file))
-            (io/copy (io/reader (io/resource location)) proto-file)
-            (recur (into files (proto-dependencies proto-file)))))))))
+  [proto-path proto-file target]
+  (let [proto-file (io/file proto-path proto-file)]
+    (loop [files (vec (proto-dependencies proto-file))]
+      (when-not (empty? files)
+        (let [proto (peek files)
+              files (pop files)]
+          (if (or (.exists (io/file proto-path proto))
+                  (.exists (io/file target "proto" proto)))
+            (recur files)
+            (let [location (str "proto/" proto)
+                  proto-file (io/file target location)]
+              (.mkdirs (.getParentFile proto-file))
+              (io/copy (io/reader (io/resource location)) proto-file)
+              (recur (into files (proto-dependencies proto-file))))))))))
 
 (defn modtime [dir]
   (let [files (-> dir io/file file-seq rest)]
@@ -135,7 +135,7 @@
          (.mkdirs dest)
          (.mkdirs proto-path)
          (doseq [proto protos]
-           (extract-dependencies (io/file proto-path proto) target)
+           (extract-dependencies proto-path proto target)
            (let [args ["protoc" proto (str "--java_out=" dest-path) "-I."
                        (str "-I" proto-path)]]
              (println " > " (join " " args))

From c9faea0aaffb5d5a7cc8758275c73ed8fa1127c6 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 21 Mar 2012 16:21:44 -0700
Subject: [PATCH 223/525] remove fetch subtask

---
 src/leiningen/protobuf.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 39fded4..84f1601 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -176,7 +176,7 @@
 
 (defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
         :help-arglists '([subtask & args])
-        :subtasks [#'fetch #'install #'uninstall #'compile]}
+        :subtasks [#'install #'uninstall #'compile]}
   protobuf
   ([project] (println (help-for "protobuf")))
   ([project subtask & args]

From c8cbc6f6443bdda7b2f9af31204ff12423ff99eb Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 21 Mar 2012 18:58:25 -0500
Subject: [PATCH 224/525] Add target/proto to the include list.

---
 src/leiningen/protobuf.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 84f1601..034dce3 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -137,6 +137,7 @@
          (doseq [proto protos]
            (extract-dependencies proto-path proto target)
            (let [args ["protoc" proto (str "--java_out=" dest-path) "-I."
+                       (str "-I" (.getAbsoluteFile (io/file target "proto")))
                        (str "-I" proto-path)]]
              (println " > " (join " " args))
              (let [protoc-result (apply sh/proc (concat args [:dir proto-path]))]

From 7c96e7aea5fd252cec31a8e22295cc3436b85701 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 21 Mar 2012 19:04:55 -0500
Subject: [PATCH 225/525] Update to beta9.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 68c3f20..1134a9f 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta8"
+(defproject protobuf "0.6.0-beta9"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From d32ee176772869dd2a25185b48312103c472db38 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 21 Mar 2012 19:21:53 -0500
Subject: [PATCH 226/525] Beta10

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 1134a9f..ec0a26e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta9"
+(defproject protobuf "0.6.0-beta10"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From e599bf6ecfedcc2e20df9f08b10d475d26b8dd9a Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 23 Mar 2012 13:20:02 -0700
Subject: [PATCH 227/525] Beta 10: don't dissoc out :codec_reset

---
 project.clj            | 2 +-
 src/protobuf/codec.clj | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index ec0a26e..365f6d4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta10"
+(defproject protobuf "0.6.0-beta11"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]
diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index f1d3a73..6f3f08f 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -45,8 +45,6 @@
               (if (protobuf? val)
                 val
                 (protobuf proto val))))))
-        (gloss/compile-frame identity
-                             #(dissoc % reset-key))
         (fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
                               :prefix :none))

From 1c7a9751024284b43d6e6f4125f5352e98f2d8da Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 26 Mar 2012 20:04:21 -0700
Subject: [PATCH 228/525] Add typehints to everything

---
 src/protobuf/core.clj   | 12 ++++++------
 src/protobuf/schema.clj | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index c127cf5..aa8334f 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -22,11 +22,11 @@
   ([def]
      (if (or (protodef? def) (nil? def))
        def
-       (PersistentProtocolBufferMap$Def/create
-        ^Descriptors.Descriptor
-        (if (instance? Descriptors$Descriptor def)
-          def
-          (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil))))))
+       (let [^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor def)
+               def
+               (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor))))
   ([def & fields]
      (loop [^PersistentProtocolBufferMap$Def def (protodef def)
             fields fields]
@@ -50,7 +50,7 @@
 (defn protobuf-schema
   "Return the schema for the given protodef."
   [& args]
-  (field-schema (.getMessageType (apply protodef args))))
+  (field-schema (.getMessageType ^PersistentProtocolBufferMap$Def (apply protodef args))))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index e9df2da..d943184 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -5,7 +5,7 @@
            (com.google.protobuf Descriptors$Descriptor
                                 Descriptors$FieldDescriptor
                                 Descriptors$FieldDescriptor$Type)))
-(defn extension [ext field]
+(defn extension [ext ^Descriptors$FieldDescriptor field]
   (-> (.getOptions field)
       (.getExtension ext)
       (fix string? not-empty)))
@@ -13,7 +13,7 @@
 (defn field-type [field]
   (condp instance? field
     Descriptors$FieldDescriptor
-    (if (.isRepeated field)
+    (if (.isRepeated ^Descriptors$FieldDescriptor field)
       (condp extension field
         (Extensions/counter)    :counter
         (Extensions/succession) :succession
@@ -27,17 +27,17 @@
 
 (defmulti field-schema (fn [field & _] (field-type field)))
 
-(defn struct-schema [struct & [parents]]
+(defn struct-schema [^Descriptors$Descriptor struct & [parents]]
   (let [struct-name (.getFullName struct)]
     (into {:type :struct
            :name struct-name}
           (when (not-any? (partial = struct-name) parents)
             {:fields (into {}
-                           (for [field (.getFields struct)]
+                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
                              [(PersistentProtocolBufferMap/intern (.getName field))
                               (field-schema field (conj parents struct-name))]))}))))
 
-(defn basic-schema [field & [parents]]
+(defn basic-schema [^Descriptors$FieldDescriptor field & [parents]]
   (let [java-type   (keyword (lower-case (.name (.getJavaType field))))
         meta-string (extension (Extensions/meta) field)]
     (merge (case java-type
@@ -51,7 +51,7 @@
            (when meta-string
              (read-string meta-string)))))
 
-(defn subfield [field field-name]
+(defn subfield [^Descriptors$FieldDescriptor field field-name]
   (.findFieldByName (.getMessageType field) (name field-name)))
 
 (defmethod field-schema :basic [field & [parents]]

From 7eb40c6a768e781687ed7d346339a75dd66a152a Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 27 Mar 2012 14:12:45 -0700
Subject: [PATCH 229/525] A couple more typehints

---
 src/protobuf/core.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index aa8334f..b85b509 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -17,7 +17,7 @@
   [obj]
   (instance? PersistentProtocolBufferMap$Def obj))
 
-(defn protodef
+(defn ^PersistentProtocolBufferMap$Def protodef
   "Create a protodef from a string or protobuf class."
   ([def]
      (if (or (protodef? def) (nil? def))
@@ -69,7 +69,7 @@
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
       (PersistentProtocolBufferMap/parseFrom type in))))
 
-(defn protobuf-dump
+(defn ^"[B" protobuf-dump
   "Return the byte representation of the given protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))

From d813baaede6a4a6516a439127c8f6b4f05f0e0ef Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 27 Mar 2012 14:19:40 -0700
Subject: [PATCH 230/525] beta 12

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 365f6d4..67c5b98 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta11"
+(defproject protobuf "0.6.0-beta12"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From a3508de47d46f255f58733094a72def07c2278e9 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 9 Apr 2012 13:55:56 -0700
Subject: [PATCH 231/525] add nullable enums

---
 proto/protobuf/core/extensions.proto          |  1 +
 proto/protobuf/test/core.proto                | 12 ++++++--
 .../core/PersistentProtocolBufferMap.java     | 28 ++++++++++++++++---
 test/protobuf/core_test.clj                   |  8 ++++--
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/proto/protobuf/core/extensions.proto b/proto/protobuf/core/extensions.proto
index 9d61025..ce44a5a 100644
--- a/proto/protobuf/core/extensions.proto
+++ b/proto/protobuf/core/extensions.proto
@@ -16,4 +16,5 @@ extend google.protobuf.FieldOptions {
   optional sint64 null_long   = 52023;
   optional float  null_float  = 52024;
   optional double null_double = 52025;
+  optional uint32 null_enum   = 52026;
 }
diff --git a/proto/protobuf/test/core.proto b/proto/protobuf/test/core.proto
index c380827..480ec50 100644
--- a/proto/protobuf/test/core.proto
+++ b/proto/protobuf/test/core.proto
@@ -44,9 +44,17 @@ message Bar {
   optional float  flt  = 3 [(nullable) = true, (null_float)  = -0.0001];
   optional double dbl  = 4 [(nullable) = true, (null_double) = -0.00000001];
   optional string str  = 5 [(nullable) = true, (null_string) = "NULL"];
+  optional Enu    enu  = 6 [(nullable) = true, (null_enum)   = 3];
 
-  repeated string label  = 6 [(nullable) = true, (null_string) = "", (succession) = true];
-  repeated string labels = 7 [(nullable) = true, (null_string) = ""];
+  enum Enu {
+    A    = 0;
+    B    = 1;
+    C    = 2;
+    NULL = 3;
+  }
+
+  repeated string label  = 10 [(nullable) = true, (null_string) = "", (succession) = true];
+  repeated string labels = 11 [(nullable) = true, (null_string) = ""];
 }
 
 message Time {
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 43765a5..ce1565d 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -336,7 +336,13 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
       switch (field.getJavaType()) {
       case ENUM:
         Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor) value;
-        return enumToKeyword(e);
+        if (use_extensions &&
+            field.getOptions().getExtension(Extensions.nullable) &&
+            field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
+          return null;
+        } else {
+          return enumToKeyword(e);
+        }
       case MESSAGE:
         Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
         DynamicMessage message = (DynamicMessage) value;
@@ -348,17 +354,30 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
       default:
         if (use_extensions &&
             field.getOptions().getExtension(Extensions.nullable) &&
-            field.getOptions().getExtension(nullExtension(field)).equals(value))
+            field.getOptions().getExtension(nullExtension(field)).equals(value)) {
           return null;
-        return value;
+        } else {
+          return value;
+        }
       }
     }
   }
 
   static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
-    if (value == null && field.getOptions().getExtension(Extensions.nullable))
+    if (value == null && field.getOptions().getExtension(Extensions.nullable)) {
       value = field.getOptions().getExtension(nullExtension(field));
 
+      if (field.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
+        Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
+        Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByNumber((Integer) value);
+        if (enum_value == null) {
+          PrintWriter err = (PrintWriter) RT.ERR.deref();
+          err.format("invalid enum number %s for enum type %s\n", value, enum_type.getFullName());
+        }
+        return enum_value;
+      }
+    }
+
     switch (field.getJavaType()) {
     case LONG:
       if (value instanceof Long) return value;
@@ -405,6 +424,7 @@ static protected GeneratedMessage.GeneratedExtension nullExtension(Descriptors.F
     case FLOAT:  return Extensions.nullFloat;
     case DOUBLE: return Extensions.nullDouble;
     case STRING: return Extensions.nullString;
+    case ENUM:   return Extensions.nullEnum;
     }
     return null;
   }
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index c94146f..f3d98df 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -196,20 +196,22 @@
              (get-raw p :time))))))
 
 (deftest test-nullable
-  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo")
-        keyset #{:int :long :flt :dbl :str}]
+  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
+        keyset #{:int :long :flt :dbl :str :enu}]
     (is (= 1            (get p :int)))
     (is (= 330000000000 (get p :long)))
     (is (= (float 1.23) (get p :flt)))
     (is (= 9.87654321   (get p :dbl)))
     (is (= "foo"        (get p :str)))
+    (is (= :a           (get p :enu)))
     (is (= keyset (set (keys p))))
-    (let [p (append p {:int nil :long nil :flt nil :dbl nil :str nil})]
+    (let [p (append p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
       (is (= nil (get p :int)))
       (is (= nil (get p :long)))
       (is (= nil (get p :flt)))
       (is (= nil (get p :dbl)))
       (is (= nil (get p :str)))
+      (is (= nil (get p :enu)))
       (is (= keyset (set (keys p)))))
     (testing "nullable successions"
       (let [p (protobuf Bar :label "foo")]

From 39c4cf3b6419203faf20bd3890a94c02bb865d33 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 9 Apr 2012 13:59:36 -0700
Subject: [PATCH 232/525] beta13

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 67c5b98..e3a7eee 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta12"
+(defproject protobuf "0.6.0-beta13"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From aa82a470a3cc5d58acd7648d483a5a199953d2bb Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 9 Apr 2012 15:26:21 -0700
Subject: [PATCH 233/525] Fix some incorrect uses of transients.

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index ce1565d..19354f3 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -271,9 +271,9 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
             Object k = v.valAt(map_field_by);
             PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(k);
             if (existing != null) {
-              map.assoc(k, existing.append(v));
+              map = map.assoc(k, existing.append(v));
             } else {
-              map.assoc(k, v);
+              map = map.assoc(k, v);
             }
           }
           return map.persistent();
@@ -297,9 +297,9 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
             Object v = fromProtoValue(val_field, message.getField(val_field));
             Object existing = map.valAt(k);
             if (existing != null && existing instanceof IPersistentCollection) {
-              map.assoc(k, ((IPersistentCollection) existing).cons(v));
+              map = map.assoc(k, ((IPersistentCollection) existing).cons(v));
             } else {
-              map.assoc(k, v);
+              map = map.assoc(k, v);
             }
           }
           return map.persistent();
@@ -315,10 +315,10 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
             Boolean exists = (Boolean) message.getField(exists_field);
 
             if (exists) {
-              set.conj(item);
+              set = (ITransientSet)set.conj(item);
             } else {
               try {
-                set.disjoin(item);
+                set = set.disjoin(item);
               } catch (Exception e) {
                 e.printStackTrace();
               }

From 051482e7d28b8a8e0a9d5133a4c3363875d5c83d Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 9 Apr 2012 15:29:47 -0700
Subject: [PATCH 234/525] Redundant null check.

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 19354f3..927a068 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -296,7 +296,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
             Object k = fromProtoValue(key_field, message.getField(key_field));
             Object v = fromProtoValue(val_field, message.getField(val_field));
             Object existing = map.valAt(k);
-            if (existing != null && existing instanceof IPersistentCollection) {
+            if (existing instanceof IPersistentCollection) {
               map = map.assoc(k, ((IPersistentCollection) existing).cons(v));
             } else {
               map = map.assoc(k, v);

From c8699d40d409cf26b635dbbfe4762f5f14e4811c Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 10 Apr 2012 16:51:13 -0700
Subject: [PATCH 235/525] add schematic dep

---
 project.clj            | 3 ++-
 src/protobuf/codec.clj | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index e3a7eee..baa6547 100644
--- a/project.clj
+++ b/project.clj
@@ -4,7 +4,8 @@
                  [ordered-set "0.2.3"]
                  [useful "0.8.0-alpha1"]
                  [fs "1.0.0"]
-                 [conch "0.2.0"]]
+                 [conch "0.2.0"]
+                 [schematic "0.0.5"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
                      [io "0.1.0-alpha2"]]
   :hooks [leiningen.protobuf]
diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 6f3f08f..35419c4 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -6,6 +6,7 @@
         [useful.experimental :only [lift-meta]]
         [clojure.java.io :only [input-stream]])
   (:require io.core
+            [schematic.core :as schema]
             [gloss.core :as gloss]))
 
 (declare protobuf-codec)
@@ -48,4 +49,5 @@
         (fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
                               :prefix :none))
-        (with-meta {:schema (protobuf-schema proto)}))))
+        (with-meta {:schema (schema/dissoc-fields (protobuf-schema proto)
+                                                  len-key reset-key)}))))

From 41a32999d78f63352df3e3344ceee8ab2865c6a9 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 12 Apr 2012 16:03:32 -0700
Subject: [PATCH 236/525] Make the use_underscores "mode" per-instance.

Now you can get a protobuf that does, or does not, convert _ to -
without damaging anyone else using the profobuf library in your JVM.

Also, stop pretending that strings and keywords are interchangeable
as map keys - protobuf message fields are always keywords, and any
string keys go in the extmap.
---
 src/protobuf/core.clj                         |  22 +-
 .../core/PersistentProtocolBufferMap.java     | 192 +++++++++---------
 src/protobuf/schema.clj                       |  54 ++---
 test/protobuf/core_test.clj                   |  37 ++--
 4 files changed, 151 insertions(+), 154 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index b85b509..ba34d14 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -2,7 +2,7 @@
   (:use [protobuf.schema :only [field-schema]]
         [useful.fn :only [fix]]
         [clojure.java.io :only [input-stream output-stream]])
-  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
+  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def PersistentProtocolBufferMap$Def$NamingStrategy Extensions)
            (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
            (java.io InputStream OutputStream)
            (clojure.lang Reflector)))
@@ -20,23 +20,17 @@
 (defn ^PersistentProtocolBufferMap$Def protodef
   "Create a protodef from a string or protobuf class."
   ([def]
+     (if (or (protodef? def) (nil? def))
+       def
+       (protodef def PersistentProtocolBufferMap$Def/convertUnderscores)))
+  ([def ^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy]
      (if (or (protodef? def) (nil? def))
        def
        (let [^Descriptors$Descriptor descriptor
              (if (instance? Descriptors$Descriptor def)
                def
                (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil)))]
-         (PersistentProtocolBufferMap$Def/create descriptor))))
-  ([def & fields]
-     (loop [^PersistentProtocolBufferMap$Def def (protodef def)
-            fields fields]
-       (if (empty? fields)
-         def
-         (recur (-> def
-                    (.fieldDescriptor (first fields))
-                    .getMessageType
-                    protodef)
-                (rest fields))))))
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy)))))
 
 (defn protobuf
   "Construct a protobuf of the given type."
@@ -50,7 +44,8 @@
 (defn protobuf-schema
   "Return the schema for the given protodef."
   [& args]
-  (field-schema (.getMessageType ^PersistentProtocolBufferMap$Def (apply protodef args))))
+  (let [^PersistentProtocolBufferMap$Def def (apply protodef args)]
+    (field-schema (.getMessageType def) def)))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
@@ -95,6 +90,7 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
+;; TODO make these functions nil-safe
 (defn append
   "Merge the given map into the protobuf. Equivalent to appending the byte representations."
   [^PersistentProtocolBufferMap p map]
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 927a068..3a7514c 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -4,7 +4,7 @@
  *   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
  *   which can be found in the file epl-v10.html at the root of this distribution.
  *   By using this software in any fashion, you are agreeing to be bound by
- * 	 the terms of this license.
+ *       the terms of this license.
  *   You must not remove this notice, or any other, from this software.
  **/
 
@@ -29,27 +29,52 @@
 
 public class PersistentProtocolBufferMap extends APersistentMap implements IObj {
   public static class Def {
+    public static interface NamingStrategy {
+      String protoName(Keyword name);
+      Keyword clojureName(String name);
+    }
+
+    public static final NamingStrategy protobufNames = new NamingStrategy() {
+        public String protoName(Keyword name) {return name.getName();}
+        public Keyword clojureName(String name) {return Keyword.intern(name.toLowerCase());}
+        public String toString() {return "[protobuf names]";}
+      };
+    public static final NamingStrategy convertUnderscores = new NamingStrategy() {
+        public String protoName(Keyword name) {return name.getName().replaceAll("-", "_");}
+        public Keyword clojureName(String name) {return Keyword.intern(name.replaceAll("_", "-").toLowerCase());}
+        public String toString() {return "[convert underscores]";}
+      };
+
     final Descriptors.Descriptor type;
+    public final NamingStrategy namingStrategy;
     ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
-    static ConcurrentHashMap<Descriptors.Descriptor, Def> type_to_def = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
+    static ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>> type_to_def = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>>();
 
-    public static Def create(Class<?> c) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+    public static Def create(Class<?> c, NamingStrategy strat) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
       Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
-      return create(type);
+      return create(type, strat);
     }
 
-    public static Def create(Descriptors.Descriptor type) {
-      Def def = type_to_def.get(type);
+    public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
+      ConcurrentHashMap<Descriptors.Descriptor, Def> defCache = type_to_def.get(strat);
+      if (defCache == null) {
+        defCache = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
+        ConcurrentHashMap<Descriptors.Descriptor, Def> previous = type_to_def.putIfAbsent(strat, defCache);
+        if (previous != null) defCache = previous;
+      }
+
+      Def def = defCache.get(type);
       if (def == null) {
-        def = new Def(type);
-        type_to_def.putIfAbsent(type, def);
+        def = new Def(type, strat);
+        defCache.putIfAbsent(type, def);
       }
       return def;
     }
 
-    protected Def(Descriptors.Descriptor type) {
+    protected Def(Descriptors.Descriptor type, NamingStrategy strat) {
       this.type             = type;
       this.keyword_to_field = new ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor>();
+      this.namingStrategy   = strat;
     }
 
     public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferException {
@@ -82,13 +107,12 @@ public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
         Keyword keyword = (Keyword) key;
         Descriptors.FieldDescriptor field = keyword_to_field.get(keyword);
         if (field == null) {
-          field = fieldDescriptor(keyword.getName());
+          field = type.findFieldByName(namingStrategy.protoName(keyword));
           if (field != null) keyword_to_field.putIfAbsent(keyword, field);
         }
         return field;
       } else {
-        String name = ((String) key).replaceAll("-","_");
-        return type.findFieldByName(name);
+        return null;
       }
     }
 
@@ -103,9 +127,36 @@ public String getFullName() {
     public Descriptors.Descriptor getMessageType() {
       return type;
     }
+    static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Keyword>> caches =
+      new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Keyword>>();
+    public Keyword intern(String name) {
+      ConcurrentHashMap<String, Keyword> nameCache = caches.get(namingStrategy);
+      if (nameCache == null) {
+        nameCache = new ConcurrentHashMap<String, Keyword>();
+        ConcurrentHashMap<String, Keyword> existing = caches.putIfAbsent(namingStrategy, nameCache);
+        if (existing != null) nameCache = existing;
+      }
+      Keyword keyword = nameCache.get(name);
+      if (keyword == null) {
+        keyword = namingStrategy.clojureName(name);
+        Keyword existing = nameCache.putIfAbsent(name, keyword);
+        if (existing != null) keyword = existing;
+      }
+      return keyword;
+    }
+
+    public Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
+      return intern(enum_value.getName());
+    }
+
+    static final Keyword k_null = Keyword.intern(Symbol.intern(""));
+    protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
+      Keyword keyword = intern(field.getOptions().getExtension(Extensions.mapBy));
+      return keyword == k_null ? null : keyword;
+    }
   }
 
-  private final Def def;
+  public final Def def;
   private final DynamicMessage message;
   private final IPersistentMap _meta;
   private final IPersistentMap ext;
@@ -203,66 +254,21 @@ protected DynamicMessage.Builder builder() {
     }
   }
 
-  static boolean use_underscores = false;
-  static public void setUseUnderscores(boolean val) {
-    use_underscores = val;
-    field_name_to_keyword.clear();
-    enum_to_keyword.clear();
-    map_field_by.clear();
-  }
-
-  static ConcurrentHashMap<String, Keyword> field_name_to_keyword =
-     new ConcurrentHashMap<String, Keyword>();
-  static public Keyword intern(String name) {
-    Keyword keyword = field_name_to_keyword.get(name);
-    if (keyword == null) {
-      name = name.toLowerCase();
-      if (!use_underscores) name = name.replaceAll("_","-");
-      keyword = Keyword.intern(Symbol.intern(name));
-      field_name_to_keyword.putIfAbsent(name, keyword);
-    }
-    return keyword;
-  }
-
-  static ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword> enum_to_keyword =
-     new ConcurrentHashMap<Descriptors.EnumValueDescriptor, Keyword>();
-  static public Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
-    Keyword keyword = enum_to_keyword.get(enum_value);
-    if (keyword == null) {
-      keyword = intern(enum_value.getName());
-      enum_to_keyword.putIfAbsent(enum_value, keyword);
-    }
-    return keyword;
-  }
-
-  static Keyword k_null = Keyword.intern(Symbol.intern(""));
-  static ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword> map_field_by =
-     new ConcurrentHashMap<Descriptors.FieldDescriptor, Keyword>();
-  static protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
-    Keyword keyword = map_field_by.get(field);
-    if (keyword == null) {
-      String name = field.getOptions().getExtension(Extensions.mapBy);
-      keyword = intern(name);
-      map_field_by.putIfAbsent(field, keyword);
-    }
-    return keyword == k_null ? null : keyword;
-  }
-
-  static Keyword k_key    = Keyword.intern(Symbol.intern("key"));
-  static Keyword k_val    = Keyword.intern(Symbol.intern("val"));
-  static Keyword k_item   = Keyword.intern(Symbol.intern("item"));
-  static Keyword k_exists = Keyword.intern(Symbol.intern("exists"));
-  static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
+  protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value) {
     return fromProtoValue(field, value, true);
   }
 
-  static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value, boolean use_extensions) {
+  static Keyword k_key    = Keyword.intern("key");
+  static Keyword k_val    = Keyword.intern("val");
+  static Keyword k_item   = Keyword.intern("item");
+  static Keyword k_exists = Keyword.intern("exists");
+  protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value, boolean use_extensions) {
     if (value instanceof List) {
       List values = (List) value;
       Iterator iterator = values.iterator();
 
       if (use_extensions) {
-        Keyword map_field_by = mapFieldBy(field);
+        Keyword map_field_by = def.mapFieldBy(field);
         DescriptorProtos.FieldOptions options = field.getOptions();
         if (map_field_by != null) {
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
@@ -286,9 +292,9 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
         } else if (options.getExtension(Extensions.succession)) {
           return fromProtoValue(field, values.get(values.size() - 1));
         } else if (options.getExtension(Extensions.map)) {
-          Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-          Descriptors.FieldDescriptor key_field = def.fieldDescriptor(k_key);
-          Descriptors.FieldDescriptor val_field = def.fieldDescriptor(k_val);
+          Descriptors.Descriptor type = field.getMessageType();
+          Descriptors.FieldDescriptor key_field = type.findFieldByName("key");
+          Descriptors.FieldDescriptor val_field = type.findFieldByName("val");
 
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
@@ -304,9 +310,9 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
           }
           return map.persistent();
         } else if (options.getExtension(Extensions.set)) {
-          Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-          Descriptors.FieldDescriptor item_field  = def.fieldDescriptor(k_item);
-          Descriptors.FieldDescriptor exists_field = def.fieldDescriptor(k_exists);
+          Descriptors.Descriptor type = field.getMessageType();
+          Descriptors.FieldDescriptor item_field = type.findFieldByName("item");
+          Descriptors.FieldDescriptor exists_field = type.findFieldByName("exists");
 
           ITransientSet set = (ITransientSet) OrderedSet.EMPTY.asTransient();
           while (iterator.hasNext()) {
@@ -341,16 +347,16 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
             field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
           return null;
         } else {
-          return enumToKeyword(e);
+          return def.enumToKeyword(e);
         }
       case MESSAGE:
-        Def def = PersistentProtocolBufferMap.Def.create(field.getMessageType());
+        Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(), this.def.namingStrategy);
         DynamicMessage message = (DynamicMessage) value;
 
         // Total hack because getField() doesn't return an empty array for repeated messages.
         if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList(), use_extensions);
 
-        return new PersistentProtocolBufferMap(null, def, message);
+        return new PersistentProtocolBufferMap(null, fieldDef, message);
       default:
         if (use_extensions &&
             field.getOptions().getExtension(Extensions.nullable) &&
@@ -363,7 +369,7 @@ static protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object
     }
   }
 
-  static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
+  protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
     if (value == null && field.getOptions().getExtension(Extensions.nullable)) {
       value = field.getOptions().getExtension(nullExtension(field));
 
@@ -408,8 +414,8 @@ static protected Object toProtoValue(Descriptors.FieldDescriptor field, Object v
       if (value instanceof PersistentProtocolBufferMap) {
         protobuf = (PersistentProtocolBufferMap) value;
       } else {
-        Def def  = PersistentProtocolBufferMap.Def.create(field.getMessageType());
-        protobuf = PersistentProtocolBufferMap.construct(def, (IPersistentMap) value);
+        Def fieldDef  = PersistentProtocolBufferMap.Def.create(field.getMessageType(), this.def.namingStrategy);
+        protobuf = PersistentProtocolBufferMap.construct(fieldDef, (IPersistentMap) value);
       }
       return protobuf.message();
     default:
@@ -466,40 +472,36 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
           addRepeatedField(builder,field, v);
         }
       } else {
-        Keyword map_field_by = mapFieldBy(field);
+        Keyword map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             IPersistentMap map = (IPersistentMap) e.getValue();
             Object k = e.getKey();
-            Object v = toProtoValue(field, map.assoc(map_field_by, k).assoc(map_field_by.getName(), k));
+            Object v = toProtoValue(field, map.assoc(map_field_by, k));
             addRepeatedField(builder, field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
-            Object v = toProtoValue(field, new PersistentArrayMap(map));
-            addRepeatedField(builder, field, v);
+            addRepeatedField(builder, field, toProtoValue(field, new PersistentArrayMap(map)));
           }
         } else if (set) {
-          if (value instanceof IPersistentMap) {
-            for (ISeq s = RT.seq(value); s != null; s = s.next()) {
+          Object k, v;
+          boolean isMap = (value instanceof IPersistentMap);
+          for (ISeq s = RT.seq(value); s != null; s = s.next()) {
+            if (isMap) {
               Map.Entry e = (Map.Entry) s.first();
-              Object[] map = {k_item, e.getKey(), k_exists, e.getValue()};
-              Object v = toProtoValue(field, new PersistentArrayMap(map));
-              addRepeatedField(builder, field, v);
-            }
-          } else {
-            for (ISeq s = RT.seq(value); s != null; s = s.next()) {
-              Object[] map = {k_item, s.first(), k_exists, true};
-              Object v = toProtoValue(field, new PersistentArrayMap(map));
-              addRepeatedField(builder, field, v);
+              k = e.getKey(); v = e.getValue();
+            } else {
+              k = s.first(); v = true;
             }
+            Object[] map = {k_item, k, k_exists, v};
+            addRepeatedField(builder, field, toProtoValue(field, new PersistentArrayMap(map)));
           }
         } else {
-          Object v = toProtoValue(field, value);
-          addRepeatedField(builder, field, v);
+          addRepeatedField(builder, field, toProtoValue(field, value));
         }
       }
     } else {
@@ -656,7 +658,7 @@ private static class Seq extends ASeq {
     public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
       for (ISeq s = fields; s != null; s = s.next()) {
         Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
-        Keyword k = intern(field.getName());
+        Keyword k = proto.def.intern(field.getName());
         Object  v = proto.valAt(k, sentinel);
         if (v != sentinel) return new Seq(meta, proto, new MapEntry(k, v), s);
       }
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index d943184..a1442ac 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -25,25 +25,29 @@
     Descriptors$Descriptor
     :struct))
 
-(defmulti field-schema (fn [field & _] (field-type field)))
+(defmulti field-schema (fn [field def & _] (field-type field)))
 
-(defn struct-schema [^Descriptors$Descriptor struct & [parents]]
+(defn struct-schema [^Descriptors$Descriptor          struct
+                     ^PersistentProtocolBufferMap$Def def
+                     & [parents]]
   (let [struct-name (.getFullName struct)]
     (into {:type :struct
            :name struct-name}
           (when (not-any? (partial = struct-name) parents)
             {:fields (into {}
                            (for [^Descriptors$FieldDescriptor field (.getFields struct)]
-                             [(PersistentProtocolBufferMap/intern (.getName field))
-                              (field-schema field (conj parents struct-name))]))}))))
+                             [(.intern def (.getName field))
+                              (field-schema field def (conj parents struct-name))]))}))))
 
-(defn basic-schema [^Descriptors$FieldDescriptor field & [parents]]
+(defn basic-schema [^Descriptors$FieldDescriptor     field
+                    ^PersistentProtocolBufferMap$Def def
+                     & [parents]]
   (let [java-type   (keyword (lower-case (.name (.getJavaType field))))
         meta-string (extension (Extensions/meta) field)]
     (merge (case java-type
-             :message (struct-schema (.getMessageType field) parents)
+             :message (struct-schema (.getMessageType field) def parents)
              :enum    {:type   :enum
-                       :values (set (map #(PersistentProtocolBufferMap/enumToKeyword %)
+                       :values (set (map #(.enumToKeyword def %)
                                          (.. field getEnumType getValues)))}
              {:type java-type})
            (when (.hasDefaultValue field)
@@ -54,35 +58,35 @@
 (defn subfield [^Descriptors$FieldDescriptor field field-name]
   (.findFieldByName (.getMessageType field) (name field-name)))
 
-(defmethod field-schema :basic [field & [parents]]
-  (basic-schema field parents))
+(defmethod field-schema :basic [field def & [parents]]
+  (basic-schema field def parents))
 
-(defmethod field-schema :list [field & [parents]]
+(defmethod field-schema :list [field def & [parents]]
   {:type   :list
-   :values (basic-schema field parents)})
+   :values (basic-schema field def parents)})
 
-(defmethod field-schema :succession [field & [parents]]
-  (assoc (basic-schema field parents)
+(defmethod field-schema :succession [field def & [parents]]
+  (assoc (basic-schema field def parents)
     :succession true))
 
-(defmethod field-schema :counter [field & [parents]]
-  (assoc (basic-schema field parents)
+(defmethod field-schema :counter [field def & [parents]]
+  (assoc (basic-schema field def parents)
     :counter true))
 
-(defmethod field-schema :set [field & [parents]]
+(defmethod field-schema :set [field def & [parents]]
   {:type   :set
-   :values (field-schema (subfield field :item) parents)})
+   :values (field-schema (subfield field :item) def parents)})
 
-(defmethod field-schema :map [field & [parents]]
+(defmethod field-schema :map [field def & [parents]]
   {:type   :map
-   :keys   (field-schema (subfield field :key) parents)
-   :values (field-schema (subfield field :val) parents)})
+   :keys   (field-schema (subfield field :key) def parents)
+   :values (field-schema (subfield field :val) def parents)})
 
-(defmethod field-schema :map-by [field & [parents]]
+(defmethod field-schema :map-by [field def & [parents]]
   (let [map-by (extension (Extensions/mapBy) field)]
     {:type   :map
-     :keys   (field-schema (subfield field map-by) parents)
-     :values (basic-schema field parents)}))
+     :keys   (field-schema (subfield field map-by) def parents)
+     :values (basic-schema field def parents)}))
 
-(defmethod field-schema :struct [field & [parents]]
-  (struct-schema field parents))
+(defmethod field-schema :struct [field def & [parents]]
+  (struct-schema field def parents))
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index f3d98df..b4424ec 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -3,6 +3,8 @@
   (:import (java.io PipedInputStream PipedOutputStream)))
 
 (def Foo      (protodef protobuf.test.Core$Foo))
+(def FooUnder (protodef protobuf.test.Core$Foo
+                        protobuf.core.PersistentProtocolBufferMap$Def/protobufNames))
 (def Bar      (protodef protobuf.test.Core$Bar))
 (def Response (protodef protobuf.test.Core$Response))
 (def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
@@ -54,7 +56,7 @@
     (let [p (assoc p :label "baz" :tags ["nuprin"])]
       (is (= ["nuprin"] (:tags p)))
       (is (= "baz"      (:label p))))
-    (let [p (assoc p "responses" [:yes :no :maybe :no "yes"])]
+    (let [p (assoc p :responses [:yes :no :maybe :no "yes"])]
       (is (= [:yes :no :maybe :no :yes] (:responses p))))
     (let [p (assoc p :tags "aspirin")]
       (is (= ["aspirin"] (:tags p))))
@@ -96,15 +98,13 @@
     (is (= (into {} m2) (into {} p2)))
     (is (= (set (keys m2)) (set (keys p2))))))
 
-(deftest test-string-keys
-  (let [p (protobuf Foo "id" 5 "label" "rad")]
+(deftest test-string-keys-in-extmap
+  (let [p (protobuf Foo :id 5 :label "red")
+        q (assoc p "label" "blue")]
     (is (= 5 (p :id)))
-    (is (= 5 (p "id")))
-    (is (= "rad" (p :label)))
-    (is (= "rad" (p "label")))
-    (let [p (conj p {"tags" ["check" "it" "out"]})]
-      (is (= ["check" "it" "out"] (p :tags)))
-      (is (= ["check" "it" "out"] (p "tags"))))))
+    (is (not (contains? p "id")))
+    (is (= "red" (q :label)))
+    (is (= "blue" (q "label")))))
 
 (deftest test-append-bytes
   (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
@@ -150,9 +150,6 @@
     (is (= "bar" (get-in p [:item-map "bar" :item])))))
 
 (deftest test-map-by-with-inconsistent-keys
-  (let [p (protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
-    (is (= "hmm" (get-in p [:pair-map "foo" :val])))
-    (is (= nil   (get-in p [:pair-map "bar" :val]))))
   (let [p (protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val])))))
@@ -293,19 +290,17 @@
   (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
-  (let [p (protobuf Foo {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]})]
-    (is (= '(:id :responses :tag-set :deleted)   (keys p)))
-    (is (= [:yes :not-sure :maybe :not-sure :no] (:responses p)))
+  (let [[dashes underscores] (for [proto [Foo FooUnder]]
+                               (protobuf proto {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]}))]
+    (is (= '(:id :responses :tag-set :deleted)   (keys dashes)))
+    (is (= [:yes :not-sure :maybe :not-sure :no] (:responses dashes)))
 
-    (protobuf.core.PersistentProtocolBufferMap/setUseUnderscores true)
-    (is (= '(:id :responses :tag_set :deleted)   (keys p)))
-    (is (= [:yes :not_sure :maybe :not_sure :no] (:responses p)))
+    (is (= '(:id :responses :tag_set :deleted)   (keys underscores)))
+    (is (= [:yes :not_sure :maybe :not_sure :no] (:responses underscores)))
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
              :pair_map :groups :doubles :floats :item_map :counts :time :lat :long}
-           (-> (protobuf-schema Foo) :fields keys set)))
-
-    (protobuf.core.PersistentProtocolBufferMap/setUseUnderscores false)))
+           (-> (protobuf-schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message
   (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]

From 923fda6364303beba4c501fbd2554d138625dc25 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 13 Apr 2012 13:20:35 -0700
Subject: [PATCH 237/525] Go back to treating strings and keywords the same.

Also, no longer automatically convert enum names to and from uppercase.
Just use a proto that has lower-case enum names if you want lower-case
keywords.
---
 proto/protobuf/test/core.proto                |  16 +--
 src/protobuf/core.clj                         |   2 +-
 .../core/PersistentProtocolBufferMap.java     | 113 +++++++++++-------
 src/protobuf/schema.clj                       |   2 +-
 test/protobuf/core_test.clj                   |  23 ++--
 5 files changed, 93 insertions(+), 63 deletions(-)

diff --git a/proto/protobuf/test/core.proto b/proto/protobuf/test/core.proto
index 480ec50..0bb5612 100644
--- a/proto/protobuf/test/core.proto
+++ b/proto/protobuf/test/core.proto
@@ -23,10 +23,10 @@ message Foo {
   repeated Time time = 11 [(succession) = true];
 
   enum Response {
-    YES      = 0;
-    NO       = 1;
-    MAYBE    = 2;
-    NOT_SURE = 3;
+    yes      = 0;
+    no       = 1;
+    maybe    = 2;
+    not_sure = 3;
   }
 
   repeated Item  tag_set   = 20 [(set)    = true];
@@ -47,10 +47,10 @@ message Bar {
   optional Enu    enu  = 6 [(nullable) = true, (null_enum)   = 3];
 
   enum Enu {
-    A    = 0;
-    B    = 1;
-    C    = 2;
-    NULL = 3;
+    a    = 0;
+    b    = 1;
+    c    = 2;
+    nil  = 3;
   }
 
   repeated string label  = 10 [(nullable) = true, (null_string) = "", (succession) = true];
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index ba34d14..e47d2ea 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -24,7 +24,7 @@
        def
        (protodef def PersistentProtocolBufferMap$Def/convertUnderscores)))
   ([def ^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy]
-     (if (or (protodef? def) (nil? def))
+     (if (nil? def)
        def
        (let [^Descriptors$Descriptor descriptor
              (if (instance? Descriptors$Descriptor def)
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 3a7514c..d48dd31 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -30,24 +30,45 @@
 public class PersistentProtocolBufferMap extends APersistentMap implements IObj {
   public static class Def {
     public static interface NamingStrategy {
-      String protoName(Keyword name);
-      Keyword clojureName(String name);
+      /**
+       * Given a Clojure map key, return the string to be used as the protobuf message field name.
+       */
+      String protoName(Object clojureName);
+      
+      /**
+       * Given a protobuf message field name, return a Clojure object suitable for use as a map key.
+       */
+      Object clojureName(String protoName);
+    }
+
+    // we want this to work for anything Named, so use clojure.core/name
+    public static final Var NAME_VAR = Var.intern(RT.CLOJURE_NS, Symbol.intern("name"));
+    public static final String nameStr(Object named) {
+      try {
+        return (String)((IFn)NAME_VAR.deref()).invoke(named);
+      } catch (Exception e) {
+        return null;
+      }
     }
 
     public static final NamingStrategy protobufNames = new NamingStrategy() {
-        public String protoName(Keyword name) {return name.getName();}
-        public Keyword clojureName(String name) {return Keyword.intern(name.toLowerCase());}
+        public String protoName(Object name) {return nameStr(name);}
+        public Object clojureName(String name) {return Keyword.intern(name.toLowerCase());}
         public String toString() {return "[protobuf names]";}
       };
     public static final NamingStrategy convertUnderscores = new NamingStrategy() {
-        public String protoName(Keyword name) {return name.getName().replaceAll("-", "_");}
-        public Keyword clojureName(String name) {return Keyword.intern(name.replaceAll("_", "-").toLowerCase());}
+        public String protoName(Object name) {return nameStr(name).replaceAll("-", "_");}
+        public Object clojureName(String name) {return Keyword.intern(name.replaceAll("_", "-").toLowerCase());}
         public String toString() {return "[convert underscores]";}
       };
 
     final Descriptors.Descriptor type;
     public final NamingStrategy namingStrategy;
-    ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor> keyword_to_field;
+
+    public static final Object NULL = new Object();
+    // keys should be FieldDescriptors, except that NULL is used as a replacement for real null
+    ConcurrentHashMap<Object, Object> key_to_field;
+    
     static ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>> type_to_def = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>>();
 
     public static Def create(Class<?> c, NamingStrategy strat) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
@@ -72,9 +93,9 @@ public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
     }
 
     protected Def(Descriptors.Descriptor type, NamingStrategy strat) {
-      this.type             = type;
-      this.keyword_to_field = new ConcurrentHashMap<Keyword, Descriptors.FieldDescriptor>();
-      this.namingStrategy   = strat;
+      this.type           = type;
+      this.key_to_field   = new ConcurrentHashMap<Object, Object>();
+      this.namingStrategy = strat;
     }
 
     public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferException {
@@ -102,17 +123,20 @@ public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
       if (key == null) return null;
 
       if (key instanceof Descriptors.FieldDescriptor) {
-        return (Descriptors.FieldDescriptor) key;
-      } else if (key instanceof Keyword) {
-        Keyword keyword = (Keyword) key;
-        Descriptors.FieldDescriptor field = keyword_to_field.get(keyword);
-        if (field == null) {
-          field = type.findFieldByName(namingStrategy.protoName(keyword));
-          if (field != null) keyword_to_field.putIfAbsent(keyword, field);
-        }
-        return field;
+        return (Descriptors.FieldDescriptor)key;
       } else {
-        return null;
+        Object field = key_to_field.get(key);
+        if (field != null) {
+          if (field == NULL) {
+            return null;
+          }
+          return (Descriptors.FieldDescriptor)field;
+        }
+        else {
+          field = type.findFieldByName(namingStrategy.protoName(key));
+          key_to_field.putIfAbsent(key, field == null ? NULL : field);
+        }
+        return (Descriptors.FieldDescriptor)field;
       }
     }
 
@@ -127,32 +151,32 @@ public String getFullName() {
     public Descriptors.Descriptor getMessageType() {
       return type;
     }
-    static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Keyword>> caches =
-      new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Keyword>>();
-    public Keyword intern(String name) {
-      ConcurrentHashMap<String, Keyword> nameCache = caches.get(namingStrategy);
+    static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>> caches =
+      new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>>();
+    public Object intern(String name) {
+      ConcurrentHashMap<String, Object> nameCache = caches.get(namingStrategy);
       if (nameCache == null) {
-        nameCache = new ConcurrentHashMap<String, Keyword>();
-        ConcurrentHashMap<String, Keyword> existing = caches.putIfAbsent(namingStrategy, nameCache);
+        nameCache = new ConcurrentHashMap<String, Object>();
+        ConcurrentHashMap<String, Object> existing = caches.putIfAbsent(namingStrategy, nameCache);
         if (existing != null) nameCache = existing;
       }
-      Keyword keyword = nameCache.get(name);
-      if (keyword == null) {
-        keyword = namingStrategy.clojureName(name);
-        Keyword existing = nameCache.putIfAbsent(name, keyword);
-        if (existing != null) keyword = existing;
+      Object clojureName = nameCache.get(name);
+      if (clojureName == null) {
+        clojureName = namingStrategy.clojureName(name);
+        Object existing = nameCache.putIfAbsent(name, clojureName);
+        if (existing != null) clojureName = existing;
       }
-      return keyword;
+      return clojureName;
     }
 
-    public Keyword enumToKeyword(Descriptors.EnumValueDescriptor enum_value) {
+    public Object clojureEnumValue(Descriptors.EnumValueDescriptor enum_value) {
       return intern(enum_value.getName());
     }
 
-    static final Keyword k_null = Keyword.intern(Symbol.intern(""));
-    protected Keyword mapFieldBy(Descriptors.FieldDescriptor field) {
-      Keyword keyword = intern(field.getOptions().getExtension(Extensions.mapBy));
-      return keyword == k_null ? null : keyword;
+    static final Object k_null = Keyword.intern(Symbol.intern(""));
+    protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
+      Object key = intern(field.getOptions().getExtension(Extensions.mapBy));
+      return key == k_null ? null : key;
     }
   }
 
@@ -268,7 +292,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
       Iterator iterator = values.iterator();
 
       if (use_extensions) {
-        Keyword map_field_by = def.mapFieldBy(field);
+        Object map_field_by = def.mapFieldBy(field);
         DescriptorProtos.FieldOptions options = field.getOptions();
         if (map_field_by != null) {
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
@@ -347,7 +371,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
             field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
           return null;
         } else {
-          return def.enumToKeyword(e);
+          return def.clojureEnumValue(e);
         }
       case MESSAGE:
         Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(), this.def.namingStrategy);
@@ -400,8 +424,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
       if (value instanceof Float)   return new Double((Float) value);
       return value;
     case ENUM:
-      String name = (value instanceof Keyword) ? ((Keyword) value).getName() : (String) value;
-      name = name.toUpperCase().replaceAll("-","_");
+      String name = def.namingStrategy.protoName(value);
       Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
       Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
       if (enum_value == null) {
@@ -438,7 +461,7 @@ static protected GeneratedMessage.GeneratedExtension nullExtension(Descriptors.F
   protected void addRepeatedField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {
     try {
       builder.addRepeatedField(field, value);
-    } catch (IllegalArgumentException e) {
+    } catch (Exception e) {
       String msg = String.format("error adding %s to %s field %s",
                                  value, field.getJavaType().toString().toLowerCase(),
                                  field.getFullName());
@@ -469,10 +492,10 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
       if (value instanceof Sequential && !set) {
         for (ISeq s = RT.seq(value); s != null; s = s.next()) {
           Object v = toProtoValue(field, s.first());
-          addRepeatedField(builder,field, v);
+          addRepeatedField(builder, field, v);
         }
       } else {
-        Keyword map_field_by = def.mapFieldBy(field);
+        Object map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry e = (Map.Entry) s.first();
@@ -658,7 +681,7 @@ private static class Seq extends ASeq {
     public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
       for (ISeq s = fields; s != null; s = s.next()) {
         Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
-        Keyword k = proto.def.intern(field.getName());
+        Object k = proto.def.intern(field.getName());
         Object  v = proto.valAt(k, sentinel);
         if (v != sentinel) return new Seq(meta, proto, new MapEntry(k, v), s);
       }
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index a1442ac..1702c9c 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -47,7 +47,7 @@
     (merge (case java-type
              :message (struct-schema (.getMessageType field) def parents)
              :enum    {:type   :enum
-                       :values (set (map #(.enumToKeyword def %)
+                       :values (set (map #(.clojureEnumValue def %)
                                          (.. field getEnumType getValues)))}
              {:type java-type})
            (when (.hasDefaultValue field)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index b4424ec..0f4fa5f 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -98,13 +98,15 @@
     (is (= (into {} m2) (into {} p2)))
     (is (= (set (keys m2)) (set (keys p2))))))
 
-(deftest test-string-keys-in-extmap
-  (let [p (protobuf Foo :id 5 :label "red")
-        q (assoc p "label" "blue")]
+(deftest test-string-keys
+  (let [p (protobuf Foo "id" 5 "label" "rad")]
     (is (= 5 (p :id)))
-    (is (not (contains? p "id")))
-    (is (= "red" (q :label)))
-    (is (= "blue" (q "label")))))
+    (is (= 5 (p "id")))
+    (is (= "rad" (p :label)))
+    (is (= "rad" (p "label")))
+    (let [p (conj p {"tags" ["check" "it" "out"]})]
+      (is (= ["check" "it" "out"] (p :tags)))
+      (is (= ["check" "it" "out"] (p "tags"))))))
 
 (deftest test-append-bytes
   (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
@@ -150,6 +152,9 @@
     (is (= "bar" (get-in p [:item-map "bar" :item])))))
 
 (deftest test-map-by-with-inconsistent-keys
+  (let [p (protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
+    (is (= "hmm" (get-in p [:pair-map "foo" :val])))
+    (is (= nil   (get-in p [:pair-map "bar" :val]))))
   (let [p (protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val])))))
@@ -290,8 +295,10 @@
   (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
-  (let [[dashes underscores] (for [proto [Foo FooUnder]]
-                               (protobuf proto {:tag_set ["odd"] :responses [:yes :not-sure :maybe :not-sure :no]}))]
+  (let [dashes      (protobuf Foo      {:tag_set ["odd"]
+                                        :responses [:yes :not-sure :maybe :not-sure :no]})
+        underscores (protobuf FooUnder {:tag_set ["odd"]
+                                        :responses [:yes :not_sure :maybe :not_sure :no]})]
     (is (= '(:id :responses :tag-set :deleted)   (keys dashes)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses dashes)))
 

From 43db0bcfe09452a9b9d9d58cd6e55cb3dfb7b54a Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 13 Apr 2012 16:35:37 -0700
Subject: [PATCH 238/525] beta 14

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index baa6547..b24fd47 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta13"
+(defproject protobuf "0.6.0-beta14"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
                  [ordered-set "0.2.3"]

From 1b9299ea7970ac64b78eb051493b24b59ed87bcf Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 14:19:05 -0700
Subject: [PATCH 239/525] Replace uses of raw types with generics

---
 .../core/PersistentProtocolBufferMap.java     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index d48dd31..b416b1f 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.lang.reflect.InvocationTargetException;
+import com.google.protobuf.DescriptorProtos.FieldOptions;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Descriptors;
@@ -288,8 +289,8 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value)
   static Keyword k_exists = Keyword.intern("exists");
   protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value, boolean use_extensions) {
     if (value instanceof List) {
-      List values = (List) value;
-      Iterator iterator = values.iterator();
+      List<?> values = (List<?>) value;
+      Iterator<?> iterator = values.iterator();
 
       if (use_extensions) {
         Object map_field_by = def.mapFieldBy(field);
@@ -378,7 +379,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
         DynamicMessage message = (DynamicMessage) value;
 
         // Total hack because getField() doesn't return an empty array for repeated messages.
-        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList(), use_extensions);
+        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList<Object>(), use_extensions);
 
         return new PersistentProtocolBufferMap(null, fieldDef, message);
       default:
@@ -446,7 +447,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
     }
   }
 
-  static protected GeneratedMessage.GeneratedExtension nullExtension(Descriptors.FieldDescriptor field) {
+  static protected GeneratedMessage.GeneratedExtension<FieldOptions, ?> nullExtension(Descriptors.FieldDescriptor field) {
     switch (field.getJavaType()) {
     case LONG:   return Extensions.nullLong;
     case INT:    return Extensions.nullInt;
@@ -498,7 +499,7 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
         Object map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
-            Map.Entry e = (Map.Entry) s.first();
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
             IPersistentMap map = (IPersistentMap) e.getValue();
             Object k = e.getKey();
             Object v = toProtoValue(field, map.assoc(map_field_by, k));
@@ -506,7 +507,7 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
-            Map.Entry e = (Map.Entry) s.first();
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
             addRepeatedField(builder, field, toProtoValue(field, new PersistentArrayMap(map)));
           }
@@ -515,7 +516,7 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
           boolean isMap = (value instanceof IPersistentMap);
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             if (isMap) {
-              Map.Entry e = (Map.Entry) s.first();
+              Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
               k = e.getKey(); v = e.getValue();
             } else {
               k = s.first(); v = true;
@@ -611,7 +612,7 @@ public IPersistentMap assocEx(Object key, Object value) throws Exception {
   public IPersistentCollection cons(Object o) {
     DynamicMessage.Builder builder = builder();
     if (o instanceof Map.Entry) {
-      Map.Entry e = (Map.Entry) o;
+      Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
       addField(builder, e.getKey(), e.getValue());
     } else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector) o;
@@ -619,7 +620,7 @@ public IPersistentCollection cons(Object o) {
       addField(builder, v.nth(0), v.nth(1));
     } else {
       for (ISeq s = RT.seq(o); s != null; s = s.next()) {
-        Map.Entry e = (Map.Entry) s.first();
+        Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
         addField(builder, e.getKey(), e.getValue());
       }
     }
@@ -650,7 +651,7 @@ public IPersistentMap without(Object key) throws Exception {
     return new PersistentProtocolBufferMap(meta(), ext, def, builder().clearField(field));
   }
 
-  public Iterator iterator() {
+  public Iterator<?> iterator() {
     return new SeqIterator(seq());
   }
 

From 5e7f7e422fe873cb8f20e224d4573ef8d5509e17 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 14:19:16 -0700
Subject: [PATCH 240/525] Remove dead code

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index b416b1f..bd17407 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -186,8 +186,6 @@ protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
   private final IPersistentMap _meta;
   private final IPersistentMap ext;
 
-  private DynamicMessage built_message;
-
   static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws InvalidProtocolBufferException {
     DynamicMessage message = def.parseFrom(bytes);
     return new PersistentProtocolBufferMap(null, def, message);
@@ -656,7 +654,6 @@ public Iterator<?> iterator() {
   }
 
   public int count() {
-    DynamicMessage message = message();
     int count = RT.count(ext);
     for (Descriptors.FieldDescriptor field : def.type.getFields()) {
       if (protoContainsKey(field)) {

From aa2444031b4e233e6799aa89cb94c8a674596a2e Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 14:19:34 -0700
Subject: [PATCH 241/525] Fold default into switch/case

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index bd17407..e4b2b46 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -453,8 +453,8 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
     case DOUBLE: return Extensions.nullDouble;
     case STRING: return Extensions.nullString;
     case ENUM:   return Extensions.nullEnum;
+    default:     return null;
     }
-    return null;
   }
 
   protected void addRepeatedField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {

From 0aa36f6ad0585263139a41d673772a7eda2f9f7d Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 14:56:55 -0700
Subject: [PATCH 242/525] Regularize whitespace with Eclipse

---
 .../core/PersistentProtocolBufferMap.java     | 391 ++++++++++--------
 1 file changed, 225 insertions(+), 166 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index e4b2b46..d61549d 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -28,6 +28,7 @@
 import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.GeneratedMessage;
 
+
 public class PersistentProtocolBufferMap extends APersistentMap implements IObj {
   public static class Def {
     public static interface NamingStrategy {
@@ -35,7 +36,7 @@ public static interface NamingStrategy {
        * Given a Clojure map key, return the string to be used as the protobuf message field name.
        */
       String protoName(Object clojureName);
-      
+
       /**
        * Given a protobuf message field name, return a Clojure object suitable for use as a map key.
        */
@@ -44,6 +45,7 @@ public static interface NamingStrategy {
 
     // we want this to work for anything Named, so use clojure.core/name
     public static final Var NAME_VAR = Var.intern(RT.CLOJURE_NS, Symbol.intern("name"));
+
     public static final String nameStr(Object named) {
       try {
         return (String)((IFn)NAME_VAR.deref()).invoke(named);
@@ -53,15 +55,31 @@ public static final String nameStr(Object named) {
     }
 
     public static final NamingStrategy protobufNames = new NamingStrategy() {
-        public String protoName(Object name) {return nameStr(name);}
-        public Object clojureName(String name) {return Keyword.intern(name.toLowerCase());}
-        public String toString() {return "[protobuf names]";}
-      };
+      public String protoName(Object name) {
+        return nameStr(name);
+      }
+
+      public Object clojureName(String name) {
+        return Keyword.intern(name.toLowerCase());
+      }
+
+      public String toString() {
+        return "[protobuf names]";
+      }
+    };
     public static final NamingStrategy convertUnderscores = new NamingStrategy() {
-        public String protoName(Object name) {return nameStr(name).replaceAll("-", "_");}
-        public Object clojureName(String name) {return Keyword.intern(name.replaceAll("_", "-").toLowerCase());}
-        public String toString() {return "[convert underscores]";}
-      };
+      public String protoName(Object name) {
+        return nameStr(name).replaceAll("-", "_");
+      }
+
+      public Object clojureName(String name) {
+        return Keyword.intern(name.replaceAll("_", "-").toLowerCase());
+      }
+
+      public String toString() {
+        return "[convert underscores]";
+      }
+    };
 
     final Descriptors.Descriptor type;
     public final NamingStrategy namingStrategy;
@@ -69,11 +87,13 @@ public static final String nameStr(Object named) {
     public static final Object NULL = new Object();
     // keys should be FieldDescriptors, except that NULL is used as a replacement for real null
     ConcurrentHashMap<Object, Object> key_to_field;
-    
+
     static ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>> type_to_def = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>>();
 
-    public static Def create(Class<?> c, NamingStrategy strat) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-      Descriptors.Descriptor type = (Descriptors.Descriptor) c.getMethod("getDescriptor").invoke(null);
+    public static Def create(Class<?> c, NamingStrategy strat) throws NoSuchMethodException,
+            IllegalAccessException, InvocationTargetException {
+      Descriptors.Descriptor type = (Descriptors.Descriptor)c.getMethod("getDescriptor").invoke(
+        null);
       return create(type, strat);
     }
 
@@ -81,8 +101,10 @@ public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
       ConcurrentHashMap<Descriptors.Descriptor, Def> defCache = type_to_def.get(strat);
       if (defCache == null) {
         defCache = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
-        ConcurrentHashMap<Descriptors.Descriptor, Def> previous = type_to_def.putIfAbsent(strat, defCache);
-        if (previous != null) defCache = previous;
+        ConcurrentHashMap<Descriptors.Descriptor, Def> previous = type_to_def.putIfAbsent(strat,
+          defCache);
+        if (previous != null)
+          defCache = previous;
       }
 
       Def def = defCache.get(type);
@@ -94,8 +116,8 @@ public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
     }
 
     protected Def(Descriptors.Descriptor type, NamingStrategy strat) {
-      this.type           = type;
-      this.key_to_field   = new ConcurrentHashMap<Object, Object>();
+      this.type = type;
+      this.key_to_field = new ConcurrentHashMap<Object, Object>();
       this.namingStrategy = strat;
     }
 
@@ -121,7 +143,8 @@ public DynamicMessage.Builder newBuilder() {
     }
 
     public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
-      if (key == null) return null;
+      if (key == null)
+        return null;
 
       if (key instanceof Descriptors.FieldDescriptor) {
         return (Descriptors.FieldDescriptor)key;
@@ -132,8 +155,7 @@ public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
             return null;
           }
           return (Descriptors.FieldDescriptor)field;
-        }
-        else {
+        } else {
           field = type.findFieldByName(namingStrategy.protoName(key));
           key_to_field.putIfAbsent(key, field == null ? NULL : field);
         }
@@ -152,20 +174,23 @@ public String getFullName() {
     public Descriptors.Descriptor getMessageType() {
       return type;
     }
-    static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>> caches =
-      new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>>();
+
+    static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>> caches = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>>();
+
     public Object intern(String name) {
       ConcurrentHashMap<String, Object> nameCache = caches.get(namingStrategy);
       if (nameCache == null) {
         nameCache = new ConcurrentHashMap<String, Object>();
         ConcurrentHashMap<String, Object> existing = caches.putIfAbsent(namingStrategy, nameCache);
-        if (existing != null) nameCache = existing;
+        if (existing != null)
+          nameCache = existing;
       }
       Object clojureName = nameCache.get(name);
       if (clojureName == null) {
         clojureName = namingStrategy.clojureName(name);
         Object existing = nameCache.putIfAbsent(name, clojureName);
-        if (existing != null) clojureName = existing;
+        if (existing != null)
+          clojureName = existing;
       }
       return clojureName;
     }
@@ -175,6 +200,7 @@ public Object clojureEnumValue(Descriptors.EnumValueDescriptor enum_value) {
     }
 
     static final Object k_null = Keyword.intern(Symbol.intern(""));
+
     protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
       Object key = intern(field.getOptions().getExtension(Extensions.mapBy));
       return key == k_null ? null : key;
@@ -186,17 +212,20 @@ protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
   private final IPersistentMap _meta;
   private final IPersistentMap ext;
 
-  static public PersistentProtocolBufferMap create(Def def, byte[] bytes) throws InvalidProtocolBufferException {
+  static public PersistentProtocolBufferMap create(Def def, byte[] bytes)
+          throws InvalidProtocolBufferException {
     DynamicMessage message = def.parseFrom(bytes);
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
-  static public PersistentProtocolBufferMap parseFrom(Def def, CodedInputStream input) throws IOException {
+  static public PersistentProtocolBufferMap parseFrom(Def def, CodedInputStream input)
+          throws IOException {
     DynamicMessage message = def.parseFrom(input);
     return new PersistentProtocolBufferMap(null, def, message);
   }
 
-  static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStream input) throws IOException {
+  static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStream input)
+          throws IOException {
     DynamicMessage.Builder builder = def.parseDelimitedFrom(input);
     if (builder != null) {
       return new PersistentProtocolBufferMap(null, def, builder);
@@ -207,41 +236,43 @@ static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStrea
 
   static public PersistentProtocolBufferMap construct(Def def, Object keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
-    return (PersistentProtocolBufferMap) protobuf.cons(keyvals);
+    return (PersistentProtocolBufferMap)protobuf.cons(keyvals);
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
-    this._meta   = meta;
-    this.ext     = null;
-    this.def     = def;
+    this._meta = meta;
+    this.ext = null;
+    this.def = def;
     this.message = null;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage message) {
-    this._meta   = meta;
-    this.ext     = null;
-    this.def     = def;
+    this._meta = meta;
+    this.ext = null;
+    this.def = def;
     this.message = message;
   }
 
-  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def, DynamicMessage message) {
-    this._meta   = meta;
-    this.ext     = ext;
-    this.def     = def;
+  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def,
+          DynamicMessage message) {
+    this._meta = meta;
+    this.ext = ext;
+    this.def = def;
     this.message = message;
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def, DynamicMessage.Builder builder) {
-    this._meta   = meta;
-    this.ext     = null;
-    this.def     = def;
+    this._meta = meta;
+    this.ext = null;
+    this.def = def;
     this.message = builder.build();
   }
 
-  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def, DynamicMessage.Builder builder) {
-    this._meta   = meta;
-    this.ext     = ext;
-    this.def     = def;
+  protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, Def def,
+          DynamicMessage.Builder builder) {
+    this._meta = meta;
+    this.ext = ext;
+    this.def = def;
     this.message = builder.build();
   }
 
@@ -281,13 +312,15 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value)
     return fromProtoValue(field, value, true);
   }
 
-  static Keyword k_key    = Keyword.intern("key");
-  static Keyword k_val    = Keyword.intern("val");
-  static Keyword k_item   = Keyword.intern("item");
+  static Keyword k_key = Keyword.intern("key");
+  static Keyword k_val = Keyword.intern("val");
+  static Keyword k_item = Keyword.intern("item");
   static Keyword k_exists = Keyword.intern("exists");
-  protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value, boolean use_extensions) {
+
+  protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
+          boolean use_extensions) {
     if (value instanceof List) {
-      List<?> values = (List<?>) value;
+      List<?> values = (List<?>)value;
       Iterator<?> iterator = values.iterator();
 
       if (use_extensions) {
@@ -296,9 +329,10 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
         if (map_field_by != null) {
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
-            PersistentProtocolBufferMap v = (PersistentProtocolBufferMap) fromProtoValue(field, iterator.next());
+            PersistentProtocolBufferMap v = (PersistentProtocolBufferMap)fromProtoValue(field,
+              iterator.next());
             Object k = v.valAt(map_field_by);
-            PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap) map.valAt(k);
+            PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap)map.valAt(k);
             if (existing != null) {
               map = map.assoc(k, existing.append(v));
             } else {
@@ -321,12 +355,12 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
 
           ITransientMap map = PersistentHashMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
-            DynamicMessage message = (DynamicMessage) iterator.next();
+            DynamicMessage message = (DynamicMessage)iterator.next();
             Object k = fromProtoValue(key_field, message.getField(key_field));
             Object v = fromProtoValue(val_field, message.getField(val_field));
             Object existing = map.valAt(k);
             if (existing instanceof IPersistentCollection) {
-              map = map.assoc(k, ((IPersistentCollection) existing).cons(v));
+              map = map.assoc(k, ((IPersistentCollection)existing).cons(v));
             } else {
               map = map.assoc(k, v);
             }
@@ -337,11 +371,11 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           Descriptors.FieldDescriptor item_field = type.findFieldByName("item");
           Descriptors.FieldDescriptor exists_field = type.findFieldByName("exists");
 
-          ITransientSet set = (ITransientSet) OrderedSet.EMPTY.asTransient();
+          ITransientSet set = (ITransientSet)OrderedSet.EMPTY.asTransient();
           while (iterator.hasNext()) {
-            DynamicMessage message = (DynamicMessage) iterator.next();
-            Object  item   = fromProtoValue(item_field, message.getField(item_field));
-            Boolean exists = (Boolean) message.getField(exists_field);
+            DynamicMessage message = (DynamicMessage)iterator.next();
+            Object item = fromProtoValue(item_field, message.getField(item_field));
+            Boolean exists = (Boolean)message.getField(exists_field);
 
             if (exists) {
               set = (ITransientSet)set.conj(item);
@@ -363,31 +397,31 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
       return PersistentVector.create(list);
     } else {
       switch (field.getJavaType()) {
-      case ENUM:
-        Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor) value;
-        if (use_extensions &&
-            field.getOptions().getExtension(Extensions.nullable) &&
-            field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
-          return null;
-        } else {
-          return def.clojureEnumValue(e);
-        }
-      case MESSAGE:
-        Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(), this.def.namingStrategy);
-        DynamicMessage message = (DynamicMessage) value;
-
-        // Total hack because getField() doesn't return an empty array for repeated messages.
-        if (field.isRepeated() && !message.isInitialized()) return fromProtoValue(field, new ArrayList<Object>(), use_extensions);
-
-        return new PersistentProtocolBufferMap(null, fieldDef, message);
-      default:
-        if (use_extensions &&
-            field.getOptions().getExtension(Extensions.nullable) &&
-            field.getOptions().getExtension(nullExtension(field)).equals(value)) {
-          return null;
-        } else {
-          return value;
-        }
+        case ENUM:
+          Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor)value;
+          if (use_extensions && field.getOptions().getExtension(Extensions.nullable)
+                  && field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
+            return null;
+          } else {
+            return def.clojureEnumValue(e);
+          }
+        case MESSAGE:
+          Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
+            this.def.namingStrategy);
+          DynamicMessage message = (DynamicMessage)value;
+
+          // Total hack because getField() doesn't return an empty array for repeated messages.
+          if (field.isRepeated() && !message.isInitialized())
+            return fromProtoValue(field, new ArrayList<Object>(), use_extensions);
+
+          return new PersistentProtocolBufferMap(null, fieldDef, message);
+        default:
+          if (use_extensions && field.getOptions().getExtension(Extensions.nullable)
+                  && field.getOptions().getExtension(nullExtension(field)).equals(value)) {
+            return null;
+          } else {
+            return value;
+          }
       }
     }
   }
@@ -397,10 +431,10 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
       value = field.getOptions().getExtension(nullExtension(field));
 
       if (field.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
-        Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
-        Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByNumber((Integer) value);
+        Descriptors.EnumDescriptor enum_type = field.getEnumType();
+        Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByNumber((Integer)value);
         if (enum_value == null) {
-          PrintWriter err = (PrintWriter) RT.ERR.deref();
+          PrintWriter err = (PrintWriter)RT.ERR.deref();
           err.format("invalid enum number %s for enum type %s\n", value, enum_type.getFullName());
         }
         return enum_value;
@@ -408,82 +442,100 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
     }
 
     switch (field.getJavaType()) {
-    case LONG:
-      if (value instanceof Long) return value;
-      return new Long(((Integer) value).longValue());
-    case INT:
-      if (value instanceof Integer) return value;
-      return new Integer(((Long) value).intValue());
-    case FLOAT:
-      if (value instanceof Integer) return new Float((Integer) value * 1.0);
-      if (value instanceof Double)  return new Float((Double) value);
-      return value;
-    case DOUBLE:
-      if (value instanceof Integer) return new Double((Integer) value * 1.0);
-      if (value instanceof Float)   return new Double((Float) value);
-      return value;
-    case ENUM:
-      String name = def.namingStrategy.protoName(value);
-      Descriptors.EnumDescriptor      enum_type  = field.getEnumType();
-      Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
-      if (enum_value == null) {
-        PrintWriter err = (PrintWriter) RT.ERR.deref();
-        err.format("invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
-      }
-      return enum_value;
-    case MESSAGE:
-      PersistentProtocolBufferMap protobuf;
-      if (value instanceof PersistentProtocolBufferMap) {
-        protobuf = (PersistentProtocolBufferMap) value;
-      } else {
-        Def fieldDef  = PersistentProtocolBufferMap.Def.create(field.getMessageType(), this.def.namingStrategy);
-        protobuf = PersistentProtocolBufferMap.construct(fieldDef, (IPersistentMap) value);
-      }
-      return protobuf.message();
-    default:
-      return value;
+      case LONG:
+        if (value instanceof Long)
+          return value;
+        return new Long(((Integer)value).longValue());
+      case INT:
+        if (value instanceof Integer)
+          return value;
+        return new Integer(((Long)value).intValue());
+      case FLOAT:
+        if (value instanceof Integer)
+          return new Float((Integer)value * 1.0);
+        if (value instanceof Double)
+          return new Float((Double)value);
+        return value;
+      case DOUBLE:
+        if (value instanceof Integer)
+          return new Double((Integer)value * 1.0);
+        if (value instanceof Float)
+          return new Double((Float)value);
+        return value;
+      case ENUM:
+        String name = def.namingStrategy.protoName(value);
+        Descriptors.EnumDescriptor enum_type = field.getEnumType();
+        Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
+        if (enum_value == null) {
+          PrintWriter err = (PrintWriter)RT.ERR.deref();
+          err.format("invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
+        }
+        return enum_value;
+      case MESSAGE:
+        PersistentProtocolBufferMap protobuf;
+        if (value instanceof PersistentProtocolBufferMap) {
+          protobuf = (PersistentProtocolBufferMap)value;
+        } else {
+          Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
+            this.def.namingStrategy);
+          protobuf = PersistentProtocolBufferMap.construct(fieldDef, (IPersistentMap)value);
+        }
+        return protobuf.message();
+      default:
+        return value;
     }
   }
 
-  static protected GeneratedMessage.GeneratedExtension<FieldOptions, ?> nullExtension(Descriptors.FieldDescriptor field) {
+  static protected GeneratedMessage.GeneratedExtension<FieldOptions, ?> nullExtension(
+          Descriptors.FieldDescriptor field) {
     switch (field.getJavaType()) {
-    case LONG:   return Extensions.nullLong;
-    case INT:    return Extensions.nullInt;
-    case FLOAT:  return Extensions.nullFloat;
-    case DOUBLE: return Extensions.nullDouble;
-    case STRING: return Extensions.nullString;
-    case ENUM:   return Extensions.nullEnum;
-    default:     return null;
+      case LONG:
+        return Extensions.nullLong;
+      case INT:
+        return Extensions.nullInt;
+      case FLOAT:
+        return Extensions.nullFloat;
+      case DOUBLE:
+        return Extensions.nullDouble;
+      case STRING:
+        return Extensions.nullString;
+      case ENUM:
+        return Extensions.nullEnum;
+      default:
+        return null;
     }
   }
 
-  protected void addRepeatedField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {
+  protected void addRepeatedField(DynamicMessage.Builder builder,
+          Descriptors.FieldDescriptor field, Object value) {
     try {
       builder.addRepeatedField(field, value);
     } catch (Exception e) {
-      String msg = String.format("error adding %s to %s field %s",
-                                 value, field.getJavaType().toString().toLowerCase(),
-                                 field.getFullName());
+      String msg = String.format("error adding %s to %s field %s", value,
+        field.getJavaType().toString().toLowerCase(), field.getFullName());
       throw new IllegalArgumentException(msg, e);
     }
   }
 
-  protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field, Object value) {
+  protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescriptor field,
+          Object value) {
     try {
       builder.setField(field, value);
     } catch (IllegalArgumentException e) {
       String msg = String.format("error setting %s field %s to %s",
-                                 field.getJavaType().toString().toLowerCase(),
-                                 field.getFullName(), value);
+        field.getJavaType().toString().toLowerCase(), field.getFullName(), value);
       throw new IllegalArgumentException(msg, e);
     }
   }
 
   protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object key, Object value) {
-    if (key == null) return builder;
+    if (key == null)
+      return builder;
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null) return builder;
-    if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) return builder;
+    if (field == null)
+      return builder;
+    if (value == null && !(field.getOptions().getExtension(Extensions.nullable)))
+      return builder;
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
@@ -497,15 +549,15 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
         Object map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
-            Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
-            IPersistentMap map = (IPersistentMap) e.getValue();
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
+            IPersistentMap map = (IPersistentMap)e.getValue();
             Object k = e.getKey();
             Object v = toProtoValue(field, map.assoc(map_field_by, k));
             addRepeatedField(builder, field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
-            Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
             Object[] map = {k_key, e.getKey(), k_val, e.getValue()};
             addRepeatedField(builder, field, toProtoValue(field, new PersistentArrayMap(map)));
           }
@@ -514,10 +566,12 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
           boolean isMap = (value instanceof IPersistentMap);
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             if (isMap) {
-              Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
-              k = e.getKey(); v = e.getValue();
+              Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
+              k = e.getKey();
+              v = e.getValue();
             } else {
-              k = s.first(); v = true;
+              k = s.first();
+              v = true;
             }
             Object[] map = {k_item, k, k_exists, v};
             addRepeatedField(builder, field, toProtoValue(field, new PersistentArrayMap(map)));
@@ -529,7 +583,7 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
     } else {
       Object v = toProtoValue(field, value);
       if (v instanceof DynamicMessage) {
-        v = ((DynamicMessage) builder.getField(field)).toBuilder().mergeFrom((DynamicMessage) v).build();
+        v = ((DynamicMessage)builder.getField(field)).toBuilder().mergeFrom((DynamicMessage)v).build();
       }
       setField(builder, field, v);
     }
@@ -538,11 +592,12 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
   }
 
   public PersistentProtocolBufferMap withMeta(IPersistentMap meta) {
-    if (meta == meta()) return this;
+    if (meta == meta())
+      return this;
     return new PersistentProtocolBufferMap(meta, ext, def, message);
   }
 
-  public IPersistentMap meta(){
+  public IPersistentMap meta() {
     return _meta;
   }
 
@@ -594,31 +649,31 @@ public IPersistentMap assoc(Object key, Object value) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
     if (field != null) {
-      return new PersistentProtocolBufferMap(meta(), ext, def,
-                                             addField(builder(), field, value));
+      return new PersistentProtocolBufferMap(meta(), ext, def, addField(builder(), field, value));
     } else {
-      return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value),
-                                             def, builder());
+      return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value), def, builder());
     }
   }
 
   public IPersistentMap assocEx(Object key, Object value) throws Exception {
-    if(containsKey(key)) throw new Exception("Key already present");
+    if (containsKey(key))
+      throw new Exception("Key already present");
     return assoc(key, value);
   }
 
   public IPersistentCollection cons(Object o) {
     DynamicMessage.Builder builder = builder();
     if (o instanceof Map.Entry) {
-      Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
+      Map.Entry<?, ?> e = (Map.Entry<?, ?>)o;
       addField(builder, e.getKey(), e.getValue());
     } else if (o instanceof IPersistentVector) {
-      IPersistentVector v = (IPersistentVector) o;
-      if (v.count() != 2) throw new IllegalArgumentException("Vector arg to map conj must be a pair");
+      IPersistentVector v = (IPersistentVector)o;
+      if (v.count() != 2)
+        throw new IllegalArgumentException("Vector arg to map conj must be a pair");
       addField(builder, v.nth(0), v.nth(1));
     } else {
       for (ISeq s = RT.seq(o); s != null; s = s.next()) {
-        Map.Entry<?, ?> e = (Map.Entry<?, ?>) s.first();
+        Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
         addField(builder, e.getKey(), e.getValue());
       }
     }
@@ -628,7 +683,7 @@ public IPersistentCollection cons(Object o) {
   public PersistentProtocolBufferMap append(IPersistentMap map) {
     PersistentProtocolBufferMap proto;
     if (map instanceof PersistentProtocolBufferMap) {
-      proto = (PersistentProtocolBufferMap) map;
+      proto = (PersistentProtocolBufferMap)map;
     } else {
       proto = construct(def, map);
     }
@@ -644,7 +699,8 @@ public IPersistentMap without(Object key) throws Exception {
       }
       return new PersistentProtocolBufferMap(meta(), newExt, def, builder());
     }
-    if (field.isRequired()) throw new Exception("Can't remove required field");
+    if (field.isRequired())
+      throw new Exception("Can't remove required field");
 
     return new PersistentProtocolBufferMap(meta(), ext, def, builder().clearField(field));
   }
@@ -676,25 +732,28 @@ private static class Seq extends ASeq {
     private final MapEntry first;
     private final ISeq fields;
 
-    public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields){
+    public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto, ISeq fields) {
       for (ISeq s = fields; s != null; s = s.next()) {
-        Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor) s.first();
+        Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor)s.first();
         Object k = proto.def.intern(field.getName());
-        Object  v = proto.valAt(k, sentinel);
-        if (v != sentinel) return new Seq(meta, proto, new MapEntry(k, v), s);
+        Object v = proto.valAt(k, sentinel);
+        if (v != sentinel)
+          return new Seq(meta, proto, new MapEntry(k, v), s);
       }
       return RT.seq(proto.ext);
     }
 
-    protected Seq(IPersistentMap meta, PersistentProtocolBufferMap proto, MapEntry first, ISeq fields){
+    protected Seq(IPersistentMap meta, PersistentProtocolBufferMap proto, MapEntry first,
+            ISeq fields) {
       super(meta);
-      this.proto  = proto;
-      this.first  = first;
+      this.proto = proto;
+      this.first = first;
       this.fields = fields;
     }
 
     public Obj withMeta(IPersistentMap meta) {
-      if (meta != meta()) return new Seq(meta, proto, first, fields);
+      if (meta != meta())
+        return new Seq(meta, proto, first, fields);
       return this;
     }
 
@@ -706,4 +765,4 @@ public ISeq next() {
       return create(meta(), proto, fields.next());
     }
   }
-}
\ No newline at end of file
+}

From 8cf48b0a0c0b3bd1f1a2115b86edb00c75d5006d Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 15:00:17 -0700
Subject: [PATCH 243/525] Fix code style with Eclipse. In particular, put {}s
 around our single-statement if/else clauses.

---
 .../core/PersistentProtocolBufferMap.java     | 85 ++++++++++++++-----
 1 file changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index d61549d..bd514e6 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -55,27 +55,33 @@ public static final String nameStr(Object named) {
     }
 
     public static final NamingStrategy protobufNames = new NamingStrategy() {
+      @Override
       public String protoName(Object name) {
         return nameStr(name);
       }
 
+      @Override
       public Object clojureName(String name) {
         return Keyword.intern(name.toLowerCase());
       }
 
+      @Override
       public String toString() {
         return "[protobuf names]";
       }
     };
     public static final NamingStrategy convertUnderscores = new NamingStrategy() {
+      @Override
       public String protoName(Object name) {
         return nameStr(name).replaceAll("-", "_");
       }
 
+      @Override
       public Object clojureName(String name) {
         return Keyword.intern(name.replaceAll("_", "-").toLowerCase());
       }
 
+      @Override
       public String toString() {
         return "[convert underscores]";
       }
@@ -103,8 +109,9 @@ public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
         defCache = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
         ConcurrentHashMap<Descriptors.Descriptor, Def> previous = type_to_def.putIfAbsent(strat,
           defCache);
-        if (previous != null)
+        if (previous != null) {
           defCache = previous;
+        }
       }
 
       Def def = defCache.get(type);
@@ -143,8 +150,9 @@ public DynamicMessage.Builder newBuilder() {
     }
 
     public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
-      if (key == null)
+      if (key == null) {
         return null;
+      }
 
       if (key instanceof Descriptors.FieldDescriptor) {
         return (Descriptors.FieldDescriptor)key;
@@ -182,15 +190,17 @@ public Object intern(String name) {
       if (nameCache == null) {
         nameCache = new ConcurrentHashMap<String, Object>();
         ConcurrentHashMap<String, Object> existing = caches.putIfAbsent(namingStrategy, nameCache);
-        if (existing != null)
+        if (existing != null) {
           nameCache = existing;
+        }
       }
       Object clojureName = nameCache.get(name);
       if (clojureName == null) {
         clojureName = namingStrategy.clojureName(name);
         Object existing = nameCache.putIfAbsent(name, clojureName);
-        if (existing != null)
+        if (existing != null) {
           clojureName = existing;
+        }
       }
       return clojureName;
     }
@@ -411,8 +421,9 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           DynamicMessage message = (DynamicMessage)value;
 
           // Total hack because getField() doesn't return an empty array for repeated messages.
-          if (field.isRepeated() && !message.isInitialized())
+          if (field.isRepeated() && !message.isInitialized()) {
             return fromProtoValue(field, new ArrayList<Object>(), use_extensions);
+          }
 
           return new PersistentProtocolBufferMap(null, fieldDef, message);
         default:
@@ -443,24 +454,30 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
 
     switch (field.getJavaType()) {
       case LONG:
-        if (value instanceof Long)
+        if (value instanceof Long) {
           return value;
+        }
         return new Long(((Integer)value).longValue());
       case INT:
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
           return value;
+        }
         return new Integer(((Long)value).intValue());
       case FLOAT:
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
           return new Float((Integer)value * 1.0);
-        if (value instanceof Double)
+        }
+        if (value instanceof Double) {
           return new Float((Double)value);
+        }
         return value;
       case DOUBLE:
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
           return new Double((Integer)value * 1.0);
-        if (value instanceof Float)
+        }
+        if (value instanceof Float) {
           return new Double((Float)value);
+        }
         return value;
       case ENUM:
         String name = def.namingStrategy.protoName(value);
@@ -478,7 +495,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
         } else {
           Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
             this.def.namingStrategy);
-          protobuf = PersistentProtocolBufferMap.construct(fieldDef, (IPersistentMap)value);
+          protobuf = PersistentProtocolBufferMap.construct(fieldDef, value);
         }
         return protobuf.message();
       default:
@@ -529,13 +546,16 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
   }
 
   protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object key, Object value) {
-    if (key == null)
+    if (key == null) {
       return builder;
+    }
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
-    if (field == null)
+    if (field == null) {
       return builder;
-    if (value == null && !(field.getOptions().getExtension(Extensions.nullable)))
+    }
+    if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) {
       return builder;
+    }
     boolean set = field.getOptions().getExtension(Extensions.set);
 
     if (field.isRepeated()) {
@@ -591,16 +611,20 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
     return builder;
   }
 
+  @Override
   public PersistentProtocolBufferMap withMeta(IPersistentMap meta) {
-    if (meta == meta())
+    if (meta == meta()) {
       return this;
+    }
     return new PersistentProtocolBufferMap(meta, ext, def, message);
   }
 
+  @Override
   public IPersistentMap meta() {
     return _meta;
   }
 
+  @Override
   public boolean containsKey(Object key) {
     return protoContainsKey(key) || RT.booleanCast(RT.contains(ext, key));
   }
@@ -618,15 +642,18 @@ private boolean protoContainsKey(Object key) {
 
   private static final Object sentinel = new Object();
 
+  @Override
   public IMapEntry entryAt(Object key) {
     Object value = valAt(key, sentinel);
     return (value == sentinel) ? null : new MapEntry(key, value);
   }
 
+  @Override
   public Object valAt(Object key) {
     return getValAt(key, true);
   }
 
+  @Override
   public Object valAt(Object key, Object notFound) {
     return getValAt(key, notFound, true);
   }
@@ -645,6 +672,7 @@ public Object getValAt(Object key, Object notFound, boolean use_extensions) {
     }
   }
 
+  @Override
   public IPersistentMap assoc(Object key, Object value) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
 
@@ -655,12 +683,15 @@ public IPersistentMap assoc(Object key, Object value) {
     }
   }
 
+  @Override
   public IPersistentMap assocEx(Object key, Object value) throws Exception {
-    if (containsKey(key))
+    if (containsKey(key)) {
       throw new Exception("Key already present");
+    }
     return assoc(key, value);
   }
 
+  @Override
   public IPersistentCollection cons(Object o) {
     DynamicMessage.Builder builder = builder();
     if (o instanceof Map.Entry) {
@@ -668,8 +699,9 @@ public IPersistentCollection cons(Object o) {
       addField(builder, e.getKey(), e.getValue());
     } else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector)o;
-      if (v.count() != 2)
+      if (v.count() != 2) {
         throw new IllegalArgumentException("Vector arg to map conj must be a pair");
+      }
       addField(builder, v.nth(0), v.nth(1));
     } else {
       for (ISeq s = RT.seq(o); s != null; s = s.next()) {
@@ -690,6 +722,7 @@ public PersistentProtocolBufferMap append(IPersistentMap map) {
     return new PersistentProtocolBufferMap(meta(), ext, def, builder().mergeFrom(proto.message()));
   }
 
+  @Override
   public IPersistentMap without(Object key) throws Exception {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) {
@@ -699,16 +732,19 @@ public IPersistentMap without(Object key) throws Exception {
       }
       return new PersistentProtocolBufferMap(meta(), newExt, def, builder());
     }
-    if (field.isRequired())
+    if (field.isRequired()) {
       throw new Exception("Can't remove required field");
+    }
 
     return new PersistentProtocolBufferMap(meta(), ext, def, builder().clearField(field));
   }
 
+  @Override
   public Iterator<?> iterator() {
     return new SeqIterator(seq());
   }
 
+  @Override
   public int count() {
     int count = RT.count(ext);
     for (Descriptors.FieldDescriptor field : def.type.getFields()) {
@@ -719,10 +755,12 @@ public int count() {
     return count;
   }
 
+  @Override
   public ISeq seq() {
     return Seq.create(null, this, RT.seq(def.type.getFields()));
   }
 
+  @Override
   public IPersistentCollection empty() {
     return new PersistentProtocolBufferMap(meta(), null, def, builder().clear());
   }
@@ -737,8 +775,9 @@ public static ISeq create(IPersistentMap meta, PersistentProtocolBufferMap proto
         Descriptors.FieldDescriptor field = (Descriptors.FieldDescriptor)s.first();
         Object k = proto.def.intern(field.getName());
         Object v = proto.valAt(k, sentinel);
-        if (v != sentinel)
+        if (v != sentinel) {
           return new Seq(meta, proto, new MapEntry(k, v), s);
+        }
       }
       return RT.seq(proto.ext);
     }
@@ -751,16 +790,20 @@ protected Seq(IPersistentMap meta, PersistentProtocolBufferMap proto, MapEntry f
       this.fields = fields;
     }
 
+    @Override
     public Obj withMeta(IPersistentMap meta) {
-      if (meta != meta())
+      if (meta != meta()) {
         return new Seq(meta, proto, first, fields);
+      }
       return this;
     }
 
+    @Override
     public Object first() {
       return first;
     }
 
+    @Override
     public ISeq next() {
       return create(meta(), proto, fields.next());
     }

From 3c99fd305e412c276599d1450e2c02edef57f75e Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 20 Apr 2012 15:04:20 -0700
Subject: [PATCH 244/525] Remove unqualified imports like clojure.lang.*

---
 .../core/PersistentProtocolBufferMap.java     | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index bd514e6..232b7a5 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -10,23 +10,50 @@
 
 package protobuf.core;
 
-import clojure.lang.*;
-import ordered_set.core.OrderedSet;
-import java.util.*;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
 import java.lang.reflect.InvocationTargetException;
-import com.google.protobuf.DescriptorProtos.FieldOptions;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.Descriptors;
-import com.google.protobuf.DescriptorProtos;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import ordered_set.core.OrderedSet;
+import clojure.lang.APersistentMap;
+import clojure.lang.ASeq;
+import clojure.lang.IFn;
+import clojure.lang.IMapEntry;
+import clojure.lang.IObj;
+import clojure.lang.IPersistentCollection;
+import clojure.lang.IPersistentMap;
+import clojure.lang.IPersistentVector;
+import clojure.lang.ISeq;
+import clojure.lang.ITransientMap;
+import clojure.lang.ITransientSet;
+import clojure.lang.Keyword;
+import clojure.lang.MapEntry;
+import clojure.lang.Numbers;
+import clojure.lang.Obj;
+import clojure.lang.PersistentArrayMap;
+import clojure.lang.PersistentHashMap;
+import clojure.lang.PersistentVector;
+import clojure.lang.RT;
+import clojure.lang.SeqIterator;
+import clojure.lang.Sequential;
+import clojure.lang.Symbol;
+import clojure.lang.Var;
+
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.DescriptorProtos.FieldOptions;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.InvalidProtocolBufferException;
 
 
 public class PersistentProtocolBufferMap extends APersistentMap implements IObj {

From 85689c623dff9f8b3ae941a9d126be67dc6a1862 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 23 Apr 2012 13:46:57 -0700
Subject: [PATCH 245/525] Add Eclipse cruft to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2b9dd56..52e202e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ proto/google/protobuf/descriptor.proto
 docs
 protobuf-*
 protosrc
+.classpath
+.project
+.settings

From cb5230356498dfd1803531e9c3269fe51b7dab0f Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 23 Apr 2012 13:47:20 -0700
Subject: [PATCH 246/525] Use OrderedMap for protobuf maps

---
 project.clj                                        | 2 +-
 src/protobuf/core/PersistentProtocolBufferMap.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index b24fd47..cb4185a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,7 +1,7 @@
 (defproject protobuf "0.6.0-beta14"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[clojure "1.2.0"]
-                 [ordered-set "0.2.3"]
+                 [ordered-set "0.3.0"]
                  [useful "0.8.0-alpha1"]
                  [fs "1.0.0"]
                  [conch "0.2.0"]
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 232b7a5..57258aa 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import ordered_map.core.OrderedMap;
 import ordered_set.core.OrderedSet;
 import clojure.lang.APersistentMap;
 import clojure.lang.ASeq;
@@ -38,7 +39,6 @@
 import clojure.lang.Numbers;
 import clojure.lang.Obj;
 import clojure.lang.PersistentArrayMap;
-import clojure.lang.PersistentHashMap;
 import clojure.lang.PersistentVector;
 import clojure.lang.RT;
 import clojure.lang.SeqIterator;
@@ -364,7 +364,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
         Object map_field_by = def.mapFieldBy(field);
         DescriptorProtos.FieldOptions options = field.getOptions();
         if (map_field_by != null) {
-          ITransientMap map = PersistentHashMap.EMPTY.asTransient();
+          ITransientMap map = (ITransientMap)OrderedMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
             PersistentProtocolBufferMap v = (PersistentProtocolBufferMap)fromProtoValue(field,
               iterator.next());
@@ -390,7 +390,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           Descriptors.FieldDescriptor key_field = type.findFieldByName("key");
           Descriptors.FieldDescriptor val_field = type.findFieldByName("val");
 
-          ITransientMap map = PersistentHashMap.EMPTY.asTransient();
+          ITransientMap map = (ITransientMap)OrderedMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
             DynamicMessage message = (DynamicMessage)iterator.next();
             Object k = fromProtoValue(key_field, message.getField(key_field));

From 49f959e81d78e59e156721f7108c72bbb29adacf Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 23 Apr 2012 14:30:42 -0700
Subject: [PATCH 247/525] In map_field_by, assoc both the clojure name and the
 protobuf name. Should only matter in cases that are basically errors.

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 57258aa..06e5bbd 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -595,11 +595,12 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
       } else {
         Object map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
+          String field_name = def.namingStrategy.protoName(map_field_by);
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
             IPersistentMap map = (IPersistentMap)e.getValue();
             Object k = e.getKey();
-            Object v = toProtoValue(field, map.assoc(map_field_by, k));
+            Object v = toProtoValue(field, map.assoc(map_field_by, k).assoc(field_name, k));
             addRepeatedField(builder, field, v);
           }
         } else if (field.getOptions().getExtension(Extensions.map)) {

From 8ce79568d4d7dfcbd59ba99b3f3ffa0ad9a2e24b Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 23 Apr 2012 18:46:23 -0700
Subject: [PATCH 248/525] Lein2-friendly project.clj

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index cb4185a..6526cf5 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,6 @@
 (defproject protobuf "0.6.0-beta14"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[clojure "1.2.0"]
+  :dependencies [[org.clojure/clojure "1.2.0"]
                  [ordered-set "0.3.0"]
                  [useful "0.8.0-alpha1"]
                  [fs "1.0.0"]

From 9a7c9162fd708c54b56dae68e3693ccb44755d6c Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 23 Apr 2012 18:46:34 -0700
Subject: [PATCH 249/525] Add test for our new use of OrderedMap

---
 test/protobuf/core_test.clj | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 0f4fa5f..f1808d4 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,5 +1,6 @@
 (ns protobuf.core-test
-  (:use protobuf.core clojure.test)
+  (:use protobuf.core clojure.test
+        ordered-map.core)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
 (def Foo      (protodef protobuf.test.Core$Foo))
@@ -51,6 +52,16 @@
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
 
+(deftest test-ordered-append
+  (let [inputs (apply ordered-map (for [x (range 26)
+                                        entry [(str x) (str (char (+ (int \a) x)))]]
+                                    entry))]
+    (= (seq inputs)
+       (seq (reduce (fn [m [k v]]
+                      (append m {:attr_map {k v}}))
+                    (protobuf Foo)
+                    inputs)))))
+
 (deftest test-assoc
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
     (let [p (assoc p :label "baz" :tags ["nuprin"])]

From 56f5aef7e57e1ba75e8f0a445346a9d540298769 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 25 Apr 2012 13:08:17 -0700
Subject: [PATCH 250/525] Clarify nil-test

---
 src/protobuf/core.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index e47d2ea..8e5ed40 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -24,8 +24,7 @@
        def
        (protodef def PersistentProtocolBufferMap$Def/convertUnderscores)))
   ([def ^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy]
-     (if (nil? def)
-       def
+     (when def
        (let [^Descriptors$Descriptor descriptor
              (if (instance? Descriptors$Descriptor def)
                def

From 9036fc0bff867cad6fbbdbaa5bef0bce5921258d Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 25 Apr 2012 13:08:39 -0700
Subject: [PATCH 251/525] Participate in adjoin protocol instead of inventing
 append function

---
 src/protobuf/core.clj       | 11 ++++++-----
 test/protobuf/core_test.clj | 29 +++++++++++++++--------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 8e5ed40..91591dd 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -2,6 +2,7 @@
   (:use [protobuf.schema :only [field-schema]]
         [useful.fn :only [fix]]
         [clojure.java.io :only [input-stream output-stream]])
+  (:require useful.utils)
   (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def PersistentProtocolBufferMap$Def$NamingStrategy Extensions)
            (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
            (java.io InputStream OutputStream)
@@ -89,12 +90,12 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
-;; TODO make these functions nil-safe
-(defn append
-  "Merge the given map into the protobuf. Equivalent to appending the byte representations."
-  [^PersistentProtocolBufferMap p map]
-  (.append p map))
+(extend-protocol useful.utils/Adjoin
+  PersistentProtocolBufferMap
+  (adjoin [^PersistentProtocolBufferMap this other]
+    (.append this other)))
 
+;; TODO make this nil-safe? Or just delete it?
 (defn get-raw
   "Get value at key ignoring extension fields."
   [^PersistentProtocolBufferMap p key]
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index f1808d4..57ab99c 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,5 +1,6 @@
 (ns protobuf.core-test
   (:use protobuf.core clojure.test
+        [useful.utils :only [adjoin]]
         ordered-map.core)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
@@ -34,31 +35,31 @@
       (is (= ["little" "yellow" "different"] (:tags p)))
       (is (= "very" (:label p))))))
 
-(deftest test-append
+(deftest test-adjoin
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
-    (let [p (append p {:label "bar"})]
+    (let [p (adjoin p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
       (is (= false (:deleted p)))
       (is (= ["little" "yellow"] (:tags p))))
-    (let [p (append (assoc p :deleted true) p)]
+    (let [p (adjoin (assoc p :deleted true) p)]
       (is (= true (:deleted p))))
-    (let [p (append p {:tags ["different"]})]
+    (let [p (adjoin p {:tags ["different"]})]
       (is (= ["little" "yellow" "different"] (:tags p))))
-    (let [p (append p {:tags ["different"] :label "very"})]
+    (let [p (adjoin p {:tags ["different"] :label "very"})]
       (is (= ["little" "yellow" "different"] (:tags p)))
       (is (= "very" (:label p))))
-    (let [p (append p {:doubles [3.4] :floats [0.02]})]
+    (let [p (adjoin p {:doubles [3.4] :floats [0.02]})]
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
 
-(deftest test-ordered-append
+(deftest test-ordered-adjoin
   (let [inputs (apply ordered-map (for [x (range 26)
                                         entry [(str x) (str (char (+ (int \a) x)))]]
                                     entry))]
     (= (seq inputs)
        (seq (reduce (fn [m [k v]]
-                      (append m {:attr_map {k v}}))
+                      (adjoin m {:attr_map {k v}}))
                     (protobuf Foo)
                     inputs)))))
 
@@ -181,11 +182,11 @@
   (let [p (protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
     (is (= 5   (get-in p [:counts "foo" :i])))
     (is (= 5.0 (get-in p [:counts "foo" :d])))
-    (let [p (append p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
+    (let [p (adjoin p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
       (is (= 7   (get-in p [:counts "foo" :i])))
       (is (= 2.6 (get-in p [:counts "foo" :d])))
       (is (= 99  (get-in p [:counts "bar" :i])))
-      (let [p (append p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
+      (let [p (adjoin p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
         (is (= -1   (get-in p [:counts "foo" :i])))
         (is (= 6.66 (get-in p [:counts "foo" :d])))
         (is (= 33   (get-in p [:counts "bar" :i])))
@@ -201,7 +202,7 @@
     (is (= 1978 (get-in p [:time :year])))
     (is (= 11   (get-in p [:time :month])))
     (is (= 24   (get-in p [:time :day])))
-    (let [p (append p {:time {:year 1974 :month 1}})]
+    (let [p (adjoin p {:time {:year 1974 :month 1}})]
       (is (= 1974 (get-in p [:time :year])))
       (is (= 1    (get-in p [:time :month])))
       (is (= nil  (get-in p [:time :day])))
@@ -218,7 +219,7 @@
     (is (= "foo"        (get p :str)))
     (is (= :a           (get p :enu)))
     (is (= keyset (set (keys p))))
-    (let [p (append p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
+    (let [p (adjoin p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
       (is (= nil (get p :int)))
       (is (= nil (get p :long)))
       (is (= nil (get p :flt)))
@@ -229,13 +230,13 @@
     (testing "nullable successions"
       (let [p (protobuf Bar :label "foo")]
         (is (= "foo" (get p :label)))
-        (let [p (append p {:label nil})]
+        (let [p (adjoin p {:label nil})]
           (is (= nil        (get     p :label)))
           (is (= ["foo" ""] (get-raw p :label))))))
     (testing "repeated nullable"
       (let [p (protobuf Bar :labels ["foo" "bar"])]
         (is (= ["foo" "bar"] (get p :labels)))
-        (let [p (append p {:labels [nil]})]
+        (let [p (adjoin p {:labels [nil]})]
           (is (= ["foo" "bar" nil] (get     p :labels)))
           (is (= ["foo" "bar" ""]  (get-raw p :labels))))))))
 

From a2ae17aaed3b8b3dadcaedd908c9002b9545f0df Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 25 Apr 2012 13:35:29 -0700
Subject: [PATCH 252/525] New version of useful contains Adjoin protocol

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 6526cf5..e754222 100644
--- a/project.clj
+++ b/project.clj
@@ -2,7 +2,7 @@
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [ordered-set "0.3.0"]
-                 [useful "0.8.0-alpha1"]
+                 [useful "0.8.0-alpha4"]
                  [fs "1.0.0"]
                  [conch "0.2.0"]
                  [schematic "0.0.5"]]

From 1e6b2e1b861e843a3b8d27db81e9cf7928184f0c Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 25 Apr 2012 13:35:42 -0700
Subject: [PATCH 253/525] checksum-deps in project.clj for convenience

---
 project.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project.clj b/project.clj
index e754222..f46b7c0 100644
--- a/project.clj
+++ b/project.clj
@@ -14,4 +14,5 @@
   ;; jar to implicitly clean no matter what, wiping stuff.
   ;; This prevents that.
   :disable-implicit-clean true
+  :checksum-deps true
   :java-source-path "src")

From ed9e273e9c3d2cf21a7b885d64c7fd0db74249a2 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 25 Apr 2012 13:48:45 -0700
Subject: [PATCH 254/525] beta 15

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index f46b7c0..b3b8808 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta14"
+(defproject protobuf "0.6.0-beta15"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [ordered-set "0.3.0"]

From 299f0c51fef4c442c72772cb00e46bd3656424ce Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Thu, 26 Apr 2012 17:29:01 -0700
Subject: [PATCH 255/525] 0.6.0-beta16: update to ordered-collections 0.4.0 and
 useful 0.8.0-alpha5

---
 project.clj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index b3b8808..da94fbf 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,8 @@
-(defproject protobuf "0.6.0-beta15"
+(defproject protobuf "0.6.0-beta16"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure "1.2.0"]
-                 [ordered-set "0.3.0"]
-                 [useful "0.8.0-alpha4"]
+                 [ordered-collections "0.4.0"]
+                 [useful "0.8.0-alpha5"]
                  [fs "1.0.0"]
                  [conch "0.2.0"]
                  [schematic "0.0.5"]]

From 5e2b82321e233c13869e5da13e31fcbb557056d8 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 1 May 2012 16:48:43 -0700
Subject: [PATCH 256/525] Stop putting schema data on the codec as metadata

---
 src/protobuf/codec.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 35419c4..0d26d6b 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -48,6 +48,8 @@
                 (protobuf proto val))))))
         (fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
-                              :prefix :none))
-        (with-meta {:schema (schema/dissoc-fields (protobuf-schema proto)
-                                                  len-key reset-key)}))))
+                              :prefix :none)))))
+
+(defn codec-schema [proto]
+  (schema/dissoc-fields (protobuf-schema proto)
+                        len-key reset-key))

From 724c161e4a0b0bcacc921b450a087d9f571e6ffd Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 4 May 2012 16:00:52 -0700
Subject: [PATCH 257/525] Move catbytes to flatland/io

---
 project.clj                 |  2 +-
 test/protobuf/core_test.clj | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/project.clj b/project.clj
index da94fbf..a09a7da 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [conch "0.2.0"]
                  [schematic "0.0.5"]]
   :dev-dependencies [[gloss "0.2.0-rc1"]
-                     [io "0.1.0-alpha2"]]
+                     [io "0.2.0-beta2"]]
   :hooks [leiningen.protobuf]
   :eval-in-leiningen true
   ;; Bug in the current 1.x branch of Leiningen causes
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 57ab99c..9d132e4 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,5 +1,6 @@
 (ns protobuf.core-test
   (:use protobuf.core clojure.test
+        [io.core :only [catbytes]]
         [useful.utils :only [adjoin]]
         ordered-map.core)
   (:import (java.io PipedInputStream PipedOutputStream)))
@@ -11,16 +12,6 @@
 (def Response (protodef protobuf.test.Core$Response))
 (def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
 
-(defn catbytes [& args]
-  (let [out-buf (byte-array (reduce + (map count args)))]
-    (loop [offset 0, args args]
-      (if-let [[^bytes array & more] (seq args)]
-        (let [size (count array)]
-          (System/arraycopy array 0
-                            out-buf offset size)
-          (recur (+ size offset) more))
-        out-buf))))
-
 (deftest test-conj
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
     (let [p (conj p {:label "bar"})]

From 4d8e781acaa038956d4b79bdfc674ac64f7ebcd3 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 1 May 2012 16:49:04 -0700
Subject: [PATCH 258/525] beta17, lol?

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index a09a7da..e5cd574 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta16"
+(defproject protobuf "0.6.0-beta17"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [ordered-collections "0.4.0"]

From 6d5e70a3fe70ba26f3c8ef1e31484752206ca5c5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 11 May 2012 18:22:28 -0700
Subject: [PATCH 259/525] add tests for adjoining protobuf extensions

---
 test/protobuf/core_test.clj | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 9d132e4..dd73e6e 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -42,7 +42,24 @@
       (is (= "very" (:label p))))
     (let [p (adjoin p {:doubles [3.4] :floats [0.02]})]
       (is (= [1.2 3.4] (:doubles p)))
-      (is (= [(float 0.01) (float 0.02)] (:floats  p))))))
+      (is (= [(float 0.01) (float 0.02)] (:floats  p)))))
+  (testing "adjoining works with set extension"
+    (let [p (protobuf Foo :tag-set #{"foo" "bar" "baz"})
+          q (protobuf Foo :tag-set {"bar" false "foo" false "bap" true})
+          r (adjoin p q)]
+      (is (= #{"foo" "bar" "baz"} (p :tag-set)))
+      (is (= #{"bap"}             (q :tag-set)))
+      (is (= #{"bap" "baz"}       (r :tag-set)))))
+  (testing "adjoining works with counters"
+    (let [p (protobuf Foo :counts {"foo" {:i 5 :d  5.0}})
+          q (protobuf Foo :counts {"foo" {:i 8 :d -3.0}})
+          r (adjoin p q)]
+      (is (=  5   (get-in p [:counts "foo" :i])))
+      (is (=  5.0 (get-in p [:counts "foo" :d])))
+      (is (=  8   (get-in q [:counts "foo" :i])))
+      (is (= -3.0 (get-in q [:counts "foo" :d])))
+      (is (=  13  (get-in r [:counts "foo" :i])))
+      (is (=  2.0 (get-in r [:counts "foo" :d]))))))
 
 (deftest test-ordered-adjoin
   (let [inputs (apply ordered-map (for [x (range 26)

From 32cf31bf7b58e17a53c1c46448488eefbd859c1f Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 16 May 2012 12:18:01 -0700
Subject: [PATCH 260/525] Update to new useful

---
 project.clj           | 4 ++--
 src/protobuf/core.clj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index e5cd574..d9918a4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,8 @@
-(defproject protobuf "0.6.0-beta17"
+(defproject protobuf "0.6.0-beta18"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [ordered-collections "0.4.0"]
-                 [useful "0.8.0-alpha5"]
+                 [useful "0.8.2-alpha1"]
                  [fs "1.0.0"]
                  [conch "0.2.0"]
                  [schematic "0.0.5"]]
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 91591dd..206f610 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -92,7 +92,7 @@
 
 (extend-protocol useful.utils/Adjoin
   PersistentProtocolBufferMap
-  (adjoin [^PersistentProtocolBufferMap this other]
+  (adjoin-onto [^PersistentProtocolBufferMap this other]
     (.append this other)))
 
 ;; TODO make this nil-safe? Or just delete it?

From 96dbb5436cd405d2bc4bd0c7428c6ee8e6e64650 Mon Sep 17 00:00:00 2001
From: Anthony Marcar <amarcar@walmartlabs.com>
Date: Tue, 19 Jun 2012 14:35:05 -0700
Subject: [PATCH 261/525] upgraded to be compatible with lein2

---
 .gitignore                 | 1 +
 src/leiningen/protobuf.clj | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52e202e..9468b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ protosrc
 .classpath
 .project
 .settings
+target/
diff --git a/src/leiningen/protobuf.clj b/src/leiningen/protobuf.clj
index 034dce3..813035d 100644
--- a/src/leiningen/protobuf.clj
+++ b/src/leiningen/protobuf.clj
@@ -3,7 +3,7 @@
   (:use [clojure.string :only [join]]
         [leiningen.help :only [help-for]]
         [leiningen.javac :only [javac]]
-        [leiningen.util.paths :only [get-os]]
+        [leiningen.core.eval :only [get-os]]
         [robert.hooke :only [add-hook]])
   (:require [clojure.java.io :as io]
             [fs.core :as fs]
@@ -144,7 +144,7 @@
                (if (not (= (sh/exit-code protoc-result) 0))
                  (println "ERROR: " (sh/stream-to-string protoc-result :err))))))
          (binding [*compile?* false]
-           (javac (assoc project :java-source-path dest-path)))))))
+           (javac (assoc project :java-source-paths [dest-path])))))))
 
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"

From b1c730a055f5d0bce6c3291c907513bc5f2ddf2b Mon Sep 17 00:00:00 2001
From: Anthony Marcar <amarcar@walmartlabs.com>
Date: Tue, 19 Jun 2012 15:17:44 -0700
Subject: [PATCH 262/525] upgraded to clojure 1.3.0 and changed Exceptions to
 RuntimeExceptions in assocEx and without methods

---
 project.clj                                        | 4 ++--
 src/protobuf/core/PersistentProtocolBufferMap.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index d9918a4..68955cd 100644
--- a/project.clj
+++ b/project.clj
@@ -1,6 +1,6 @@
 (defproject protobuf "0.6.0-beta18"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[org.clojure/clojure "1.2.0"]
+  :dependencies [[org.clojure/clojure "1.3.0"]
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [fs "1.0.0"]
@@ -15,4 +15,4 @@
   ;; This prevents that.
   :disable-implicit-clean true
   :checksum-deps true
-  :java-source-path "src")
+  :java-source-paths ["src"])
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 06e5bbd..08980bf 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -712,9 +712,9 @@ public IPersistentMap assoc(Object key, Object value) {
   }
 
   @Override
-  public IPersistentMap assocEx(Object key, Object value) throws Exception {
+  public IPersistentMap assocEx(Object key, Object value) {
     if (containsKey(key)) {
-      throw new Exception("Key already present");
+      throw new RuntimeException("Key already present");
     }
     return assoc(key, value);
   }
@@ -751,7 +751,7 @@ public PersistentProtocolBufferMap append(IPersistentMap map) {
   }
 
   @Override
-  public IPersistentMap without(Object key) throws Exception {
+  public IPersistentMap without(Object key) {
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) {
       IPersistentMap newExt = (IPersistentMap)RT.dissoc(ext, key);
@@ -761,7 +761,7 @@ public IPersistentMap without(Object key) throws Exception {
       return new PersistentProtocolBufferMap(meta(), newExt, def, builder());
     }
     if (field.isRequired()) {
-      throw new Exception("Can't remove required field");
+      throw new RuntimeException("Can't remove required field");
     }
 
     return new PersistentProtocolBufferMap(meta(), ext, def, builder().clearField(field));

From 1880cb72f1e2463c96193981907630ed9f81f1c6 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 29 Jun 2012 18:26:16 -0500
Subject: [PATCH 263/525] Move leiningen plugin to a subproject.

---
 lein-protobuf/project.clj                         | 10 ++++++++++
 {src => lein-protobuf/src}/leiningen/protobuf.clj |  0
 project.clj                                       | 12 +++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 lein-protobuf/project.clj
 rename {src => lein-protobuf/src}/leiningen/protobuf.clj (100%)

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
new file mode 100644
index 0000000..23e853e
--- /dev/null
+++ b/lein-protobuf/project.clj
@@ -0,0 +1,10 @@
+(defproject lein-protobuf "0.1.0-alpha1"
+  :description "Leiningen plugin for clojure-protobuf."
+  :dependencies [[fs "1.0.0"]
+                 [conch "0.2.0"]]
+  :eval-in-leiningen true
+  ;; Bug in the current 1.x branch of Leiningen causes
+  ;; jar to implicitly clean no matter what, wiping stuff.
+  ;; This prevents that.
+  :disable-implicit-clean true
+  :checksum-deps true)
diff --git a/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
similarity index 100%
rename from src/leiningen/protobuf.clj
rename to lein-protobuf/src/leiningen/protobuf.clj
diff --git a/project.clj b/project.clj
index 68955cd..d8af9c4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,15 +1,13 @@
-(defproject protobuf "0.6.0-beta18"
+(defproject protobuf "0.6.0-beta19"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
-  :dependencies [[org.clojure/clojure "1.3.0"]
+  :dependencies [[org.clojure/clojure "1.4.0"]
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
-                 [fs "1.0.0"]
-                 [conch "0.2.0"]
                  [schematic "0.0.5"]]
-  :dev-dependencies [[gloss "0.2.0-rc1"]
-                     [io "0.2.0-beta2"]]
+  :plugins [[lein-protobuf "0.1.0-alpha1"]]
+  :profiles {:dev {:dependencies [[gloss "0.2.1"]
+                                  [io "0.2.0-beta2"]]}}
   :hooks [leiningen.protobuf]
-  :eval-in-leiningen true
   ;; Bug in the current 1.x branch of Leiningen causes
   ;; jar to implicitly clean no matter what, wiping stuff.
   ;; This prevents that.

From 80dd186fa7b260cef5581802bd124bbe06505ad5 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Fri, 29 Jun 2012 16:40:18 -0700
Subject: [PATCH 264/525] Use Number interface instead of wonky special-cases.

This code broke on 1.4 because we were assuming nobody would ever
use a  value for a FLOAT field, apparently.
---
 .../core/PersistentProtocolBufferMap.java     | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 08980bf..bc6aa94 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -481,31 +481,13 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
 
     switch (field.getJavaType()) {
       case LONG:
-        if (value instanceof Long) {
-          return value;
-        }
-        return new Long(((Integer)value).longValue());
+        return ((Number)value).longValue();
       case INT:
-        if (value instanceof Integer) {
-          return value;
-        }
-        return new Integer(((Long)value).intValue());
+        return ((Number)value).intValue();
       case FLOAT:
-        if (value instanceof Integer) {
-          return new Float((Integer)value * 1.0);
-        }
-        if (value instanceof Double) {
-          return new Float((Double)value);
-        }
-        return value;
+        return ((Number)value).floatValue();
       case DOUBLE:
-        if (value instanceof Integer) {
-          return new Double((Integer)value * 1.0);
-        }
-        if (value instanceof Float) {
-          return new Double((Float)value);
-        }
-        return value;
+        return ((Number)value).doubleValue();
       case ENUM:
         String name = def.namingStrategy.protoName(value);
         Descriptors.EnumDescriptor enum_type = field.getEnumType();

From 9cbc07bf8ffd4c1d14012f480c7afbd15a9f4872 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 29 Jun 2012 18:44:53 -0500
Subject: [PATCH 265/525] Remove old comment and code about target and lein 1.

---
 lein-protobuf/src/leiningen/protobuf.clj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index 813035d..5b9d850 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -20,12 +20,8 @@
   (java.net.URL.
    (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
 
-;; In lein 1 there was a :target-dir key that defaulted to "." and wasn't really
-;; used much. In lein 2, things that are generated by plugins and such are
-;; supposed to go in :target-path. This will default to 'target'. We don't want
-;; to wait for this, so we'll simulate it here.
 (defn target [project]
-  (doto (io/file (or (:target-path project) "target"))
+  (doto (io/file (:target-path project))
     .mkdirs))
 
 (defn- proto-dependencies

From 600e87e5ec72b1d2d1a0e13585dff2b68b98356d Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:31:28 -0500
Subject: [PATCH 266/525] Don't copy descriptor if it is already there.

This is necessary to prevent the modtime of proto from always being greater than
the compilation directory.
---
 lein-protobuf/src/leiningen/protobuf.clj | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index 5b9d850..a778c2a 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -48,7 +48,7 @@
               (recur (into files (proto-dependencies proto-file))))))))))
 
 (defn modtime [dir]
-  (let [files (-> dir io/file file-seq rest)]
+  (let [files (->> dir io/file file-seq rest)]
     (if (empty? files)
       0
       (apply max (map fs/mod-time files)))))
@@ -127,7 +127,7 @@
            dest-path (.getPath dest)
            proto-path (.getAbsoluteFile (io/file (or (:proto-path project) "proto")))]
        (when (or (> (modtime proto-path) (modtime dest))
-                 (> (modtime proto-path) (modtime "classes")))
+                 (> (modtime proto-path) (modtime (str target "/classes"))))
          (.mkdirs dest)
          (.mkdirs proto-path)
          (doseq [proto protos]
@@ -145,14 +145,17 @@
 (defn compile-google-protobuf
   "Compile com.google.protobuf.*"
   [project]
-  (let [proto-files (io/file "proto/google/protobuf")
-        target (target project)]
-    (.mkdirs proto-files)
-    (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
-             (io/file proto-files "descriptor.proto"))
-    (protoc project
-            ["google/protobuf/descriptor.proto"]
-            (io/file target srcdir "java/src/main/java"))))
+  (let [proto-files (io/file (get project :proto-path "proto") "google/protobuf")
+        target (target project)
+        descriptor (io/file proto-files "descriptor.proto")]
+    (when-not (.exists descriptor)
+      (fetch project)
+      (.mkdirs proto-files)
+      (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
+               descriptor)
+      (protoc project
+              ["google/protobuf/descriptor.proto"]
+              (io/file target srcdir "java/src/main/java")))))
 
 (defn compile
   "Compile protocol buffer files located in proto dir."
@@ -160,8 +163,7 @@
      (apply compile project (proto-files (io/file (or (:proto-path project) "proto")))))
   ([project & files]
      (install project)
-     (when (= "protobuf" (:name project))
-       (fetch project)
+     (when (and (= "protobuf" (:name project)))
        (compile-google-protobuf project))
      (protoc project files)))
 

From 62474f7a7a2bed44e52e00b76ec8bad65f7aeb4b Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:47:41 -0500
Subject: [PATCH 267/525] Move symlink to proto to lein-protobuf (so it ends up
 in that jar).

---
 lein-protobuf/resources/proto | 1 +
 resources/proto               | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 120000 lein-protobuf/resources/proto
 delete mode 120000 resources/proto

diff --git a/lein-protobuf/resources/proto b/lein-protobuf/resources/proto
new file mode 120000
index 0000000..b943f93
--- /dev/null
+++ b/lein-protobuf/resources/proto
@@ -0,0 +1 @@
+../../proto
\ No newline at end of file
diff --git a/resources/proto b/resources/proto
deleted file mode 120000
index 4d1e2d8..0000000
--- a/resources/proto
+++ /dev/null
@@ -1 +0,0 @@
-../proto/
\ No newline at end of file

From 16aff061041aa22f263378c09430041ba0eca8d0 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:48:35 -0500
Subject: [PATCH 268/525] lein-protobuf 0.1.0

---
 lein-protobuf/project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
index 23e853e..4543766 100644
--- a/lein-protobuf/project.clj
+++ b/lein-protobuf/project.clj
@@ -1,4 +1,4 @@
-(defproject lein-protobuf "0.1.0-alpha1"
+(defproject lein-protobuf "0.1.0"
   :description "Leiningen plugin for clojure-protobuf."
   :dependencies [[fs "1.0.0"]
                  [conch "0.2.0"]]

From 45bb0c9df5cb02498fe03faed727f9ab8345b1d7 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:48:52 -0500
Subject: [PATCH 269/525] Set real version of lein-protobuf.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index d8af9c4..8567f72 100644
--- a/project.clj
+++ b/project.clj
@@ -4,7 +4,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.1.0-alpha1"]]
+  :plugins [[lein-protobuf "0.1.0"]]
   :profiles {:dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
   :hooks [leiningen.protobuf]

From a8b446f8f070adb52b3727f46fafc4aeacda5345 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:50:03 -0500
Subject: [PATCH 270/525] Add license info and URL.

---
 lein-protobuf/project.clj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
index 4543766..c561421 100644
--- a/lein-protobuf/project.clj
+++ b/lein-protobuf/project.clj
@@ -1,5 +1,8 @@
 (defproject lein-protobuf "0.1.0"
   :description "Leiningen plugin for clojure-protobuf."
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :url "https://github.com/flatland/protobuf"
   :dependencies [[fs "1.0.0"]
                  [conch "0.2.0"]]
   :eval-in-leiningen true

From 88c15de81184b9cf16251735b310740f5ef44ca6 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 2 Jul 2012 17:56:29 -0500
Subject: [PATCH 271/525] Add :url and :license keys to the protobuf project.

---
 project.clj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project.clj b/project.clj
index 8567f72..48be016 100644
--- a/project.clj
+++ b/project.clj
@@ -1,5 +1,8 @@
 (defproject protobuf "0.6.0-beta19"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :url "https://github.com/flatland/clojure-protobuf"
   :dependencies [[org.clojure/clojure "1.4.0"]
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]

From a8c96e48e2bedf4c916bdbd3d1e031f81f41801c Mon Sep 17 00:00:00 2001
From: Anthony Marcar <amarcar@walmartlabs.com>
Date: Tue, 10 Jul 2012 10:13:45 -0700
Subject: [PATCH 272/525] upgraded fs to 1.2.0

---
 lein-protobuf/project.clj                | 2 +-
 lein-protobuf/src/leiningen/protobuf.clj | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
index c561421..c863c66 100644
--- a/lein-protobuf/project.clj
+++ b/lein-protobuf/project.clj
@@ -3,7 +3,7 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/flatland/protobuf"
-  :dependencies [[fs "1.0.0"]
+  :dependencies [[fs "1.2.0"]
                  [conch "0.2.0"]]
   :eval-in-leiningen true
   ;; Bug in the current 1.x branch of Leiningen causes
diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index a778c2a..31c3299 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -7,6 +7,7 @@
         [robert.hooke :only [add-hook]])
   (:require [clojure.java.io :as io]
             [fs.core :as fs]
+            [fs.compression :as fs-zip]
             [conch.core :as sh])
   (:import java.util.zip.ZipFile))
 
@@ -81,7 +82,7 @@
         (with-open [stream (.openStream url)]
           (io/copy stream (io/file zipped)))
         (println "Unzipping" zipfile "to" target)
-        (fs/unzip zipped target)))))
+        (fs-zip/unzip zipped target)))))
 
 (defn uninstall
   "Remove protoc if it is installed."

From c51801832bfa1635dd07526273e7ea57cc915ae1 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Thu, 12 Jul 2012 18:08:19 -0500
Subject: [PATCH 273/525] Fix descriptor compilation in the protobuf project.
 Fixes #33.

---
 lein-protobuf/src/leiningen/protobuf.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index 31c3299..efa91bd 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -148,15 +148,17 @@
   [project]
   (let [proto-files (io/file (get project :proto-path "proto") "google/protobuf")
         target (target project)
-        descriptor (io/file proto-files "descriptor.proto")]
-    (when-not (.exists descriptor)
+        descriptor (io/file proto-files "descriptor.proto")
+        out (io/file target srcdir "java/src/main/java")]
+    (when-not (and (.exists descriptor)
+                   (.exists (io/file out "com/google/protobuf/DescriptorProtos.java")))
       (fetch project)
       (.mkdirs proto-files)
       (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
                descriptor)
       (protoc project
               ["google/protobuf/descriptor.proto"]
-              (io/file target srcdir "java/src/main/java")))))
+              out))))
 
 (defn compile
   "Compile protocol buffer files located in proto dir."

From 493642c8721c29717af16d86437e4bc6d6e30f32 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 13 Jul 2012 17:45:30 -0700
Subject: [PATCH 274/525] run protoc out of the protobuf source directory

Why? So we don't have to try to sudo.

Also, cache the protobuf source with build artifacts in ~/.m2
to prevent redownloading and reinstalling.
---
 lein-protobuf/project.clj                |  2 +-
 lein-protobuf/src/leiningen/protobuf.clj | 96 +++++++++---------------
 project.clj                              |  2 +-
 3 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
index c863c66..97e800f 100644
--- a/lein-protobuf/project.clj
+++ b/lein-protobuf/project.clj
@@ -1,4 +1,4 @@
-(defproject lein-protobuf "0.1.0"
+(defproject lein-protobuf "0.1.1"
   :description "Leiningen plugin for clojure-protobuf."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index efa91bd..7011f68 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -12,14 +12,16 @@
   (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
-(def srcdir  (str "protobuf-" version))
+(def cache   (format "%s/.m2/src/com/google/protobuf/%s" (System/getProperty "user.home") version))
 (def zipfile (format "protobuf-%s.zip" version))
+(def srcdir  (format "%s/protobuf-%s" cache version))
+(def protoc  (format "%s/src/protoc" srcdir))
 
 (def ^{:dynamic true} *compile?* true)
 
 (def url
   (java.net.URL.
-   (format "http://protobuf.googlecode.com/files/protobuf-%s.zip"  version)))
+   (format "http://protobuf.googlecode.com/files/%s" zipfile)))
 
 (defn target [project]
   (doto (io/file (:target-path project))
@@ -63,10 +65,6 @@
   (for [file (rest (file-seq dir)) :when (proto-file? file)]
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
-(defn installed? []
-  (try (.contains (sh/stream-to-string (sh/proc "protoc" "--version") :out) version)
-       (catch java.io.IOException e)))
-
 (defn read-pass []
   (print "Password: ")
   (flush)
@@ -75,53 +73,35 @@
 (defn fetch
   "Fetch protocol-buffer source and unzip it."
   [project]
-  (let [target (target project)]
-    (when-not (.exists (io/file target srcdir))
-      (let [zipped (io/file target zipfile)]
+  (let [srcdir (io/file srcdir)]
+    (when-not (.exists srcdir)
+      (.mkdirs srcdir)
+      (let [zipped (io/file cache zipfile)]
         (println "Downloading" zipfile)
         (with-open [stream (.openStream url)]
           (io/copy stream (io/file zipped)))
         (println "Unzipping" zipfile "to" target)
-        (fs-zip/unzip zipped target)))))
+        (fs-zip/unzip zipped cache)))))
 
-(defn uninstall
-  "Remove protoc if it is installed."
-  [project]
-  (when (installed?)
-    (let [password (read-pass)
-          proc (sh/proc "sudo" "-S" "make" "uninstall"
-                        :dir (io/file (target project) srcdir))]
-      (sh/feed-from-string proc (str password "\n"))
-      (sh/stream-to-out proc :out))))
-
-(defn install
-  "Compile and install protoc to /usr/local."
+(defn build-protoc
+  "Compile protoc from source."
   [project]
-  (when-not (installed?)
-    (fetch project)
-    (let [source (io/file (target project) srcdir)]
-      (when-not (.exists (io/file source "src" "protoc"))
-        (fs/chmod "+x" (io/file source "configure"))
-        (fs/chmod "+x" (io/file source "install-sh"))
+  (let [srcdir (io/file srcdir)
+        protoc (io/file protoc)]
+    (when-not (.exists protoc)
+      (fetch project)
+      (when-not (.exists (io/file srcdir "src" "protoc"))
+        (fs/chmod "+x" (io/file srcdir "configure"))
+        (fs/chmod "+x" (io/file srcdir "install-sh"))
         (println "Configuring protoc")
-        (sh/stream-to-out (sh/proc "./configure" :dir source) :out)
+        (sh/stream-to-out (sh/proc "./configure" :dir srcdir) :out)
         (println "Running 'make'")
-        (sh/stream-to-out (sh/proc "make" :dir source) :out))
-      (println "Installing")
-      (let [password (str (read-pass) "\n")
-            opts     {:dir source :input-string (str password "\n")}
-            proc     (if (= :linux (get-os))
-                       (sh/proc "script" "-q" "-c" "sudo -S make install" "/dev/null"
-                                :dir source)
-                       (sh/proc "sudo" "-S" "make" "install"
-                                :dir source))]
-        (sh/feed-from-string proc password)
-        (sh/stream-to-out proc :out)))))
-
-(defn protoc
+        (sh/stream-to-out (sh/proc "make" :dir srcdir) :out)))))
+
+(defn compile-protobuf
   "Create .java and .class files from the provided .proto files."
   ([project protos]
-     (protoc project protos (io/file (target project) "protosrc")))
+     (compile-protobuf project protos (io/file (target project) "protosrc")))
   ([project protos dest]
      (let [target (target project)
            dest (.getAbsoluteFile dest)
@@ -133,7 +113,7 @@
          (.mkdirs proto-path)
          (doseq [proto protos]
            (extract-dependencies proto-path proto target)
-           (let [args ["protoc" proto (str "--java_out=" dest-path) "-I."
+           (let [args [protoc proto (str "--java_out=" dest-path) "-I."
                        (str "-I" (.getAbsoluteFile (io/file target "proto")))
                        (str "-I" proto-path)]]
              (println " > " (join " " args))
@@ -149,26 +129,26 @@
   (let [proto-files (io/file (get project :proto-path "proto") "google/protobuf")
         target (target project)
         descriptor (io/file proto-files "descriptor.proto")
-        out (io/file target srcdir "java/src/main/java")]
+        out (io/file srcdir "java/src/main/java")]
     (when-not (and (.exists descriptor)
                    (.exists (io/file out "com/google/protobuf/DescriptorProtos.java")))
       (fetch project)
       (.mkdirs proto-files)
-      (io/copy (io/file target srcdir "src/google/protobuf/descriptor.proto")
+      (io/copy (io/file srcdir "src/google/protobuf/descriptor.proto")
                descriptor)
-      (protoc project
-              ["google/protobuf/descriptor.proto"]
-              out))))
+      (compile-protobuf project
+                        ["google/protobuf/descriptor.proto"]
+                        out))))
 
 (defn compile
   "Compile protocol buffer files located in proto dir."
   ([project]
      (apply compile project (proto-files (io/file (or (:proto-path project) "proto")))))
   ([project & files]
-     (install project)
+     (build-protoc project)
      (when (and (= "protobuf" (:name project)))
        (compile-google-protobuf project))
-     (protoc project files)))
+     (compile-protobuf project files)))
 
 (add-hook #'javac
           (fn [f & args]
@@ -176,13 +156,7 @@
               (compile (first args)))
             (apply f args)))
 
-(defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
-        :help-arglists '([subtask & args])
-        :subtasks [#'install #'uninstall #'compile]}
-  protobuf
-  ([project] (println (help-for "protobuf")))
-  ([project subtask & args]
-     (case subtask
-       "install"   (apply install project args)
-       "uninstall" (apply uninstall project args)
-       "compile"   (apply compile project args))))
+(defn protobuf
+  "Task for compiling protobuf libraries."
+  [project & args]
+  (apply compile project args))
diff --git a/project.clj b/project.clj
index 48be016..1b2f804 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.1.0"]]
+  :plugins [[lein-protobuf "0.1.1"]]
   :profiles {:dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
   :hooks [leiningen.protobuf]

From 0518876396a3d22725c3f7bd455a8d235ba04903 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 13:46:27 -0700
Subject: [PATCH 275/525] use ~/.lein/cache/lein-protobuf instead of hijacking
 ~/.m2

---
 lein-protobuf/src/leiningen/protobuf.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index 7011f68..876fc23 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -4,6 +4,7 @@
         [leiningen.help :only [help-for]]
         [leiningen.javac :only [javac]]
         [leiningen.core.eval :only [get-os]]
+        [leiningen.core.user :only [leiningen-home]]
         [robert.hooke :only [add-hook]])
   (:require [clojure.java.io :as io]
             [fs.core :as fs]
@@ -12,7 +13,7 @@
   (:import java.util.zip.ZipFile))
 
 (def version "2.3.0")
-(def cache   (format "%s/.m2/src/com/google/protobuf/%s" (System/getProperty "user.home") version))
+(def cache   (str (leiningen-home) "/cache/lein-protobuf"))
 (def zipfile (format "protobuf-%s.zip" version))
 (def srcdir  (format "%s/protobuf-%s" cache version))
 (def protoc  (format "%s/src/protoc" srcdir))

From c84bb5a9214b89fbcd7f0f30f555387662e7f98d Mon Sep 17 00:00:00 2001
From: Travis Vachon <travis@copious.com>
Date: Mon, 9 Jul 2012 16:37:57 -0400
Subject: [PATCH 276/525] Allow protobufs version to be specified in the
 project file

This lets us use this task with protobufs 2.4.1. Note that this
does not guarantee that the top level project's Clojure library
will be compatible with the generated code - change versions
at your own risk.
---
 lein-protobuf/src/leiningen/protobuf.clj | 81 +++++++++++++++---------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index 876fc23..c12d268 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -12,17 +12,18 @@
             [conch.core :as sh])
   (:import java.util.zip.ZipFile))
 
-(def version "2.3.0")
-(def cache   (str (leiningen-home) "/cache/lein-protobuf"))
-(def zipfile (format "protobuf-%s.zip" version))
-(def srcdir  (format "%s/protobuf-%s" cache version))
-(def protoc  (format "%s/src/protoc" srcdir))
+(def default-version "2.3.0")
+(defn version
+  [project]
+  (or (:protobuf-version project) "default-version"))
+(defn srcdir [project] (str "protobuf-" (version project)))
+(defn zipfile [project] (format "protobuf-%s.zip" (version project)))
 
 (def ^{:dynamic true} *compile?* true)
 
-(def url
+(defn url [project]
   (java.net.URL.
-   (format "http://protobuf.googlecode.com/files/%s" zipfile)))
+   (format "http://protobuf.googlecode.com/files/protobuf-%s.zip" (version project))))
 
 (defn target [project]
   (doto (io/file (:target-path project))
@@ -66,6 +67,10 @@
   (for [file (rest (file-seq dir)) :when (proto-file? file)]
     (.substring (.getPath file) (inc (count (.getPath dir))))))
 
+(defn installed? [project]
+  (try (.contains (sh/stream-to-string (sh/proc "protoc" "--version") :out) (version project))
+       (catch java.io.IOException e)))
+
 (defn read-pass []
   (print "Password: ")
   (flush)
@@ -74,26 +79,34 @@
 (defn fetch
   "Fetch protocol-buffer source and unzip it."
   [project]
-  (let [srcdir (io/file srcdir)]
-    (when-not (.exists srcdir)
-      (.mkdirs srcdir)
-      (let [zipped (io/file cache zipfile)]
-        (println "Downloading" zipfile)
-        (with-open [stream (.openStream url)]
+  (let [target (target project)]
+    (when-not (.exists (io/file target (srcdir project)))
+      (let [zipped (io/file target (zipfile project))]
+        (println "Downloading" (zipfile project))
+        (with-open [stream (.openStream (url project))]
           (io/copy stream (io/file zipped)))
-        (println "Unzipping" zipfile "to" target)
-        (fs-zip/unzip zipped cache)))))
+        (println "Unzipping" (zipfile project) "to" target)
+        (fs/unzip zipped target)))))
 
-(defn build-protoc
-  "Compile protoc from source."
+(defn uninstall
+  "Remove protoc if it is installed."
   [project]
-  (let [srcdir (io/file srcdir)
-        protoc (io/file protoc)]
-    (when-not (.exists protoc)
-      (fetch project)
-      (when-not (.exists (io/file srcdir "src" "protoc"))
-        (fs/chmod "+x" (io/file srcdir "configure"))
-        (fs/chmod "+x" (io/file srcdir "install-sh"))
+  (when (installed? project)
+    (let [password (read-pass)
+          proc (sh/proc "sudo" "-S" "make" "uninstall"
+                        :dir (io/file (target project) (srcdir project)))]
+      (sh/feed-from-string proc (str password "\n"))
+      (sh/stream-to-out proc :out))))
+
+(defn install
+  "Compile and install protoc to /usr/local."
+  [project]
+  (when-not (installed? project)
+    (fetch project)
+    (let [source (io/file (target project) (srcdir project))]
+      (when-not (.exists (io/file source "src" "protoc"))
+        (fs/chmod "+x" (io/file source "configure"))
+        (fs/chmod "+x" (io/file source "install-sh"))
         (println "Configuring protoc")
         (sh/stream-to-out (sh/proc "./configure" :dir srcdir) :out)
         (println "Running 'make'")
@@ -137,9 +150,9 @@
       (.mkdirs proto-files)
       (io/copy (io/file srcdir "src/google/protobuf/descriptor.proto")
                descriptor)
-      (compile-protobuf project
-                        ["google/protobuf/descriptor.proto"]
-                        out))))
+      (protoc project
+              ["google/protobuf/descriptor.proto"]
+              (io/file target (srcdir project) "java/src/main/java")))))
 
 (defn compile
   "Compile protocol buffer files located in proto dir."
@@ -157,7 +170,13 @@
               (compile (first args)))
             (apply f args)))
 
-(defn protobuf
-  "Task for compiling protobuf libraries."
-  [project & args]
-  (apply compile project args))
+(defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
+        :help-arglists '([subtask & args])
+        :subtasks [#'install #'uninstall #'compile]}
+  protobuf
+  ([project] (println (help-for "protobuf")))
+  ([project subtask & args]
+     (case subtask
+       "install"   (apply install project args)
+       "uninstall" (apply uninstall project args)
+       "compile"   (apply compile project args))))

From dbc311a725f2f62e859519534d731f8a4e26d125 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 17:08:40 -0700
Subject: [PATCH 277/525] doc grammar change

---
 lein-protobuf/src/leiningen/protobuf.clj | 27 +++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
index c12d268..99a43d4 100644
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ b/lein-protobuf/src/leiningen/protobuf.clj
@@ -36,21 +36,18 @@
     (second (re-matches #".*\"(.*)\".*" line))))
 
 (defn extract-dependencies
-  "extract all files proto is dependent on"
-  [proto-path proto-file target]
-  (let [proto-file (io/file proto-path proto-file)]
-    (loop [files (vec (proto-dependencies proto-file))]
-      (when-not (empty? files)
-        (let [proto (peek files)
-              files (pop files)]
-          (if (or (.exists (io/file proto-path proto))
-                  (.exists (io/file target "proto" proto)))
-            (recur files)
-            (let [location (str "proto/" proto)
-                  proto-file (io/file target location)]
-              (.mkdirs (.getParentFile proto-file))
-              (io/copy (io/reader (io/resource location)) proto-file)
-              (recur (into files (proto-dependencies proto-file))))))))))
+  "Extract all files proto depends on into dest."
+  [proto-path proto dest]
+  (loop [deps (proto-dependencies (io/file proto-path proto))]
+    (when-let [[dep & deps] (seq deps)]
+      (let [proto-file (io/file dest dep)]
+        (if (or (.exists (io/file proto-path dep))
+                (.exists proto-file))
+          (recur deps)
+          (do (.mkdirs (.getParentFile proto-file))
+              (io/copy (io/reader (io/resource "proto" proto))
+                       proto-file)
+              (recur (concat deps (proto-dependencies proto-file)))))))))
 
 (defn modtime [dir]
   (let [files (->> dir io/file file-seq rest)]

From 19ab76a0a1c9b9b9182fc260774d0676f5c06584 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 18:11:31 -0700
Subject: [PATCH 278/525] update readme

---
 README.md | 66 +++++++++++++++++++------------------------------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index a386644..14a903c 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,26 @@
-Clojure-protobuf provides a clojure interface to Google's [protocol buffers](http://code.google.com/p/protobuf).
+clojure-protobuf provides a Clojure interface to Google's [protocol buffers](http://code.google.com/p/protobuf).
 Protocol buffers can be used to communicate with other languages over the network, and
 they are WAY faster to serialize and deserialize than standard Clojure objects.
 
+## Getting started
+
+You'll probably want to use [Leiningen](https://github.com/technomancy/leiningen) with the
+[lein-protobuf](https://github.com/flatland/lein-protobuf) plugin for compiling `.proto` files. Add
+the following to your `project.clj` file:
+
+    :dependencies [[protobuf "0.6.0"]]
+    :plugins [[lein-protobuf "0.1.1"]]
+
+Be sure to replace `"0.6.0"` and `"0.1.1"` with the latest versions listed at
+http://clojars.org/protobuf and http://clojars.org/lein-protobuf.
+
+*Note: lein-protobuf requires at least version 2.0 of Leiningen.*
+
 ## Usage
 
-Write a `.proto` file:
+Assuming you have the following in `resources/proto/person.proto`:
 
-```java
+```proto
 message Person {
   required int32  id    = 1;
   required string name  = 2;
@@ -15,13 +29,11 @@ message Person {
 }
 ```
 
-If you put it in the proto directory of your project, you can compile it with [leiningen](https://github.com/technomancy/leiningen):
+You can run the following to compile the `.proto` file:
 
-```
-lein protobuf compile example.proto
-```
+    lein protobuf
 
-Now you can use the protocol buffer in clojure:
+Now you can use the protocol buffer in Clojure:
 
 ```clojure
 (use 'protobuf.core)
@@ -54,7 +66,7 @@ Clojure-protobuf supports extensions to protocol buffers which provide sets and
 repeated fields. You can also provide metadata on protobuf fields using clojure syntax. To
 use these, you must import the extension file and include it when compiling. For example:
 
-```java
+```proto
 import "protobuf/core/extensions.proto";
 
 message Photo {
@@ -83,14 +95,7 @@ message Photo {
   }
 }
 ```
-
-Compile the file:
-
-```
-lein protobuf compile example.proto
-```
-
-Then you can access the maps in clojure:
+Then you can access the extension fields in Clojure:
 
 ```clojure
 (use 'protobuf)
@@ -115,33 +120,6 @@ Then you can access the maps in clojure:
 => {:max 100.0 :min -100.0}
 ```
 
-## Installation
-
-You'll want to use this with the Leiningen build tool. You can get it by
-putting it in your `:dependencies` and/or `:dev-dependencies`. If you
-want to use the Leiningen plugin portion of clojure-protobuf, it has to
-be in your dev-dependencies.
-
-```clojure
-:dev-dependencies [[protobuf "x.x.x"]]
-```
-
-Replace `"x.x.x"` with the actual latest version, which you can find on
-[clojars](http://clojars.org/protobuf)
-
-**NOTE: clojure-protobuf requires at least version 1.7.0 of Leiningen.
-It will not work in earlier versions.**
-
-## History
-
-The build tool tasks provided with this library were originally for the
-cake build tool. In 2011, the authors of that tool decided that their
-time would be better spent working on a single, canonical build tool.
-Leiningen was already the standard for Clojure, so that's where we are
-now. As of version 0.6.0 (which has yet to see an final release, but is
-usable), all of the cake-specific functionality has been rewritten for
-Leiningen. Any version before that will not work with Leiningen.
-
 ## Getting Help
 
 If you have any questions or need help, you can find us on IRC in [#flatland](irc://irc.freenode.net/#flatland).

From cbf8d3045c15e90d4b489d9cdb9d8d55c042e9f3 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 18:24:11 -0700
Subject: [PATCH 279/525] separate lein-protobuf out into a separate repo

---
 lein-protobuf/project.clj                |  13 --
 lein-protobuf/resources/proto            |   1 -
 lein-protobuf/src/leiningen/protobuf.clj | 179 -----------------------
 3 files changed, 193 deletions(-)
 delete mode 100644 lein-protobuf/project.clj
 delete mode 120000 lein-protobuf/resources/proto
 delete mode 100644 lein-protobuf/src/leiningen/protobuf.clj

diff --git a/lein-protobuf/project.clj b/lein-protobuf/project.clj
deleted file mode 100644
index 97e800f..0000000
--- a/lein-protobuf/project.clj
+++ /dev/null
@@ -1,13 +0,0 @@
-(defproject lein-protobuf "0.1.1"
-  :description "Leiningen plugin for clojure-protobuf."
-  :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url "https://github.com/flatland/protobuf"
-  :dependencies [[fs "1.2.0"]
-                 [conch "0.2.0"]]
-  :eval-in-leiningen true
-  ;; Bug in the current 1.x branch of Leiningen causes
-  ;; jar to implicitly clean no matter what, wiping stuff.
-  ;; This prevents that.
-  :disable-implicit-clean true
-  :checksum-deps true)
diff --git a/lein-protobuf/resources/proto b/lein-protobuf/resources/proto
deleted file mode 120000
index b943f93..0000000
--- a/lein-protobuf/resources/proto
+++ /dev/null
@@ -1 +0,0 @@
-../../proto
\ No newline at end of file
diff --git a/lein-protobuf/src/leiningen/protobuf.clj b/lein-protobuf/src/leiningen/protobuf.clj
deleted file mode 100644
index 99a43d4..0000000
--- a/lein-protobuf/src/leiningen/protobuf.clj
+++ /dev/null
@@ -1,179 +0,0 @@
-(ns leiningen.protobuf
-  (:refer-clojure :exclude [compile])
-  (:use [clojure.string :only [join]]
-        [leiningen.help :only [help-for]]
-        [leiningen.javac :only [javac]]
-        [leiningen.core.eval :only [get-os]]
-        [leiningen.core.user :only [leiningen-home]]
-        [robert.hooke :only [add-hook]])
-  (:require [clojure.java.io :as io]
-            [fs.core :as fs]
-            [fs.compression :as fs-zip]
-            [conch.core :as sh])
-  (:import java.util.zip.ZipFile))
-
-(def default-version "2.3.0")
-(defn version
-  [project]
-  (or (:protobuf-version project) "default-version"))
-(defn srcdir [project] (str "protobuf-" (version project)))
-(defn zipfile [project] (format "protobuf-%s.zip" (version project)))
-
-(def ^{:dynamic true} *compile?* true)
-
-(defn url [project]
-  (java.net.URL.
-   (format "http://protobuf.googlecode.com/files/protobuf-%s.zip" (version project))))
-
-(defn target [project]
-  (doto (io/file (:target-path project))
-    .mkdirs))
-
-(defn- proto-dependencies
-  "look for lines starting with import in proto-file"
-  [proto-file]
-  (for [line (line-seq (io/reader proto-file)) :when (.startsWith line "import")]
-    (second (re-matches #".*\"(.*)\".*" line))))
-
-(defn extract-dependencies
-  "Extract all files proto depends on into dest."
-  [proto-path proto dest]
-  (loop [deps (proto-dependencies (io/file proto-path proto))]
-    (when-let [[dep & deps] (seq deps)]
-      (let [proto-file (io/file dest dep)]
-        (if (or (.exists (io/file proto-path dep))
-                (.exists proto-file))
-          (recur deps)
-          (do (.mkdirs (.getParentFile proto-file))
-              (io/copy (io/reader (io/resource "proto" proto))
-                       proto-file)
-              (recur (concat deps (proto-dependencies proto-file)))))))))
-
-(defn modtime [dir]
-  (let [files (->> dir io/file file-seq rest)]
-    (if (empty? files)
-      0
-      (apply max (map fs/mod-time files)))))
-
-(defn proto-file? [file]
-  (let [name (.getName file)]
-    (and (.endsWith name ".proto")
-         (not (.startsWith name ".")))))
-
-(defn proto-files [dir]
-  (for [file (rest (file-seq dir)) :when (proto-file? file)]
-    (.substring (.getPath file) (inc (count (.getPath dir))))))
-
-(defn installed? [project]
-  (try (.contains (sh/stream-to-string (sh/proc "protoc" "--version") :out) (version project))
-       (catch java.io.IOException e)))
-
-(defn read-pass []
-  (print "Password: ")
-  (flush)
-  (join (.readPassword (System/console))))
-
-(defn fetch
-  "Fetch protocol-buffer source and unzip it."
-  [project]
-  (let [target (target project)]
-    (when-not (.exists (io/file target (srcdir project)))
-      (let [zipped (io/file target (zipfile project))]
-        (println "Downloading" (zipfile project))
-        (with-open [stream (.openStream (url project))]
-          (io/copy stream (io/file zipped)))
-        (println "Unzipping" (zipfile project) "to" target)
-        (fs/unzip zipped target)))))
-
-(defn uninstall
-  "Remove protoc if it is installed."
-  [project]
-  (when (installed? project)
-    (let [password (read-pass)
-          proc (sh/proc "sudo" "-S" "make" "uninstall"
-                        :dir (io/file (target project) (srcdir project)))]
-      (sh/feed-from-string proc (str password "\n"))
-      (sh/stream-to-out proc :out))))
-
-(defn install
-  "Compile and install protoc to /usr/local."
-  [project]
-  (when-not (installed? project)
-    (fetch project)
-    (let [source (io/file (target project) (srcdir project))]
-      (when-not (.exists (io/file source "src" "protoc"))
-        (fs/chmod "+x" (io/file source "configure"))
-        (fs/chmod "+x" (io/file source "install-sh"))
-        (println "Configuring protoc")
-        (sh/stream-to-out (sh/proc "./configure" :dir srcdir) :out)
-        (println "Running 'make'")
-        (sh/stream-to-out (sh/proc "make" :dir srcdir) :out)))))
-
-(defn compile-protobuf
-  "Create .java and .class files from the provided .proto files."
-  ([project protos]
-     (compile-protobuf project protos (io/file (target project) "protosrc")))
-  ([project protos dest]
-     (let [target (target project)
-           dest (.getAbsoluteFile dest)
-           dest-path (.getPath dest)
-           proto-path (.getAbsoluteFile (io/file (or (:proto-path project) "proto")))]
-       (when (or (> (modtime proto-path) (modtime dest))
-                 (> (modtime proto-path) (modtime (str target "/classes"))))
-         (.mkdirs dest)
-         (.mkdirs proto-path)
-         (doseq [proto protos]
-           (extract-dependencies proto-path proto target)
-           (let [args [protoc proto (str "--java_out=" dest-path) "-I."
-                       (str "-I" (.getAbsoluteFile (io/file target "proto")))
-                       (str "-I" proto-path)]]
-             (println " > " (join " " args))
-             (let [protoc-result (apply sh/proc (concat args [:dir proto-path]))]
-               (if (not (= (sh/exit-code protoc-result) 0))
-                 (println "ERROR: " (sh/stream-to-string protoc-result :err))))))
-         (binding [*compile?* false]
-           (javac (assoc project :java-source-paths [dest-path])))))))
-
-(defn compile-google-protobuf
-  "Compile com.google.protobuf.*"
-  [project]
-  (let [proto-files (io/file (get project :proto-path "proto") "google/protobuf")
-        target (target project)
-        descriptor (io/file proto-files "descriptor.proto")
-        out (io/file srcdir "java/src/main/java")]
-    (when-not (and (.exists descriptor)
-                   (.exists (io/file out "com/google/protobuf/DescriptorProtos.java")))
-      (fetch project)
-      (.mkdirs proto-files)
-      (io/copy (io/file srcdir "src/google/protobuf/descriptor.proto")
-               descriptor)
-      (protoc project
-              ["google/protobuf/descriptor.proto"]
-              (io/file target (srcdir project) "java/src/main/java")))))
-
-(defn compile
-  "Compile protocol buffer files located in proto dir."
-  ([project]
-     (apply compile project (proto-files (io/file (or (:proto-path project) "proto")))))
-  ([project & files]
-     (build-protoc project)
-     (when (and (= "protobuf" (:name project)))
-       (compile-google-protobuf project))
-     (compile-protobuf project files)))
-
-(add-hook #'javac
-          (fn [f & args]
-            (when *compile?*
-              (compile (first args)))
-            (apply f args)))
-
-(defn ^{:doc "Tasks for installing and uninstalling protobuf libraries."
-        :help-arglists '([subtask & args])
-        :subtasks [#'install #'uninstall #'compile]}
-  protobuf
-  ([project] (println (help-for "protobuf")))
-  ([project subtask & args]
-     (case subtask
-       "install"   (apply install project args)
-       "uninstall" (apply uninstall project args)
-       "compile"   (apply compile project args))))

From cd5a646594b75b319428cb0c7ba2c5adf2f4c022 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 18:25:53 -0700
Subject: [PATCH 280/525] example.proto is at
 resources/proto/protobuf/test/example.proto

---
 examples/.gitignore    |  2 --
 examples/example.proto | 28 ----------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 examples/.gitignore
 delete mode 100644 examples/example.proto

diff --git a/examples/.gitignore b/examples/.gitignore
deleted file mode 100644
index 6a70a53..0000000
--- a/examples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.class
-*.java
\ No newline at end of file
diff --git a/examples/example.proto b/examples/example.proto
deleted file mode 100644
index ca639ac..0000000
--- a/examples/example.proto
+++ /dev/null
@@ -1,28 +0,0 @@
-import "collections.proto";
-
-message Photo {
-  required int32  id     = 1;
-  required string path   = 2;
-  repeated string labels = 3 [(set)    = true];
-  repeated Attr   attrs  = 4 [(map)    = true];
-  repeated Tag    tags   = 5 [(map_by) = "person_id"];
-
-  message Attr {
-    required string key = 1;
-    optional string val = 2;
-  }
-
-  message Tag {
-    required int32 person_id = 1;
-    optional int32 x_coord   = 2;
-    optional int32 y_coord   = 3;
-    optional int32 width     = 4;
-    optional int32 height    = 5;
-  }
-}
-
-message Person {
-  required int32 id = 1;
-  required string name = 2;
-  optional string email = 3;
-}

From f453ef0c8739c21ff2b538a03e7c95cdfb34838a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 18:32:50 -0700
Subject: [PATCH 281/525] 0.6.1-beta1

---
 project.clj | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index 1b2f804..1739915 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.0-beta19"
+(defproject protobuf "0.6.1-beta1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,13 +7,9 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.1.1"]]
+  :plugins [[lein-protobuf "0.2.0-beta1"]]
   :profiles {:dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
   :hooks [leiningen.protobuf]
-  ;; Bug in the current 1.x branch of Leiningen causes
-  ;; jar to implicitly clean no matter what, wiping stuff.
-  ;; This prevents that.
-  :disable-implicit-clean true
   :checksum-deps true
   :java-source-paths ["src"])

From bdcc3e4099b316d5989b0ad3b6fbd7e9c7956548 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 16 Jul 2012 19:09:34 -0700
Subject: [PATCH 282/525] use protobuf 2.4.1

---
 project.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project.clj b/project.clj
index 1739915..5767016 100644
--- a/project.clj
+++ b/project.clj
@@ -10,6 +10,7 @@
   :plugins [[lein-protobuf "0.2.0-beta1"]]
   :profiles {:dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
+  :protobuf-version "2.4.1"
   :hooks [leiningen.protobuf]
   :checksum-deps true
   :java-source-paths ["src"])

From cc24481e463deacaeee8084494f259a2d5755c1a Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 18 Jul 2012 14:56:26 -0700
Subject: [PATCH 283/525] update lein-protobuf

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 5767016..547f1f9 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.1-beta1"
+(defproject protobuf "0.6.1-beta2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta1"]]
+  :plugins [[lein-protobuf "0.2.0-beta2"]]
   :profiles {:dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
   :protobuf-version "2.4.1"

From c41c9113161f6b1a3e36dacd3f4b12e60c9e3ead Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 24 Jul 2012 17:34:54 -0500
Subject: [PATCH 284/525] Test against multiple Clojure versions.

---
 project.clj | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 547f1f9..3ada145 100644
--- a/project.clj
+++ b/project.clj
@@ -7,9 +7,15 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta2"]]
-  :profiles {:dev {:dependencies [[gloss "0.2.1"]
+  :plugins [[lein-protobuf "0.2.0-beta3"]]
+  :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
+  :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
+             :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
+             :dev {:dependencies [[gloss "0.2.1"]
                                   [io "0.2.0-beta2"]]}}
+  :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
+                                       :snapshots true
+                                       :releases {:checksum :fail :update :always}}}
   :protobuf-version "2.4.1"
   :hooks [leiningen.protobuf]
   :checksum-deps true

From 8523115400314c9dbd619e7ce43972c8ae86cfa6 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 24 Jul 2012 17:35:16 -0500
Subject: [PATCH 285/525] Add travis file.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..65a5762
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: clojure
+lein: lein2
+script: lein2 testall
\ No newline at end of file

From b6b1180643f521bfe49660de05ed12a661264480 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 13 Aug 2012 12:40:39 -0700
Subject: [PATCH 286/525] ignore pom.xml.asc

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9468b9f..ba264f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ lib
 classes
 build
 pom.xml
+pom.xml.asc
 *.jar
 *.class
 proto/google/protobuf/descriptor.proto

From bebad893eda3ea473ceda9424c959df3bcc0c585 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 13 Aug 2012 12:40:52 -0700
Subject: [PATCH 287/525] update to lein-protobuf with auto-hooks

---
 project.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 3ada145..d303747 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta3"]]
+  :plugins [[lein-protobuf "0.2.0-beta5"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
@@ -17,6 +17,5 @@
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}
   :protobuf-version "2.4.1"
-  :hooks [leiningen.protobuf]
   :checksum-deps true
   :java-source-paths ["src"])

From eb78ba5b7c2bc420cfa6b36b8993755f6ce6ae9e Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 13 Aug 2012 16:18:52 -0500
Subject: [PATCH 288/525] Update to lein-protobuf 0.2.0-beta6.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index d303747..4e3368a 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta5"]]
+  :plugins [[lein-protobuf "0.2.0-beta6"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}

From d823f2262bb32ae71956888b297db4c2da76c7bb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 14 Aug 2012 16:10:20 -0700
Subject: [PATCH 289/525] bump protobuf default version to 2.4.1

---
 project.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4e3368a..df6367d 100644
--- a/project.clj
+++ b/project.clj
@@ -16,6 +16,5 @@
   :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}
-  :protobuf-version "2.4.1"
   :checksum-deps true
   :java-source-paths ["src"])

From 62bd5ffc84ac1963887c25dd92497c9e41a3238b Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Tue, 14 Aug 2012 18:20:05 -0500
Subject: [PATCH 290/525] Bump lein-protobuf version.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index df6367d..5fd707e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.1-beta2"
+(defproject protobuf "0.6.1-beta3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.2-alpha1"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta6"]]
+  :plugins [[lein-protobuf "0.2.0-beta7"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}

From ecd9c20987d88bb81f7a20d7cbc60bc854b0f109 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Wed, 22 Aug 2012 20:44:24 -0500
Subject: [PATCH 291/525] Update versions.

---
 project.clj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index 5fd707e..478dce7 100644
--- a/project.clj
+++ b/project.clj
@@ -1,18 +1,18 @@
-(defproject protobuf "0.6.1-beta3"
+(defproject protobuf "0.6.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/flatland/clojure-protobuf"
   :dependencies [[org.clojure/clojure "1.4.0"]
                  [ordered-collections "0.4.0"]
-                 [useful "0.8.2-alpha1"]
+                 [useful "0.8.4"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0-beta7"]]
+  :plugins [[lein-protobuf "0.2.0"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
              :dev {:dependencies [[gloss "0.2.1"]
-                                  [io "0.2.0-beta2"]]}}
+                                  [io "0.2.1"]]}}
   :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}

From 431c8bd1aa079519c37f8482832b01e604d826ea Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 7 Aug 2012 14:06:27 -0700
Subject: [PATCH 292/525] This may as well be public.

Package-private is just stupid anyway.
---
 src/protobuf/core/PersistentProtocolBufferMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index bc6aa94..f43679f 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -114,7 +114,7 @@ public String toString() {
       }
     };
 
-    final Descriptors.Descriptor type;
+    public final Descriptors.Descriptor type;
     public final NamingStrategy namingStrategy;
 
     public static final Object NULL = new Object();

From d85b07b52de963092072aa39ab5479ac4ff8faef Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 7 Aug 2012 14:06:40 -0700
Subject: [PATCH 293/525] Refuse to serialize with non-empty extmap

---
 src/protobuf/core/PersistentProtocolBufferMap.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index f43679f..1f9b258 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -314,6 +314,9 @@ protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, D
   }
 
   public byte[] toByteArray() {
+    if (RT.count(ext) != 0) {
+      throw new IllegalStateException("Can't serialize unexpected keys: " + RT.printString(RT.keys(ext)));
+    }
     return message().toByteArray();
   }
 

From 8e7157ecf28706c5a3d20b07b6ae71a4b3718ff1 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Tue, 7 Aug 2012 16:17:21 -0700
Subject: [PATCH 294/525] Make sure conj and construct use the extmap.

---
 .../core/PersistentProtocolBufferMap.java     | 42 +++++++++++--------
 test/protobuf/core_test.clj                   | 12 +++++-
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index 1f9b258..f41aa06 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -273,7 +273,7 @@ static public PersistentProtocolBufferMap parseDelimitedFrom(Def def, InputStrea
 
   static public PersistentProtocolBufferMap construct(Def def, Object keyvals) {
     PersistentProtocolBufferMap protobuf = new PersistentProtocolBufferMap(null, def);
-    return (PersistentProtocolBufferMap)protobuf.cons(keyvals);
+    return protobuf.cons(keyvals);
   }
 
   protected PersistentProtocolBufferMap(IPersistentMap meta, Def def) {
@@ -557,16 +557,17 @@ protected void setField(DynamicMessage.Builder builder, Descriptors.FieldDescrip
     }
   }
 
-  protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object key, Object value) {
+  // returns true if the protobuf can store this key
+  protected boolean addField(DynamicMessage.Builder builder, Object key, Object value) {
     if (key == null) {
-      return builder;
+      return false;
     }
     Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
     if (field == null) {
-      return builder;
+      return false;
     }
     if (value == null && !(field.getOptions().getExtension(Extensions.nullable))) {
-      return builder;
+      return true;
     }
     boolean set = field.getOptions().getExtension(Extensions.set);
 
@@ -621,7 +622,7 @@ protected DynamicMessage.Builder addField(DynamicMessage.Builder builder, Object
       setField(builder, field, v);
     }
 
-    return builder;
+    return true;
   }
 
   @Override
@@ -686,18 +687,18 @@ public Object getValAt(Object key, Object notFound, boolean use_extensions) {
   }
 
   @Override
-  public IPersistentMap assoc(Object key, Object value) {
-    Descriptors.FieldDescriptor field = def.fieldDescriptor(key);
+  public PersistentProtocolBufferMap assoc(Object key, Object value) {
+    DynamicMessage.Builder builder = builder();
 
-    if (field != null) {
-      return new PersistentProtocolBufferMap(meta(), ext, def, addField(builder(), field, value));
+    if (addField(builder, key, value)) {
+      return new PersistentProtocolBufferMap(meta(), ext, def, builder);
     } else {
-      return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value), def, builder());
+      return new PersistentProtocolBufferMap(meta(), (IPersistentMap)RT.assoc(ext, key, value), def, builder);
     }
   }
 
   @Override
-  public IPersistentMap assocEx(Object key, Object value) {
+  public PersistentProtocolBufferMap assocEx(Object key, Object value) {
     if (containsKey(key)) {
       throw new RuntimeException("Key already present");
     }
@@ -705,24 +706,29 @@ public IPersistentMap assocEx(Object key, Object value) {
   }
 
   @Override
-  public IPersistentCollection cons(Object o) {
-    DynamicMessage.Builder builder = builder();
+  public PersistentProtocolBufferMap cons(Object o) {
     if (o instanceof Map.Entry) {
       Map.Entry<?, ?> e = (Map.Entry<?, ?>)o;
-      addField(builder, e.getKey(), e.getValue());
+      return assoc(e.getKey(), e.getValue());
     } else if (o instanceof IPersistentVector) {
       IPersistentVector v = (IPersistentVector)o;
       if (v.count() != 2) {
         throw new IllegalArgumentException("Vector arg to map conj must be a pair");
       }
-      addField(builder, v.nth(0), v.nth(1));
+      return assoc(v.nth(0), v.nth(1));
     } else {
+      DynamicMessage.Builder builder = builder();
+      IPersistentMap ext = this.ext;
       for (ISeq s = RT.seq(o); s != null; s = s.next()) {
         Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
-        addField(builder, e.getKey(), e.getValue());
+
+        Object k = e.getKey(), v = e.getValue();
+        if (!addField(builder, k, v)) {
+          ext = (IPersistentMap)RT.assoc(ext, k, v);
+        }
       }
+      return new PersistentProtocolBufferMap(meta(), ext, def, builder);
     }
-    return new PersistentProtocolBufferMap(meta(), def, builder);
   }
 
   public PersistentProtocolBufferMap append(IPersistentMap map) {
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index dd73e6e..bde0cf6 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -116,7 +116,17 @@
     (is (= p2 m2))
     (is (= m2 p2))
     (is (= (into {} m2) (into {} p2)))
-    (is (= (set (keys m2)) (set (keys p2))))))
+    (is (= (set (keys m2)) (set (keys p2)))))
+
+  (let [m {:id 5 :wat 10}
+        p (protobuf Foo m)]
+    (testing "protobuf function uses extmap"
+      (is (= (:wat m) (:wat p)))
+      (let [p (conj p {:stuff 15})]
+        (is (= 15 (:stuff p)))))
+
+    (is (thrown? Exception (protobuf-dump p))
+        "Should refuse to serialize with stuff in extmap")))
 
 (deftest test-string-keys
   (let [p (protobuf Foo "id" 5 "label" "rad")]

From a0557dcf0e019de85109f0f5c58e29847c57cdc4 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 13 Sep 2012 17:28:03 -0700
Subject: [PATCH 295/525] Add a size-limit argument to defs.

Needed for allowing to read large protobufs.
---
 src/protobuf/core.clj                         | 10 ++--
 .../core/PersistentProtocolBufferMap.java     | 54 +++++++++++--------
 test/protobuf/core_test.clj                   |  2 +-
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 206f610..e5a6203 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -24,13 +24,17 @@
      (if (or (protodef? def) (nil? def))
        def
        (protodef def PersistentProtocolBufferMap$Def/convertUnderscores)))
-  ([def ^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy]
+  ([def opts]
      (when def
-       (let [^Descriptors$Descriptor descriptor
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
              (if (instance? Descriptors$Descriptor def)
                def
                (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil)))]
-         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy)))))
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))
 
 (defn protobuf
   "Construct a protobuf of the given type."
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index f41aa06..d7317f2 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -116,43 +116,52 @@ public String toString() {
 
     public final Descriptors.Descriptor type;
     public final NamingStrategy namingStrategy;
+    public final int sizeLimit;
 
     public static final Object NULL = new Object();
     // keys should be FieldDescriptors, except that NULL is used as a replacement for real null
     ConcurrentHashMap<Object, Object> key_to_field;
 
-    static ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>> type_to_def = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<Descriptors.Descriptor, Def>>();
+    private static final class DefOptions {
+      public final Descriptors.Descriptor type;
+      public final NamingStrategy strat;
+      public final int sizeLimit;
+      public DefOptions(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
+        this.type = type;
+        this.strat = strat;
+        this.sizeLimit = sizeLimit;
+      }
 
-    public static Def create(Class<?> c, NamingStrategy strat) throws NoSuchMethodException,
-            IllegalAccessException, InvocationTargetException {
-      Descriptors.Descriptor type = (Descriptors.Descriptor)c.getMethod("getDescriptor").invoke(
-        null);
-      return create(type, strat);
-    }
+      public boolean equals(Object other) {
+        if (this.getClass() != other.getClass())
+          return false;
+        DefOptions od = (DefOptions)other;
+        return type.equals(od.type) && strat.equals(od.strat) && sizeLimit == od.sizeLimit;
+      }
 
-    public static Def create(Descriptors.Descriptor type, NamingStrategy strat) {
-      ConcurrentHashMap<Descriptors.Descriptor, Def> defCache = type_to_def.get(strat);
-      if (defCache == null) {
-        defCache = new ConcurrentHashMap<Descriptors.Descriptor, Def>();
-        ConcurrentHashMap<Descriptors.Descriptor, Def> previous = type_to_def.putIfAbsent(strat,
-          defCache);
-        if (previous != null) {
-          defCache = previous;
-        }
+      public int hashCode() {
+        return type.hashCode() + strat.hashCode() + sizeLimit;
       }
+    }
+
+    static ConcurrentHashMap<DefOptions, Def> defCache = new ConcurrentHashMap<DefOptions, Def>();
+
+    public static Def create(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
+      DefOptions opts = new DefOptions(type, strat, sizeLimit);
 
       Def def = defCache.get(type);
       if (def == null) {
-        def = new Def(type, strat);
-        defCache.putIfAbsent(type, def);
+        def = new Def(type, strat, sizeLimit);
+        defCache.putIfAbsent(opts, def);
       }
       return def;
     }
 
-    protected Def(Descriptors.Descriptor type, NamingStrategy strat) {
+    protected Def(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
       this.type = type;
       this.key_to_field = new ConcurrentHashMap<Object, Object>();
       this.namingStrategy = strat;
+      this.sizeLimit = sizeLimit;
     }
 
     public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferException {
@@ -160,6 +169,7 @@ public DynamicMessage parseFrom(byte[] bytes) throws InvalidProtocolBufferExcept
     }
 
     public DynamicMessage parseFrom(CodedInputStream input) throws IOException {
+      input.setSizeLimit(sizeLimit);
       return DynamicMessage.parseFrom(type, input);
     }
 
@@ -447,7 +457,8 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           }
         case MESSAGE:
           Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
-            this.def.namingStrategy);
+                                                                this.def.namingStrategy,
+                                                                this.def.sizeLimit);
           DynamicMessage message = (DynamicMessage)value;
 
           // Total hack because getField() doesn't return an empty array for repeated messages.
@@ -506,7 +517,8 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
           protobuf = (PersistentProtocolBufferMap)value;
         } else {
           Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
-            this.def.namingStrategy);
+                                                                this.def.namingStrategy,
+                                                                this.def.sizeLimit);
           protobuf = PersistentProtocolBufferMap.construct(fieldDef, value);
         }
         return protobuf.message();
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index bde0cf6..e888ccd 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -7,7 +7,7 @@
 
 (def Foo      (protodef protobuf.test.Core$Foo))
 (def FooUnder (protodef protobuf.test.Core$Foo
-                        protobuf.core.PersistentProtocolBufferMap$Def/protobufNames))
+                        {:naming-strategy protobuf.core.PersistentProtocolBufferMap$Def/protobufNames}))
 (def Bar      (protodef protobuf.test.Core$Bar))
 (def Response (protodef protobuf.test.Core$Response))
 (def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))

From 06103b5b17b9c56ff0cc8b467ccece5a0f8cd4b8 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 13 Sep 2012 17:40:10 -0700
Subject: [PATCH 296/525] 0.6.2-alpha1

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 478dce7..3f75543 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.1"
+(defproject protobuf "0.6.2-alpha1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 8dc560fa3f6223a76814ab64e26e0a8c31b77107 Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Fri, 14 Sep 2012 15:13:06 -0500
Subject: [PATCH 297/525] Update lein-protobuf.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 3f75543..b4bad7f 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.4"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.0"]]
+  :plugins [[lein-protobuf "0.2.1"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}

From 8d63a2985bff55cc07740c6c436bba3b8af221b4 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 25 Sep 2012 15:34:01 -0700
Subject: [PATCH 298/525] Revert "Refuse to serialize with non-empty extmap"

We need to take another pass at this once we can enforce this for sub-maps.

This reverts commit c5671cec333a5c412ac13913df680aecbd12dd68.
---
 src/protobuf/core/PersistentProtocolBufferMap.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/protobuf/core/PersistentProtocolBufferMap.java
index d7317f2..af6f33e 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/protobuf/core/PersistentProtocolBufferMap.java
@@ -324,9 +324,6 @@ protected PersistentProtocolBufferMap(IPersistentMap meta, IPersistentMap ext, D
   }
 
   public byte[] toByteArray() {
-    if (RT.count(ext) != 0) {
-      throw new IllegalStateException("Can't serialize unexpected keys: " + RT.printString(RT.keys(ext)));
-    }
     return message().toByteArray();
   }
 

From f2647ab221e2069c9000494c2452bfea3f9b1355 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 25 Sep 2012 15:35:29 -0700
Subject: [PATCH 299/525] 0.6.2-alpha2

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b4bad7f..3860962 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.2-alpha1"
+(defproject protobuf "0.6.2-alpha2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From dd588e52f971477eafeecbfa2103e5ff7e62cefb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 10 Oct 2012 10:28:50 -0700
Subject: [PATCH 300/525] disable test until we re-enable extmap serialization
 check

---
 test/protobuf/core_test.clj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index e888ccd..d896c33 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -125,8 +125,10 @@
       (let [p (conj p {:stuff 15})]
         (is (= 15 (:stuff p)))))
 
-    (is (thrown? Exception (protobuf-dump p))
-        "Should refuse to serialize with stuff in extmap")))
+    ;; TODO add test back once we re-enable this check
+    (comment
+      (is (thrown? Exception (protobuf-dump p))
+          "Should refuse to serialize with stuff in extmap"))))
 
 (deftest test-string-keys
   (let [p (protobuf Foo "id" 5 "label" "rad")]

From ca63ee195f8cb0fc6afaa7a0a1dffa3496ba6cd4 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 10 Oct 2012 10:32:30 -0700
Subject: [PATCH 301/525] compile for java 5

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 3860962..b4c8779 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.2-alpha2"
+(defproject protobuf "0.6.2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -8,6 +8,7 @@
                  [useful "0.8.4"]
                  [schematic "0.0.5"]]
   :plugins [[lein-protobuf "0.2.1"]]
+  :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}

From 33238e744e5b73273539288a47ceb11fa8b14bed Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 10 Oct 2012 10:32:54 -0700
Subject: [PATCH 302/525] 0.6.2

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b4c8779..7b8989a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.2-SNAPSHOT"
+(defproject protobuf "0.6.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From e0bdf4ed1ffa45d325b472908a4b6e44743ebeec Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 10 Oct 2012 10:35:25 -0700
Subject: [PATCH 303/525] snapshot

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 7b8989a..eced9ff 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject protobuf "0.6.2"
+(defproject protobuf "0.6.3-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From f5870b933498a882f4f3c41ec6f458b1ff40dc60 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 14 Nov 2012 15:55:01 -0800
Subject: [PATCH 304/525] update to new lein-protobuf

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index eced9ff..b637214 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
                  [ordered-collections "0.4.0"]
                  [useful "0.8.4"]
                  [schematic "0.0.5"]]
-  :plugins [[lein-protobuf "0.2.1"]]
+  :plugins [[lein-protobuf "0.2.3-SNAPSHOT"]]
   :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}

From a48d0c2bfd138a9c858ba89bb363f72ac36f052b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 14 Nov 2012 16:24:14 -0800
Subject: [PATCH 305/525] move namespaces under flatland

---
 project.clj                                   | 10 +-
 .../proto/flatland/protobuf/extensions.proto  | 20 ++++
 .../proto/flatland/protobuf/test/codec.proto  | 47 +++++++++
 .../proto/flatland/protobuf/test/core.proto   | 97 +++++++++++++++++++
 .../flatland/protobuf/test/example.proto      | 32 ++++++
 .../PersistentProtocolBufferMap.java          |  2 +-
 src/{ => flatland}/protobuf/codec.clj         | 12 +--
 src/{ => flatland}/protobuf/core.clj          | 14 +--
 src/{ => flatland}/protobuf/schema.clj        |  8 +-
 test/{ => flatland}/protobuf/codec_test.clj   | 10 +-
 test/{ => flatland}/protobuf/core_test.clj    | 44 ++++-----
 test/{ => flatland}/protobuf/example_test.clj |  6 +-
 12 files changed, 250 insertions(+), 52 deletions(-)
 create mode 100644 resources/proto/flatland/protobuf/extensions.proto
 create mode 100644 resources/proto/flatland/protobuf/test/codec.proto
 create mode 100644 resources/proto/flatland/protobuf/test/core.proto
 create mode 100644 resources/proto/flatland/protobuf/test/example.proto
 rename src/{protobuf/core => flatland/protobuf}/PersistentProtocolBufferMap.java (99%)
 rename src/{ => flatland}/protobuf/codec.clj (88%)
 rename src/{ => flatland}/protobuf/core.clj (90%)
 rename src/{ => flatland}/protobuf/schema.clj (94%)
 rename test/{ => flatland}/protobuf/codec_test.clj (89%)
 rename test/{ => flatland}/protobuf/core_test.clj (91%)
 rename test/{ => flatland}/protobuf/example_test.clj (70%)

diff --git a/project.clj b/project.clj
index b637214..20f79d9 100644
--- a/project.clj
+++ b/project.clj
@@ -1,19 +1,19 @@
-(defproject protobuf "0.6.3-SNAPSHOT"
+(defproject org.flatland/protobuf "0.6.3-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/flatland/clojure-protobuf"
   :dependencies [[org.clojure/clojure "1.4.0"]
-                 [ordered-collections "0.4.0"]
-                 [useful "0.8.4"]
-                 [schematic "0.0.5"]]
+                 [org.flatland/useful "0.8.9-SNAPSHOT"]
+                 [org.flatland/schematic "0.1.0-SNAPSHOT"]
+                 [ordered-collections "0.4.0"]]
   :plugins [[lein-protobuf "0.2.3-SNAPSHOT"]]
   :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
              :dev {:dependencies [[gloss "0.2.1"]
-                                  [io "0.2.1"]]}}
+                                  [org.flatland/io "0.2.2-SNAPSHOT"]]}}
   :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}
diff --git a/resources/proto/flatland/protobuf/extensions.proto b/resources/proto/flatland/protobuf/extensions.proto
new file mode 100644
index 0000000..8fb857e
--- /dev/null
+++ b/resources/proto/flatland/protobuf/extensions.proto
@@ -0,0 +1,20 @@
+import "google/protobuf/descriptor.proto";
+
+option java_package = "flatland.protobuf";
+option java_outer_classname = "Extensions";
+
+extend google.protobuf.FieldOptions {
+  optional bool   set         = 52001;
+  optional bool   map         = 52002;
+  optional string map_by      = 52003;
+  optional bool   counter     = 52004;
+  optional bool   succession  = 52005;
+  optional string meta        = 52010;
+  optional bool   nullable    = 52020;
+  optional string null_string = 52021;
+  optional sint32 null_int    = 52022;
+  optional sint64 null_long   = 52023;
+  optional float  null_float  = 52024;
+  optional double null_double = 52025;
+  optional uint32 null_enum   = 52026;
+}
diff --git a/resources/proto/flatland/protobuf/test/codec.proto b/resources/proto/flatland/protobuf/test/codec.proto
new file mode 100644
index 0000000..02b6635
--- /dev/null
+++ b/resources/proto/flatland/protobuf/test/codec.proto
@@ -0,0 +1,47 @@
+package flatland.protobuf.test.codec;
+
+import "flatland/protobuf/extensions.proto";
+
+option java_package = "flatland.protobuf.test";
+option java_outer_classname = "Codec";
+
+message Foo {
+  optional int32 foo = 1;
+  optional int32 bar = 2;
+  optional int32 baz = 3;
+
+  repeated string tags    = 4;
+  repeated Item   tag_set = 5 [(set) = true];
+  repeated Entry  num_map = 6 [(map) = true];
+
+  optional Foo nested = 7;
+
+  repeated int32   revisions    = 14;
+  optional fixed32 proto_length = 15;
+}
+
+message Item {
+  required string item   = 1;
+  required bool   exists = 2 [default = true];
+}
+
+message Entry {
+  required int32  key = 1;
+  required string val = 2;
+}
+
+message Edge {
+  required string to_id   = 1;
+  optional string a       = 2;
+  optional string b       = 3;
+  optional bool   deleted = 4;
+}
+
+message Node {
+  optional string id    = 1;
+  repeated Edge   edges = 2 [(map_by) = "to_id"];
+  optional int32  rev   = 3;
+  optional int32  foo   = 4;
+  optional string bar   = 5;
+  repeated int32  baz   = 6;
+}
\ No newline at end of file
diff --git a/resources/proto/flatland/protobuf/test/core.proto b/resources/proto/flatland/protobuf/test/core.proto
new file mode 100644
index 0000000..4ef5398
--- /dev/null
+++ b/resources/proto/flatland/protobuf/test/core.proto
@@ -0,0 +1,97 @@
+package flatland.protobuf.test.core;
+
+import "flatland/protobuf/extensions.proto";
+
+option java_package = "flatland.protobuf.test";
+option java_outer_classname = "Core";
+
+message Foo {
+  optional uint32   id        = 1 [default = 43];
+  optional string   label     = 2 [(meta) = "{:a 1 :b 2 :c 3}"];
+  repeated string   tags      = 3;
+  optional Foo      parent    = 4;
+  repeated Response responses = 5;
+
+  repeated double doubles = 6;
+  repeated float  floats  = 7;
+
+  optional double lat  = 8;
+  optional float  long = 9;
+
+  repeated Count counts = 10 [(map_by) = "key"];
+
+  repeated Time time = 11 [(succession) = true];
+
+  enum Response {
+    yes      = 0;
+    no       = 1;
+    maybe    = 2;
+    not_sure = 3;
+  }
+
+  repeated Item  tag_set   = 20 [(set)    = true];
+  repeated Pair  attr_map  = 21 [(map)    = true];
+  repeated Foo   foo_by_id = 22 [(map_by) = "id"];
+  repeated Group groups    = 23 [(map)    = true];
+  repeated Item  item_map  = 24 [(map_by) = "item"];
+  repeated Pair  pair_map  = 25 [(map_by) = "key"];
+  optional bool  deleted   = 26 [default  = false];
+}
+
+message Bar {
+  optional int32  int  = 1 [(nullable) = true, (null_int)    = -1];
+  optional int64  long = 2 [(nullable) = true, (null_long)   = -999999999999];
+  optional float  flt  = 3 [(nullable) = true, (null_float)  = -0.0001];
+  optional double dbl  = 4 [(nullable) = true, (null_double) = -0.00000001];
+  optional string str  = 5 [(nullable) = true, (null_string) = "NULL"];
+  optional Enu    enu  = 6 [(nullable) = true, (null_enum)   = 3];
+
+  enum Enu {
+    a    = 0;
+    b    = 1;
+    c    = 2;
+    nil  = 3;
+  }
+
+  repeated string label  = 10 [(nullable) = true, (null_string) = "", (succession) = true];
+  repeated string labels = 11 [(nullable) = true, (null_string) = ""];
+}
+
+message Time {
+  optional sint32 year   = 1;
+  optional int32  month  = 2;
+  optional int32  day    = 3;
+  optional int32  hour   = 4;
+  optional int32  minute = 5;
+}
+
+message Pair {
+  required string key = 1;
+  required string val = 2;
+}
+
+message Group {
+  required string key = 1;
+  repeated Foo    val = 2;
+}
+
+message Item {
+  required string item   = 1;
+  required bool   exists = 2 [default = true];
+}
+
+message Count {
+  required string key = 1;
+  repeated int32  i   = 2 [(counter) = true];
+  repeated double d   = 3 [(counter) = true];
+}
+
+message ErrorMsg {
+  required sint32 code = 1;
+  optional string data = 2;
+}
+
+message Response {
+  required bool ok = 1;
+  optional ErrorMsg error = 2;
+}
\ No newline at end of file
diff --git a/resources/proto/flatland/protobuf/test/example.proto b/resources/proto/flatland/protobuf/test/example.proto
new file mode 100644
index 0000000..fb8067b
--- /dev/null
+++ b/resources/proto/flatland/protobuf/test/example.proto
@@ -0,0 +1,32 @@
+package flatland.protobuf.test.example;
+
+import "flatland/protobuf/extensions.proto";
+
+option java_package = "flatland.protobuf.test";
+option java_outer_classname = "Example";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
diff --git a/src/protobuf/core/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
similarity index 99%
rename from src/protobuf/core/PersistentProtocolBufferMap.java
rename to src/flatland/protobuf/PersistentProtocolBufferMap.java
index af6f33e..b296af0 100644
--- a/src/protobuf/core/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -8,7 +8,7 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-package protobuf.core;
+package flatland.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/protobuf/codec.clj b/src/flatland/protobuf/codec.clj
similarity index 88%
rename from src/protobuf/codec.clj
rename to src/flatland/protobuf/codec.clj
index 0d26d6b..01baecc 100644
--- a/src/protobuf/codec.clj
+++ b/src/flatland/protobuf/codec.clj
@@ -1,12 +1,12 @@
-(ns protobuf.codec
-  (:use protobuf.core
+(ns flatland.protobuf.codec
+  (:use flatland.protobuf.core
         [gloss.core.protocols :only [Reader Writer]]
         [gloss.core.formats :only [to-buf-seq]]
-        [useful.fn :only [fix]]
-        [useful.experimental :only [lift-meta]]
+        [flatland.useful.fn :only [fix]]
+        [flatland.useful.experimental :only [lift-meta]]
         [clojure.java.io :only [input-stream]])
-  (:require io.core
-            [schematic.core :as schema]
+  (:require flatland.io.core
+            [flatland.schematic.core :as schema]
             [gloss.core :as gloss]))
 
 (declare protobuf-codec)
diff --git a/src/protobuf/core.clj b/src/flatland/protobuf/core.clj
similarity index 90%
rename from src/protobuf/core.clj
rename to src/flatland/protobuf/core.clj
index e5a6203..abdc0af 100644
--- a/src/protobuf/core.clj
+++ b/src/flatland/protobuf/core.clj
@@ -1,9 +1,9 @@
-(ns protobuf.core
-  (:use [protobuf.schema :only [field-schema]]
-        [useful.fn :only [fix]]
+(ns flatland.protobuf.core
+  (:use [flatland.protobuf.schema :only [field-schema]]
+        [flatland.useful.fn :only [fix]]
         [clojure.java.io :only [input-stream output-stream]])
-  (:require useful.utils)
-  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def PersistentProtocolBufferMap$Def$NamingStrategy Extensions)
+  (:require flatland.useful.utils)
+  (:import (flatland.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def PersistentProtocolBufferMap$Def$NamingStrategy Extensions)
            (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
            (java.io InputStream OutputStream)
            (clojure.lang Reflector)))
@@ -69,7 +69,7 @@
       (PersistentProtocolBufferMap/parseFrom type in))))
 
 (defn ^"[B" protobuf-dump
-  "Return the byte representation of the given protobuf."
+  "Return the byte representation of the given flatland.protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))
   ([^PersistentProtocolBufferMap$Def type m]
@@ -94,7 +94,7 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
-(extend-protocol useful.utils/Adjoin
+(extend-protocol flatland.useful.utils/Adjoin
   PersistentProtocolBufferMap
   (adjoin-onto [^PersistentProtocolBufferMap this other]
     (.append this other)))
diff --git a/src/protobuf/schema.clj b/src/flatland/protobuf/schema.clj
similarity index 94%
rename from src/protobuf/schema.clj
rename to src/flatland/protobuf/schema.clj
index 1702c9c..5daca83 100644
--- a/src/protobuf/schema.clj
+++ b/src/flatland/protobuf/schema.clj
@@ -1,10 +1,12 @@
-(ns protobuf.schema
-  (:use [useful.fn :only [fix]]
+(ns flatland.protobuf.schema
+  (:use [flatland.useful.fn :only [fix]]
         [clojure.string :only [lower-case]])
-  (:import (protobuf.core PersistentProtocolBufferMap PersistentProtocolBufferMap$Def Extensions)
+  (:import (flatland.protobuf PersistentProtocolBufferMap
+                              PersistentProtocolBufferMap$Def Extensions)
            (com.google.protobuf Descriptors$Descriptor
                                 Descriptors$FieldDescriptor
                                 Descriptors$FieldDescriptor$Type)))
+
 (defn extension [ext ^Descriptors$FieldDescriptor field]
   (-> (.getOptions field)
       (.getExtension ext)
diff --git a/test/protobuf/codec_test.clj b/test/flatland/protobuf/codec_test.clj
similarity index 89%
rename from test/protobuf/codec_test.clj
rename to test/flatland/protobuf/codec_test.clj
index 4c062c9..5152e6e 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/flatland/protobuf/codec_test.clj
@@ -1,9 +1,9 @@
-(ns protobuf.codec-test
-  (:use clojure.test gloss.io protobuf.codec)
+(ns flatland.protobuf.codec-test
+  (:use clojure.test gloss.io flatland.protobuf.codec)
   (:import (java.nio ByteBuffer)))
 
 (deftest protobuf-codec-test
-  (let [codec (protobuf-codec protobuf.test.Codec$Foo)]
+  (let [codec (protobuf-codec flatland.protobuf.test.Codec$Foo)]
     (testing "decode an encoded data structure"
       (let [val {:foo 1 :bar 2}]
         (is (= val (decode codec (encode codec val))))))
@@ -47,8 +47,8 @@
                (decode codec (concat data1 data2 data3))))))))
 
 (deftest repeated-protobufs
-  (let [len   (length-prefix protobuf.test.Codec$Foo)
-        codec (protobuf-codec protobuf.test.Codec$Foo :repeated true)]
+  (let [len   (length-prefix flatland.protobuf.test.Codec$Foo)
+        codec (protobuf-codec flatland.protobuf.test.Codec$Foo :repeated true)]
     (testing "length-prefix"
       (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
         (is (= i (decode len (encode len i))))))
diff --git a/test/protobuf/core_test.clj b/test/flatland/protobuf/core_test.clj
similarity index 91%
rename from test/protobuf/core_test.clj
rename to test/flatland/protobuf/core_test.clj
index d896c33..4ecbda7 100644
--- a/test/protobuf/core_test.clj
+++ b/test/flatland/protobuf/core_test.clj
@@ -1,16 +1,16 @@
-(ns protobuf.core-test
-  (:use protobuf.core clojure.test
-        [io.core :only [catbytes]]
-        [useful.utils :only [adjoin]]
+(ns flatland.protobuf.core-test
+  (:use flatland.protobuf.core clojure.test
+        [flatland.io.core :only [catbytes]]
+        [flatland.useful.utils :only [adjoin]]
         ordered-map.core)
   (:import (java.io PipedInputStream PipedOutputStream)))
 
-(def Foo      (protodef protobuf.test.Core$Foo))
-(def FooUnder (protodef protobuf.test.Core$Foo
-                        {:naming-strategy protobuf.core.PersistentProtocolBufferMap$Def/protobufNames}))
-(def Bar      (protodef protobuf.test.Core$Bar))
-(def Response (protodef protobuf.test.Core$Response))
-(def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
+(def Foo      (protodef flatland.protobuf.test.Core$Foo))
+(def FooUnder (protodef flatland.protobuf.test.Core$Foo
+                        {:naming-strategy flatland.protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
+(def Bar      (protodef flatland.protobuf.test.Core$Bar))
+(def Response (protodef flatland.protobuf.test.Core$Response))
+(def ErrorMsg (protodef flatland.protobuf.test.Core$ErrorMsg))
 
 (deftest test-conj
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
@@ -263,12 +263,12 @@
 (deftest test-protobuf-schema
   (let [fields
         {:type :struct
-         :name "protobuf.test.core.Foo"
+         :name "flatland.protobuf.test.core.Foo"
          :fields {:id      {:default 43, :type :int}
                   :deleted {:default false, :type :boolean}
                   :lat     {:type :double}
                   :long    {:type :float}
-                  :parent  {:type :struct, :name "protobuf.test.core.Foo"}
+                  :parent  {:type :struct, :name "flatland.protobuf.test.core.Foo"}
                   :floats  {:type :list, :values {:type :float}}
                   :doubles {:type :list, :values {:type :double}}
                   :label   {:type :string, :c 3, :b 2, :a 1}
@@ -276,28 +276,28 @@
                   :tag-set {:type :set,  :values {:type :string}}
                   :counts  {:type   :map
                             :keys   {:type :string}
-                            :values {:type :struct, :name "protobuf.test.core.Count"
+                            :values {:type :struct, :name "flatland.protobuf.test.core.Count"
                                      :fields {:key {:type :string}
                                               :i {:counter true, :type :int}
                                               :d {:counter true, :type :double}}}}
                   :foo-by-id {:type :map
                               :keys   {:default 43, :type :int}
-                              :values {:type :struct, :name "protobuf.test.core.Foo"}}
+                              :values {:type :struct, :name "flatland.protobuf.test.core.Foo"}}
                   :attr-map {:type :map
                              :keys   {:type :string}
                              :values {:type :string}}
                   :pair-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "protobuf.test.core.Pair"
+                             :values {:type :struct, :name "flatland.protobuf.test.core.Pair"
                                       :fields {:key {:type :string}
                                                :val {:type :string}}}}
                   :groups {:type :map
                            :keys   {:type :string}
                            :values {:type :list
-                                    :values {:type :struct, :name "protobuf.test.core.Foo"}}}
+                                    :values {:type :struct, :name "flatland.protobuf.test.core.Foo"}}}
                   :responses {:type :list
                               :values {:type :enum, :values #{:no :yes :maybe :not-sure}}}
-                  :time {:type :struct, :name "protobuf.test.core.Time", :succession true
+                  :time {:type :struct, :name "flatland.protobuf.test.core.Time", :succession true
                          :fields {:year   {:type :int}
                                   :month  {:type :int}
                                   :day    {:type :int}
@@ -305,11 +305,11 @@
                                   :minute {:type :int}}}
                   :item-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "protobuf.test.core.Item"
+                             :values {:type :struct, :name "flatland.protobuf.test.core.Item"
                                       :fields {:item   {:type :string},
                                                :exists {:default true, :type :boolean}}}}}}]
     (is (= fields (protobuf-schema Foo)))
-    (is (= fields (protobuf-schema protobuf.test.Core$Foo)))))
+    (is (= fields (protobuf-schema flatland.protobuf.test.Core$Foo)))))
 
 (comment deftest test-default-protobuf
   (is (= 43    (default-protobuf Foo :id)))
@@ -324,7 +324,7 @@
   (is (= {}    (default-protobuf Foo :groups)))
   (is (= {}    (default-protobuf Foo :item-map)))
   (is (= false (default-protobuf Foo :deleted)))
-  (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
+  (is (= {}    (default-protobuf flatland.protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
   (let [dashes      (protobuf Foo      {:tag_set ["odd"]
@@ -363,7 +363,7 @@
            (protobuf-seq Foo in)))))
 
 (deftest test-encoding-errors
-  (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
+  (is (thrown-with-msg? IllegalArgumentException #"error setting string field flatland.protobuf.test.core.Foo.label to 8"
         (protobuf Foo :label 8)))
-  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
+  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field flatland.protobuf.test.core.Foo.tags"
         (protobuf Foo :tags [1 2 3]))))
\ No newline at end of file
diff --git a/test/protobuf/example_test.clj b/test/flatland/protobuf/example_test.clj
similarity index 70%
rename from test/protobuf/example_test.clj
rename to test/flatland/protobuf/example_test.clj
index 46aa5fb..c72b4fb 100644
--- a/test/protobuf/example_test.clj
+++ b/test/flatland/protobuf/example_test.clj
@@ -1,7 +1,7 @@
-(ns protobuf.example-test
-  (:use protobuf.core clojure.test))
+(ns flatland.protobuf.example-test
+  (:use flatland.protobuf.core clojure.test))
 
-(def Photo (protodef protobuf.test.Example$Photo))
+(def Photo (protodef flatland.protobuf.test.Example$Photo))
 
 (def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"}, 
            :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"}, 

From a57d4786c105f50d47b3ec32e8957f587b9b1950 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Fri, 16 Nov 2012 16:36:10 -0800
Subject: [PATCH 306/525] 0.7.0

---
 project.clj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 20f79d9..875edb3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,19 +1,19 @@
-(defproject org.flatland/protobuf "0.6.3-SNAPSHOT"
+(defproject org.flatland/protobuf "0.7.0"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/flatland/clojure-protobuf"
   :dependencies [[org.clojure/clojure "1.4.0"]
-                 [org.flatland/useful "0.8.9-SNAPSHOT"]
-                 [org.flatland/schematic "0.1.0-SNAPSHOT"]
+                 [org.flatland/useful "0.9.0"]
+                 [org.flatland/schematic "0.1.0"]
                  [ordered-collections "0.4.0"]]
-  :plugins [[lein-protobuf "0.2.3-SNAPSHOT"]]
+  :plugins [[lein-protobuf "0.3.0"]]
   :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
              :dev {:dependencies [[gloss "0.2.1"]
-                                  [org.flatland/io "0.2.2-SNAPSHOT"]]}}
+                                  [org.flatland/io "0.3.0"]]}}
   :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}

From e759f3fed74c2ea10c2c92a59f87d66e347fd056 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Tue, 20 Nov 2012 07:34:17 -0800
Subject: [PATCH 307/525] update to lein-protobuf 0.3.1

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 875edb3..4a358bf 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.7.0"
+(defproject org.flatland/protobuf "0.7.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
                  [org.flatland/useful "0.9.0"]
                  [org.flatland/schematic "0.1.0"]
                  [ordered-collections "0.4.0"]]
-  :plugins [[lein-protobuf "0.3.0"]]
+  :plugins [[lein-protobuf "0.3.1"]]
   :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}

From c5131eaf723d7d5bdd5effbbcb2125d371a3fefe Mon Sep 17 00:00:00 2001
From: Anthony Grimes <i@raynes.me>
Date: Mon, 26 Nov 2012 13:22:29 -0600
Subject: [PATCH 308/525] Update README for new nses.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 14a903c..9abf799 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ You'll probably want to use [Leiningen](https://github.com/technomancy/leiningen
 [lein-protobuf](https://github.com/flatland/lein-protobuf) plugin for compiling `.proto` files. Add
 the following to your `project.clj` file:
 
-    :dependencies [[protobuf "0.6.0"]]
+    :dependencies [[org.flatland/protobuf "0.7.1"]]
     :plugins [[lein-protobuf "0.1.1"]]
 
 Be sure to replace `"0.6.0"` and `"0.1.1"` with the latest versions listed at
@@ -67,7 +67,7 @@ repeated fields. You can also provide metadata on protobuf fields using clojure
 use these, you must import the extension file and include it when compiling. For example:
 
 ```proto
-import "protobuf/core/extensions.proto";
+import "flatland/protobuf/core/extensions.proto";
 
 message Photo {
   required int32  id     = 1;
@@ -98,7 +98,7 @@ message Photo {
 Then you can access the extension fields in Clojure:
 
 ```clojure
-(use 'protobuf)
+(use 'flatland.protobuf.core)
 (import Example$Photo)
 (import Example$Photo$Tag)
 

From 21004637624ee8dfb96b5ef17154d05b995a39bb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 3 Dec 2012 16:41:00 -0800
Subject: [PATCH 309/525] 0.7.2-SNAPSHOT

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4a358bf..28cffb3 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.7.1"
+(defproject org.flatland/protobuf "0.7.2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From c7f966b38fc5d6fa6e47b624a5530b87239bd182 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 3 Dec 2012 16:31:06 -0800
Subject: [PATCH 310/525] make intern handle nulls so we don't have to do it
 everywhere intern is called

---
 .../protobuf/PersistentProtocolBufferMap.java   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index b296af0..7352ac9 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -221,6 +221,7 @@ public Descriptors.Descriptor getMessageType() {
     }
 
     static final ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>> caches = new ConcurrentHashMap<NamingStrategy, ConcurrentHashMap<String, Object>>();
+    static final Object nullv = new Object();
 
     public Object intern(String name) {
       ConcurrentHashMap<String, Object> nameCache = caches.get(namingStrategy);
@@ -233,24 +234,28 @@ public Object intern(String name) {
       }
       Object clojureName = nameCache.get(name);
       if (clojureName == null) {
-        clojureName = namingStrategy.clojureName(name);
+        if (name == "") {
+          clojureName = nullv;
+        } else {
+          clojureName = namingStrategy.clojureName(name);
+          if (clojureName == null) {
+            clojureName = nullv;
+          }
+        }
         Object existing = nameCache.putIfAbsent(name, clojureName);
         if (existing != null) {
           clojureName = existing;
         }
       }
-      return clojureName;
+      return clojureName == nullv ? null : clojureName;
     }
 
     public Object clojureEnumValue(Descriptors.EnumValueDescriptor enum_value) {
       return intern(enum_value.getName());
     }
 
-    static final Object k_null = Keyword.intern(Symbol.intern(""));
-
     protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
-      Object key = intern(field.getOptions().getExtension(Extensions.mapBy));
-      return key == k_null ? null : key;
+      return intern(field.getOptions().getExtension(Extensions.mapBy));
     }
   }
 

From cb3066897fccab3b461a745fbf907afa59c32cd5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 3 Dec 2012 16:34:05 -0800
Subject: [PATCH 311/525] spacing and indentation

---
 .../proto/flatland/protobuf/test/maps.proto   | 29 +++++++++++++++++++
 .../protobuf/PersistentProtocolBufferMap.java | 16 +++++-----
 2 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 resources/proto/flatland/protobuf/test/maps.proto

diff --git a/resources/proto/flatland/protobuf/test/maps.proto b/resources/proto/flatland/protobuf/test/maps.proto
new file mode 100644
index 0000000..42891fa
--- /dev/null
+++ b/resources/proto/flatland/protobuf/test/maps.proto
@@ -0,0 +1,29 @@
+package flatland.protobuf.test.maps;
+
+import "flatland/protobuf/extensions.proto";
+
+option java_package = "flatland.protobuf.test";
+option java_outer_classname = "Maps";
+
+message Element {
+  optional string id      = 1;
+  optional int32  foo     = 2;
+  optional int32  bar     = 3;
+  optional bool   deleted = 4;
+  optional bool   exists  = 5;
+}
+
+message Pair {
+  required string  key = 1;
+  required Element val = 2;
+}
+
+message Struct {
+  repeated Pair element_map   = 1 [(map) = true];
+  repeated Pair element_map_e = 2 [(map) = true, (map_exists) = "exists"];
+  repeated Pair element_map_d = 3 [(map) = true, (map_deleted) = "deleted"];
+
+  repeated Element element_by_id   = 4 [(map_by) = "id"];
+  repeated Element element_by_id_e = 5 [(map_by) = "id", (map_exists) = "exists"];
+  repeated Element element_by_id_d = 6 [(map_by) = "id", (map_deleted) = "deleted"];
+}
diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index 7352ac9..66a8191 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -370,7 +370,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value)
   static Keyword k_exists = Keyword.intern("exists");
 
   protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
-          boolean use_extensions) {
+                                  boolean use_extensions) {
     if (value instanceof List) {
       List<?> values = (List<?>)value;
       Iterator<?> iterator = values.iterator();
@@ -381,8 +381,8 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
         if (map_field_by != null) {
           ITransientMap map = (ITransientMap)OrderedMap.EMPTY.asTransient();
           while (iterator.hasNext()) {
-            PersistentProtocolBufferMap v = (PersistentProtocolBufferMap)fromProtoValue(field,
-              iterator.next());
+            PersistentProtocolBufferMap v =
+              (PersistentProtocolBufferMap)fromProtoValue(field, iterator.next());
             Object k = v.valAt(map_field_by);
             PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap)map.valAt(k);
             if (existing != null) {
@@ -451,8 +451,9 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
       switch (field.getJavaType()) {
         case ENUM:
           Descriptors.EnumValueDescriptor e = (Descriptors.EnumValueDescriptor)value;
-          if (use_extensions && field.getOptions().getExtension(Extensions.nullable)
-                  && field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
+          if (use_extensions &&
+              field.getOptions().getExtension(Extensions.nullable) &&
+              field.getOptions().getExtension(nullExtension(field)).equals(e.getNumber())) {
             return null;
           } else {
             return def.clojureEnumValue(e);
@@ -470,8 +471,9 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
 
           return new PersistentProtocolBufferMap(null, fieldDef, message);
         default:
-          if (use_extensions && field.getOptions().getExtension(Extensions.nullable)
-                  && field.getOptions().getExtension(nullExtension(field)).equals(value)) {
+          if (use_extensions &&
+              field.getOptions().getExtension(Extensions.nullable) &&
+              field.getOptions().getExtension(nullExtension(field)).equals(value)) {
             return null;
           } else {
             return value;

From 0678d7e5a0790fa91240cd9861f8d410992871e8 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 3 Dec 2012 16:36:12 -0800
Subject: [PATCH 312/525] add map_exists and map_deleted extensions for
 resetting map values

---
 .../proto/flatland/protobuf/extensions.proto  |  2 +
 .../protobuf/PersistentProtocolBufferMap.java | 47 +++++++--
 test/flatland/protobuf/core_test.clj          | 98 ++++++++++++++++++-
 3 files changed, 136 insertions(+), 11 deletions(-)

diff --git a/resources/proto/flatland/protobuf/extensions.proto b/resources/proto/flatland/protobuf/extensions.proto
index 8fb857e..ee15932 100644
--- a/resources/proto/flatland/protobuf/extensions.proto
+++ b/resources/proto/flatland/protobuf/extensions.proto
@@ -9,6 +9,8 @@ extend google.protobuf.FieldOptions {
   optional string map_by      = 52003;
   optional bool   counter     = 52004;
   optional bool   succession  = 52005;
+  optional string map_deleted = 52006;
+  optional string map_exists  = 52007;
   optional string meta        = 52010;
   optional bool   nullable    = 52020;
   optional string null_string = 52021;
diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index 66a8191..0ca41c3 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -257,6 +257,35 @@ public Object clojureEnumValue(Descriptors.EnumValueDescriptor enum_value) {
     protected Object mapFieldBy(Descriptors.FieldDescriptor field) {
       return intern(field.getOptions().getExtension(Extensions.mapBy));
     }
+
+    protected PersistentProtocolBufferMap mapValue(Descriptors.FieldDescriptor field,
+                                                   PersistentProtocolBufferMap left,
+                                                   PersistentProtocolBufferMap right) {
+      if (left == null) {
+        return right;
+      } else {
+        Object map_exists = intern(field.getOptions().getExtension(Extensions.mapExists));
+        if (map_exists != null) {
+          if (left.valAt(map_exists) == Boolean.FALSE &&
+              right.valAt(map_exists) == Boolean.TRUE) {
+            return right;
+          } else {
+            return left.append(right);
+          }
+        }
+
+        Object map_deleted = intern(field.getOptions().getExtension(Extensions.mapDeleted));
+        if (map_deleted != null) {
+          if (left.valAt(map_deleted) == Boolean.TRUE &&
+              right.valAt(map_deleted) == Boolean.FALSE) {
+            return right;
+          } else {
+            return left.append(right);
+          }
+        }
+        return right.append(left);
+      }
+    }
   }
 
   public final Def def;
@@ -385,11 +414,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
               (PersistentProtocolBufferMap)fromProtoValue(field, iterator.next());
             Object k = v.valAt(map_field_by);
             PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap)map.valAt(k);
-            if (existing != null) {
-              map = map.assoc(k, existing.append(v));
-            } else {
-              map = map.assoc(k, v);
-            }
+            map = map.assoc(k, def.mapValue(field, existing, v));
           }
           return map.persistent();
         } else if (options.getExtension(Extensions.counter)) {
@@ -411,7 +436,12 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
             Object k = fromProtoValue(key_field, message.getField(key_field));
             Object v = fromProtoValue(val_field, message.getField(val_field));
             Object existing = map.valAt(k);
-            if (existing instanceof IPersistentCollection) {
+
+            if (existing instanceof PersistentProtocolBufferMap) {
+              map = map.assoc(k, def.mapValue(field,
+                                              (PersistentProtocolBufferMap)existing,
+                                              (PersistentProtocolBufferMap)v));
+            } else if (existing instanceof IPersistentCollection) {
               map = map.assoc(k, ((IPersistentCollection)existing).cons(v));
             } else {
               map = map.assoc(k, v);
@@ -702,6 +732,11 @@ public Object getValAt(Object key, Object notFound, boolean use_extensions) {
     }
   }
 
+  protected boolean getBoolean (Object key) {
+    Object val = valAt(key);
+    return val != null && val != Boolean.FALSE;
+  }
+
   @Override
   public PersistentProtocolBufferMap assoc(Object key, Object value) {
     DynamicMessage.Builder builder = builder();
diff --git a/test/flatland/protobuf/core_test.clj b/test/flatland/protobuf/core_test.clj
index 4ecbda7..546d418 100644
--- a/test/flatland/protobuf/core_test.clj
+++ b/test/flatland/protobuf/core_test.clj
@@ -11,6 +11,7 @@
 (def Bar      (protodef flatland.protobuf.test.Core$Bar))
 (def Response (protodef flatland.protobuf.test.Core$Response))
 (def ErrorMsg (protodef flatland.protobuf.test.Core$ErrorMsg))
+(def Maps     (protodef flatland.protobuf.test.Maps$Struct))
 
 (deftest test-conj
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
@@ -141,19 +142,106 @@
       (is (= ["check" "it" "out"] (p "tags"))))))
 
 (deftest test-append-bytes
-  (let [p (protobuf Foo :id 5  :label "rad" :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
-        q (protobuf Foo :id 43 :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
+  (let [p (protobuf Foo :id 5 :label "rad" :deleted true
+                    :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
+        q (protobuf Foo :id 43 :deleted false
+                    :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
         r (protobuf Foo :label "bad")
         s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
         t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
-    (is (= 43 (s :id)))                 ; make sure an explicit default overwrites on append
-    (is (= 5  (t :id)))                 ; make sure a missing default doesn't overwrite on append
+    (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
+    (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
     (is (= "rad" (s :label)))
     (is (= "bad" (t :label)))
     (is (= ["sweet"] (t :tags)))
     (is (= ["sweet" "savory"] (s :tags)))
     (is (= #{"foo" "bar" "baz"} (p :tag-set)))
-    (is (= #{"bap" "baz"} (s :tag-set)))))
+    (is (= #{"bap" "baz"} (s :tag-set)))
+    (is (= false (r :deleted)))))
+
+(deftest test-manual-append
+  (let [p (protobuf Foo :id 5 :label "rad" :deleted true
+                    :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
+        q (protobuf Foo :id 43 :deleted false
+                    :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
+        r (protobuf Foo :label "bad")
+        s (.append p q)
+        t (.append p r)]
+    (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
+    (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
+    (is (= "rad" (s :label)))
+    (is (= "bad" (t :label)))
+    (is (= ["sweet"] (t :tags)))
+    (is (= ["sweet" "savory"] (s :tags)))
+    (is (= #{"foo" "bar" "baz"} (p :tag-set)))
+    (is (= #{"bap" "baz"} (s :tag-set)))
+    (is (= false (r :deleted)))))
+
+(deftest test-map-exists
+  (doseq [map-key [:element-map-e :element-by-id-e]]
+    (let [p (protobuf Maps map-key {"A" {:foo 1}
+                                    "B" {:foo 2}
+                                    "C" {:foo 3}
+                                    "D" {:foo 4 :exists true}
+                                    "E" {:foo 5 :exists true}
+                                    "F" {:foo 6 :exists true}
+                                    "G" {:foo 7 :exists false}
+                                    "H" {:foo 8 :exists false}
+                                    "I" {:foo 9 :exists false}})
+          q (protobuf Maps map-key {"A" {:bar 1}
+                                    "B" {:bar 2 :exists true}
+                                    "C" {:bar 3 :exists false}
+                                    "D" {:bar 4}
+                                    "E" {:bar 5 :exists true}
+                                    "F" {:bar 6 :exists false}
+                                    "G" {:bar 7}
+                                    "H" {:bar 8 :exists true}
+                                    "I" {:bar 9 :exists false}})
+          r (protobuf-load Maps (catbytes (protobuf-dump p) (protobuf-dump q)))]
+      (are [key vals] (= vals (map (get-in r [map-key key])
+                                   [:foo :bar :exists]))
+           "A" [1   1 nil  ]
+           "B" [2   2 true ]
+           "C" [3   3 false]
+           "D" [4   4 true ]
+           "E" [5   5 true ]
+           "F" [6   6 false]
+           "G" [7   7 false]
+           "H" [nil 8 true ]
+           "I" [9   9 false]))))
+
+(deftest test-map-deleted
+  (doseq [map-key [:element-map-d :element-by-id-d]]
+    (let [p (protobuf Maps map-key {"A" {:foo 1}
+                                    "B" {:foo 2}
+                                    "C" {:foo 3}
+                                    "D" {:foo 4 :deleted true}
+                                    "E" {:foo 5 :deleted true}
+                                    "F" {:foo 6 :deleted true}
+                                    "G" {:foo 7 :deleted false}
+                                    "H" {:foo 8 :deleted false}
+                                    "I" {:foo 9 :deleted false}})
+          q (protobuf Maps map-key {"A" {:bar 1}
+                                    "B" {:bar 2 :deleted true}
+                                    "C" {:bar 3 :deleted false}
+                                    "D" {:bar 4}
+                                    "E" {:bar 5 :deleted true}
+                                    "F" {:bar 6 :deleted false}
+                                    "G" {:bar 7}
+                                    "H" {:bar 8 :deleted true}
+                                    "I" {:bar 9 :deleted false}})
+          r (protobuf-load Maps (catbytes (protobuf-dump p) (protobuf-dump q)))]
+      (are [key vals] (= vals (map (get-in r [map-key key])
+                                   [:foo :bar :deleted]))
+           "A" [1   1 nil  ]
+           "B" [2   2 true ]
+           "C" [3   3 false]
+           "D" [4   4 true ]
+           "E" [5   5 true ]
+           "F" [nil 6 false]
+           "G" [7   7 false]
+           "H" [8   8 true ]
+           "I" [9   9 false]))))
 
 (deftest test-coercing
   (let [p (protobuf Foo :lat 5 :long 6)]

From 8e79fb872241f67ba4bf37d77cbf58f69fa260da Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 31 Dec 2012 15:12:36 -0800
Subject: [PATCH 313/525] Add a test for append/overwrite.

The test fails due to some recent changes I don't understand.
@ninjudd, can you have a look at this? It fails on your map-deleted
snapshot, but works on the previous release (0.7.1).
---
 .../proto/flatland/protobuf/test/core.proto     |  8 +++++++-
 test/flatland/protobuf/core_test.clj            | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/resources/proto/flatland/protobuf/test/core.proto b/resources/proto/flatland/protobuf/test/core.proto
index 4ef5398..71b6148 100644
--- a/resources/proto/flatland/protobuf/test/core.proto
+++ b/resources/proto/flatland/protobuf/test/core.proto
@@ -36,6 +36,7 @@ message Foo {
   repeated Item  item_map  = 24 [(map_by) = "item"];
   repeated Pair  pair_map  = 25 [(map_by) = "key"];
   optional bool  deleted   = 26 [default  = false];
+  repeated Deletable deletions = 27 [(map_by) = "id"];
 }
 
 message Bar {
@@ -94,4 +95,9 @@ message ErrorMsg {
 message Response {
   required bool ok = 1;
   optional ErrorMsg error = 2;
-}
\ No newline at end of file
+}
+
+message Deletable {
+  optional string id = 1;
+  optional bool deleted = 2;
+}
diff --git a/test/flatland/protobuf/core_test.clj b/test/flatland/protobuf/core_test.clj
index 546d418..4f22950 100644
--- a/test/flatland/protobuf/core_test.clj
+++ b/test/flatland/protobuf/core_test.clj
@@ -143,9 +143,11 @@
 
 (deftest test-append-bytes
   (let [p (protobuf Foo :id 5 :label "rad" :deleted true
-                    :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
+                    :tags ["sweet"] :tag-set #{"foo" "bar" "baz"}
+                    :deletions {"first" {:deleted false} "second" {:deleted false}})
         q (protobuf Foo :id 43 :deleted false
-                    :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
+                    :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
+                    :deletions {"first" {:deleted true}})
         r (protobuf Foo :label "bad")
         s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
         t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
@@ -157,6 +159,8 @@
     (is (= ["sweet" "savory"] (s :tags)))
     (is (= #{"foo" "bar" "baz"} (p :tag-set)))
     (is (= #{"bap" "baz"} (s :tag-set)))
+    (is (= (s :deletions) {"first" {:id "first" :deleted true}
+                           "second" {:id "second" :deleted false}}))
     (is (= false (r :deleted)))))
 
 (deftest test-manual-append
@@ -395,7 +399,12 @@
                              :keys   {:type :string}
                              :values {:type :struct, :name "flatland.protobuf.test.core.Item"
                                       :fields {:item   {:type :string},
-                                               :exists {:default true, :type :boolean}}}}}}]
+                                               :exists {:default true, :type :boolean}}}}
+                  :deletions {:type :map
+                              :keys {:type :string}
+                              :values {:type :struct, :name "flatland.protobuf.test.core.Deletable"
+                                       :fields {:id {:type :string}
+                                                :deleted {:type :boolean}}}}}}]
     (is (= fields (protobuf-schema Foo)))
     (is (= fields (protobuf-schema flatland.protobuf.test.Core$Foo)))))
 
@@ -426,7 +435,7 @@
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses underscores)))
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
-             :pair_map :groups :doubles :floats :item_map :counts :time :lat :long}
+             :pair_map :groups :doubles :floats :item_map :counts :time :lat :long :deletions}
            (-> (protobuf-schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message

From 58d8896fbd45eee075f65fdff436a228ffa4c336 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Mon, 31 Dec 2012 15:23:15 -0800
Subject: [PATCH 314/525] 0.7.2 has been released - update snapshot number to
 0.7.3-SNAPSHOT

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 28cffb3..d706079 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.7.2-SNAPSHOT"
+(defproject org.flatland/protobuf "0.7.3-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From d3b943e3fb067d4921a4d700ad02dde6e2f14188 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 2 Jan 2013 13:38:31 -0800
Subject: [PATCH 315/525] make test not use deleted so the problem is more
 clear

---
 .../proto/flatland/protobuf/test/core.proto   |  6 +++---
 test/flatland/protobuf/core_test.clj          | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/proto/flatland/protobuf/test/core.proto b/resources/proto/flatland/protobuf/test/core.proto
index 71b6148..0bda650 100644
--- a/resources/proto/flatland/protobuf/test/core.proto
+++ b/resources/proto/flatland/protobuf/test/core.proto
@@ -36,7 +36,7 @@ message Foo {
   repeated Item  item_map  = 24 [(map_by) = "item"];
   repeated Pair  pair_map  = 25 [(map_by) = "key"];
   optional bool  deleted   = 26 [default  = false];
-  repeated Deletable deletions = 27 [(map_by) = "id"];
+  repeated Thing things = 27 [(map_by) = "id"];
 }
 
 message Bar {
@@ -97,7 +97,7 @@ message Response {
   optional ErrorMsg error = 2;
 }
 
-message Deletable {
+message Thing {
   optional string id = 1;
-  optional bool deleted = 2;
+  optional bool marked = 2;
 }
diff --git a/test/flatland/protobuf/core_test.clj b/test/flatland/protobuf/core_test.clj
index 4f22950..a45b0b6 100644
--- a/test/flatland/protobuf/core_test.clj
+++ b/test/flatland/protobuf/core_test.clj
@@ -144,10 +144,10 @@
 (deftest test-append-bytes
   (let [p (protobuf Foo :id 5 :label "rad" :deleted true
                     :tags ["sweet"] :tag-set #{"foo" "bar" "baz"}
-                    :deletions {"first" {:deleted false} "second" {:deleted false}})
+                    :things {"first" {:marked false} "second" {:marked false}})
         q (protobuf Foo :id 43 :deleted false
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
-                    :deletions {"first" {:deleted true}})
+                    :things {"first" {:marked true}})
         r (protobuf Foo :label "bad")
         s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
         t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
@@ -159,8 +159,8 @@
     (is (= ["sweet" "savory"] (s :tags)))
     (is (= #{"foo" "bar" "baz"} (p :tag-set)))
     (is (= #{"bap" "baz"} (s :tag-set)))
-    (is (= (s :deletions) {"first" {:id "first" :deleted true}
-                           "second" {:id "second" :deleted false}}))
+    (is (= (s :things) {"first" {:id "first" :marked true}
+                        "second" {:id "second" :marked false}}))
     (is (= false (r :deleted)))))
 
 (deftest test-manual-append
@@ -400,11 +400,11 @@
                              :values {:type :struct, :name "flatland.protobuf.test.core.Item"
                                       :fields {:item   {:type :string},
                                                :exists {:default true, :type :boolean}}}}
-                  :deletions {:type :map
-                              :keys {:type :string}
-                              :values {:type :struct, :name "flatland.protobuf.test.core.Deletable"
-                                       :fields {:id {:type :string}
-                                                :deleted {:type :boolean}}}}}}]
+                  :things {:type :map
+                           :keys {:type :string}
+                           :values {:type :struct, :name "flatland.protobuf.test.core.Thing"
+                                    :fields {:id {:type :string}
+                                             :marked {:type :boolean}}}}}}]
     (is (= fields (protobuf-schema Foo)))
     (is (= fields (protobuf-schema flatland.protobuf.test.Core$Foo)))))
 
@@ -435,7 +435,7 @@
     (is (= [:yes :not_sure :maybe :not_sure :no] (:responses underscores)))
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
-             :pair_map :groups :doubles :floats :item_map :counts :time :lat :long :deletions}
+             :pair_map :groups :doubles :floats :item_map :counts :time :lat :long :things}
            (-> (protobuf-schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message

From f0838a1ca8c4db1906b5a097708761f7082211c5 Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 2 Jan 2013 13:38:52 -0800
Subject: [PATCH 316/525] left comes before right

---
 src/flatland/protobuf/PersistentProtocolBufferMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index 0ca41c3..640466e 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -283,7 +283,7 @@ protected PersistentProtocolBufferMap mapValue(Descriptors.FieldDescriptor field
             return left.append(right);
           }
         }
-        return right.append(left);
+        return left.append(right);
       }
     }
   }

From b14e64fda7abd9d9996de8c36f62d78d94843aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iivari=20=C3=84ik=C3=A4s?= <iivari.aikas@gmail.com>
Date: Fri, 8 Feb 2013 23:35:55 +0200
Subject: [PATCH 317/525] Mark flatland/io as project dependency

---
 project.clj                     | 4 ++--
 src/flatland/protobuf/codec.clj | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index d706079..c27e07c 100644
--- a/project.clj
+++ b/project.clj
@@ -6,14 +6,14 @@
   :dependencies [[org.clojure/clojure "1.4.0"]
                  [org.flatland/useful "0.9.0"]
                  [org.flatland/schematic "0.1.0"]
+                 [org.flatland/io "0.3.0"]
                  [ordered-collections "0.4.0"]]
   :plugins [[lein-protobuf "0.3.1"]]
   :javac-options ["-target" "5" "-source" "5"]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
-             :dev {:dependencies [[gloss "0.2.1"]
-                                  [org.flatland/io "0.3.0"]]}}
+             :dev {:dependencies [[gloss "0.2.1"]]}}
   :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}
diff --git a/src/flatland/protobuf/codec.clj b/src/flatland/protobuf/codec.clj
index 01baecc..af4f434 100644
--- a/src/flatland/protobuf/codec.clj
+++ b/src/flatland/protobuf/codec.clj
@@ -5,6 +5,9 @@
         [flatland.useful.fn :only [fix]]
         [flatland.useful.experimental :only [lift-meta]]
         [clojure.java.io :only [input-stream]])
+
+  ;; flatland.io extends Seqable so we can concat InputStream from
+  ;; ByteBuffer sequences.
   (:require flatland.io.core
             [flatland.schematic.core :as schema]
             [gloss.core :as gloss]))

From 52787eb0fc5cea9949cd8a9319892a3e66e463a6 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Thu, 25 Apr 2013 10:31:49 -0700
Subject: [PATCH 318/525] Protobuf takes a map, not a naming strategy.

As pointed out in #45.
---
 src/flatland/protobuf/core.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flatland/protobuf/core.clj b/src/flatland/protobuf/core.clj
index abdc0af..1a0431d 100644
--- a/src/flatland/protobuf/core.clj
+++ b/src/flatland/protobuf/core.clj
@@ -23,7 +23,7 @@
   ([def]
      (if (or (protodef? def) (nil? def))
        def
-       (protodef def PersistentProtocolBufferMap$Def/convertUnderscores)))
+       (protodef def {})))
   ([def opts]
      (when def
        (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy

From 9f53d71f9abbc89f9b6d0c86e3bf7126dc67b295 Mon Sep 17 00:00:00 2001
From: Joe Doliner <jdoliner@gmail.com>
Date: Thu, 6 Jun 2013 00:25:15 -0600
Subject: [PATCH 319/525] Update the first example.

The previous version would lead to the class not being found which had me (a very inexperienced clojure user) confused for a while.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9abf799..cf593b3 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ You can run the following to compile the `.proto` file:
 Now you can use the protocol buffer in Clojure:
 
 ```clojure
-(use 'protobuf.core)
+(use 'flatland.protobuf.core)
 (import Example$Person)
 
 (def Person (protodef Example$Person))

From d178d1b849b72b08a00eb88aff29814392c2c03b Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Mon, 19 Aug 2013 17:29:07 -0700
Subject: [PATCH 320/525] remove unused getBoolean method

---
 src/flatland/protobuf/PersistentProtocolBufferMap.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index 640466e..a722d3e 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -732,11 +732,6 @@ public Object getValAt(Object key, Object notFound, boolean use_extensions) {
     }
   }
 
-  protected boolean getBoolean (Object key) {
-    Object val = valAt(key);
-    return val != null && val != Boolean.FALSE;
-  }
-
   @Override
   public PersistentProtocolBufferMap assoc(Object key, Object value) {
     DynamicMessage.Builder builder = builder();

From 5c98d41953ed21b90fcdb872041ee6287c3c0178 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 30 Oct 2013 12:42:48 -0700
Subject: [PATCH 321/525] Add test for bytestrings

---
 resources/proto/flatland/protobuf/test/example.proto |  1 +
 test/flatland/protobuf/example_test.clj              | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/proto/flatland/protobuf/test/example.proto b/resources/proto/flatland/protobuf/test/example.proto
index fb8067b..1f8ac8d 100644
--- a/resources/proto/flatland/protobuf/test/example.proto
+++ b/resources/proto/flatland/protobuf/test/example.proto
@@ -11,6 +11,7 @@ message Photo {
   repeated Label  labels = 3 [(set)    = true];
   repeated Attr   attrs  = 4 [(map)    = true];
   repeated Tag    tags   = 5 [(map_by) = "person_id"];
+  optional bytes  image  = 6;
 
   message Label {
     required string item   = 1;
diff --git a/test/flatland/protobuf/example_test.clj b/test/flatland/protobuf/example_test.clj
index c72b4fb..edee65a 100644
--- a/test/flatland/protobuf/example_test.clj
+++ b/test/flatland/protobuf/example_test.clj
@@ -1,11 +1,13 @@
 (ns flatland.protobuf.example-test
-  (:use flatland.protobuf.core clojure.test))
+  (:use flatland.protobuf.core clojure.test)
+  (:import com.google.protobuf.ByteString))
 
 (def Photo (protodef flatland.protobuf.test.Example$Photo))
 
-(def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"}, 
-           :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"}, 
-           :tags {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}})
+(def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"},
+           :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"},
+           :tags {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}
+           :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
 
 (deftest example-test
   (is (= data (apply protobuf Photo (apply concat data)))))

From d448ea547987a8d9f17779dc04e4d8d986f0adcb Mon Sep 17 00:00:00 2001
From: Justin Balthrop <git@justinbalthrop.com>
Date: Wed, 30 Oct 2013 11:59:13 -0700
Subject: [PATCH 322/525] 0.8.0 - update to google protobuf 2.5.0

---
 project.clj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index c27e07c..dd77cc2 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.7.3-SNAPSHOT"
+(defproject org.flatland/protobuf "0.8.0"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -8,8 +8,7 @@
                  [org.flatland/schematic "0.1.0"]
                  [org.flatland/io "0.3.0"]
                  [ordered-collections "0.4.0"]]
-  :plugins [[lein-protobuf "0.3.1"]]
-  :javac-options ["-target" "5" "-source" "5"]
+  :plugins [[lein-protobuf "0.4.1"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}

From 1fee22b50719e521abd1e0e841bc364ddacb64d8 Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 30 Oct 2013 13:12:30 -0700
Subject: [PATCH 323/525] Make message() and builder() public.

These were made public in the 0.7.2 jar, but due to some kind of mix-up
I never committed that change so the 0.8.0 jar undoes that.
---
 src/flatland/protobuf/PersistentProtocolBufferMap.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/flatland/protobuf/PersistentProtocolBufferMap.java
index a722d3e..052b1f9 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/flatland/protobuf/PersistentProtocolBufferMap.java
@@ -373,7 +373,7 @@ public Descriptors.Descriptor getMessageType() {
     return def.getMessageType();
   }
 
-  protected DynamicMessage message() {
+  public DynamicMessage message() {
     if (message == null) {
       return def.newBuilder().build(); // This will only work if an empty message is valid.
     } else {
@@ -381,7 +381,7 @@ protected DynamicMessage message() {
     }
   }
 
-  protected DynamicMessage.Builder builder() {
+  public DynamicMessage.Builder builder() {
     if (message == null) {
       return def.newBuilder();
     } else {

From 721b8f7022f5254746d2b0a3658583f7aa0f6e7c Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 30 Oct 2013 13:14:20 -0700
Subject: [PATCH 324/525] 0.8.1 - make message() and builder() public

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index dd77cc2..fb514c4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.8.0"
+(defproject org.flatland/protobuf "0.8.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From ffc0f216e4d00ff730459165f5bac4e74c88f16a Mon Sep 17 00:00:00 2001
From: Alan Malloy <alan@malloys.org>
Date: Wed, 30 Oct 2013 13:16:22 -0700
Subject: [PATCH 325/525] New snapshot

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index fb514c4..02ff5c2 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.flatland/protobuf "0.8.1"
+(defproject org.flatland/protobuf "0.8.2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 49896b04a8bda603b497aebfafb075e9aa131606 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 15:49:39 -0500
Subject: [PATCH 326/525] Upgrade dependencies to the latest

Except gloss, it seems to crash if we upgrade

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index 02ff5c2..1fcd22d 100644
--- a/project.clj
+++ b/project.clj
@@ -3,11 +3,11 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/flatland/clojure-protobuf"
-  :dependencies [[org.clojure/clojure "1.4.0"]
-                 [org.flatland/useful "0.9.0"]
-                 [org.flatland/schematic "0.1.0"]
+  :dependencies [[org.clojure/clojure "1.8.0"]
+                 [org.flatland/useful "0.11.5"]
+                 [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]
-                 [ordered-collections "0.4.0"]]
+                 [ordered-collections "0.4.2"]]
   :plugins [[lein-protobuf "0.4.1"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}

From 4a5b95d54630cede07e658baf0d476a7aab618f3 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 16:07:16 -0500
Subject: [PATCH 327/525] Convert to private release in prep for deployment to
 clojars

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj                           |  15 +-
 src/flatland/protobuf/Extensions.java | 255 ++++++++++++++++++++++++++
 2 files changed, 260 insertions(+), 10 deletions(-)
 create mode 100644 src/flatland/protobuf/Extensions.java

diff --git a/project.clj b/project.clj
index 1fcd22d..c04944d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,20 +1,15 @@
-(defproject org.flatland/protobuf "0.8.2-SNAPSHOT"
+(defproject ghaskins/clojure-protobuf "0.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url "https://github.com/flatland/clojure-protobuf"
+  :url "https://github.com/ghaskins/clojure-protobuf"
   :dependencies [[org.clojure/clojure "1.8.0"]
+                 [com.google.protobuf/protobuf-java "2.6.1"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]
-                 [ordered-collections "0.4.2"]]
-  :plugins [[lein-protobuf "0.4.1"]]
+                 [ordered-collections "0.4.2"]
+                 [gloss "0.2.1"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
-  :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
-             :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
-             :dev {:dependencies [[gloss "0.2.1"]]}}
-  :repositories {"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
-                                       :snapshots true
-                                       :releases {:checksum :fail :update :always}}}
   :checksum-deps true
   :java-source-paths ["src"])
diff --git a/src/flatland/protobuf/Extensions.java b/src/flatland/protobuf/Extensions.java
new file mode 100644
index 0000000..c141191
--- /dev/null
+++ b/src/flatland/protobuf/Extensions.java
@@ -0,0 +1,255 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: flatland/protobuf/extensions.proto
+
+package flatland.protobuf;
+
+public final class Extensions {
+  private Extensions() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registry.add(flatland.protobuf.Extensions.set);
+    registry.add(flatland.protobuf.Extensions.map);
+    registry.add(flatland.protobuf.Extensions.mapBy);
+    registry.add(flatland.protobuf.Extensions.counter);
+    registry.add(flatland.protobuf.Extensions.succession);
+    registry.add(flatland.protobuf.Extensions.mapDeleted);
+    registry.add(flatland.protobuf.Extensions.mapExists);
+    registry.add(flatland.protobuf.Extensions.meta);
+    registry.add(flatland.protobuf.Extensions.nullable);
+    registry.add(flatland.protobuf.Extensions.nullString);
+    registry.add(flatland.protobuf.Extensions.nullInt);
+    registry.add(flatland.protobuf.Extensions.nullLong);
+    registry.add(flatland.protobuf.Extensions.nullFloat);
+    registry.add(flatland.protobuf.Extensions.nullDouble);
+    registry.add(flatland.protobuf.Extensions.nullEnum);
+  }
+  public static final int SET_FIELD_NUMBER = 52001;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> set = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int MAP_FIELD_NUMBER = 52002;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> map = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int MAP_BY_FIELD_NUMBER = 52003;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> mapBy = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int COUNTER_FIELD_NUMBER = 52004;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> counter = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int SUCCESSION_FIELD_NUMBER = 52005;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> succession = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int MAP_DELETED_FIELD_NUMBER = 52006;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> mapDeleted = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int MAP_EXISTS_FIELD_NUMBER = 52007;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> mapExists = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int META_FIELD_NUMBER = 52010;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> meta = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int NULLABLE_FIELD_NUMBER = 52020;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> nullable = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
+  public static final int NULL_STRING_FIELD_NUMBER = 52021;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.String> nullString = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.String.class,
+        null);
+  public static final int NULL_INT_FIELD_NUMBER = 52022;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Integer> nullInt = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int NULL_LONG_FIELD_NUMBER = 52023;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Long> nullLong = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Long.class,
+        null);
+  public static final int NULL_FLOAT_FIELD_NUMBER = 52024;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Float> nullFloat = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Float.class,
+        null);
+  public static final int NULL_DOUBLE_FIELD_NUMBER = 52025;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Double> nullDouble = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Double.class,
+        null);
+  public static final int NULL_ENUM_FIELD_NUMBER = 52026;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Integer> nullEnum = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\"flatland/protobuf/extensions.proto\032 go" +
+      "ogle/protobuf/descriptor.proto:,\n\003set\022\035." +
+      "google.protobuf.FieldOptions\030\241\226\003 \001(\010:,\n\003" +
+      "map\022\035.google.protobuf.FieldOptions\030\242\226\003 \001" +
+      "(\010:/\n\006map_by\022\035.google.protobuf.FieldOpti" +
+      "ons\030\243\226\003 \001(\t:0\n\007counter\022\035.google.protobuf" +
+      ".FieldOptions\030\244\226\003 \001(\010:3\n\nsuccession\022\035.go" +
+      "ogle.protobuf.FieldOptions\030\245\226\003 \001(\010:4\n\013ma" +
+      "p_deleted\022\035.google.protobuf.FieldOptions" +
+      "\030\246\226\003 \001(\t:3\n\nmap_exists\022\035.google.protobuf",
+      ".FieldOptions\030\247\226\003 \001(\t:-\n\004meta\022\035.google.p" +
+      "rotobuf.FieldOptions\030\252\226\003 \001(\t:1\n\010nullable" +
+      "\022\035.google.protobuf.FieldOptions\030\264\226\003 \001(\010:" +
+      "4\n\013null_string\022\035.google.protobuf.FieldOp" +
+      "tions\030\265\226\003 \001(\t:1\n\010null_int\022\035.google.proto" +
+      "buf.FieldOptions\030\266\226\003 \001(\021:2\n\tnull_long\022\035." +
+      "google.protobuf.FieldOptions\030\267\226\003 \001(\022:3\n\n" +
+      "null_float\022\035.google.protobuf.FieldOption" +
+      "s\030\270\226\003 \001(\002:4\n\013null_double\022\035.google.protob" +
+      "uf.FieldOptions\030\271\226\003 \001(\001:2\n\tnull_enum\022\035.g",
+      "oogle.protobuf.FieldOptions\030\272\226\003 \001(\rB\037\n\021f" +
+      "latland.protobufB\nExtensions"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.protobuf.DescriptorProtos.getDescriptor(),
+        }, assigner);
+    set.internalInit(descriptor.getExtensions().get(0));
+    map.internalInit(descriptor.getExtensions().get(1));
+    mapBy.internalInit(descriptor.getExtensions().get(2));
+    counter.internalInit(descriptor.getExtensions().get(3));
+    succession.internalInit(descriptor.getExtensions().get(4));
+    mapDeleted.internalInit(descriptor.getExtensions().get(5));
+    mapExists.internalInit(descriptor.getExtensions().get(6));
+    meta.internalInit(descriptor.getExtensions().get(7));
+    nullable.internalInit(descriptor.getExtensions().get(8));
+    nullString.internalInit(descriptor.getExtensions().get(9));
+    nullInt.internalInit(descriptor.getExtensions().get(10));
+    nullLong.internalInit(descriptor.getExtensions().get(11));
+    nullFloat.internalInit(descriptor.getExtensions().get(12));
+    nullDouble.internalInit(descriptor.getExtensions().get(13));
+    nullEnum.internalInit(descriptor.getExtensions().get(14));
+    com.google.protobuf.DescriptorProtos.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

From 7c38d8393be6fa4f49b765af8167bae0cb8290eb Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 16:17:48 -0500
Subject: [PATCH 328/525] Update project name

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index c04944d..33f7d9d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject ghaskins/clojure-protobuf "0.1-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "0.1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 81662bf034face2815f2e18b74df0a1ceba8928e Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 16:41:51 -0500
Subject: [PATCH 329/525] Manage the minimum java compatibility to remain
 compatible with OBC JRE

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 33f7d9d..b5316cb 100644
--- a/project.clj
+++ b/project.clj
@@ -3,6 +3,8 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/ghaskins/clojure-protobuf"
+  :javac-options ["-target" "1.7" "-source" "1.7"]
+  :java-source-paths ["src"]
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [com.google.protobuf/protobuf-java "2.6.1"]
                  [org.flatland/useful "0.11.5"]
@@ -11,5 +13,4 @@
                  [ordered-collections "0.4.2"]
                  [gloss "0.2.1"]]
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
-  :checksum-deps true
-  :java-source-paths ["src"])
+  :checksum-deps true)

From f9099c4431aaa74bcf95fbf2bf307bb157fbce13 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 16:22:20 -0500
Subject: [PATCH 330/525] Update README.md

---
 README.md | 84 ++++---------------------------------------------------
 1 file changed, 5 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index cf593b3..e150c95 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,11 @@
 clojure-protobuf provides a Clojure interface to Google's [protocol buffers](http://code.google.com/p/protobuf).
-Protocol buffers can be used to communicate with other languages over the network, and
-they are WAY faster to serialize and deserialize than standard Clojure objects.
+Protocol buffers can be used to communicate with other languages over the network, and they are WAY faster to serialize and deserialize than standard Clojure objects.
 
 ## Getting started
 
-You'll probably want to use [Leiningen](https://github.com/technomancy/leiningen) with the
-[lein-protobuf](https://github.com/flatland/lein-protobuf) plugin for compiling `.proto` files. Add
-the following to your `project.clj` file:
+Add the dependency to your project.clj
 
-    :dependencies [[org.flatland/protobuf "0.7.1"]]
-    :plugins [[lein-protobuf "0.1.1"]]
-
-Be sure to replace `"0.6.0"` and `"0.1.1"` with the latest versions listed at
-http://clojars.org/protobuf and http://clojars.org/lein-protobuf.
-
-*Note: lein-protobuf requires at least version 2.0 of Leiningen.*
-
-## Usage
+[![Clojars Project](https://img.shields.io/clojars/v/org.clojars.ghaskins/protobuf.svg)](https://clojars.org/org.clojars.ghaskins/protobuf)
 
 Assuming you have the following in `resources/proto/person.proto`:
 
@@ -29,9 +18,9 @@ message Person {
 }
 ```
 
-You can run the following to compile the `.proto` file:
+Compile the proto using the protobuf compiler and include the resulting .java code in your project
 
-    lein protobuf
+    protoc --java_out=./ -proto_dir=resources/proto person.proto
 
 Now you can use the protocol buffer in Clojure:
 
@@ -60,66 +49,3 @@ Now you can use the protocol buffer in Clojure:
 A protocol buffer map is immutable just like other clojure objects. It is similar to a
 struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
 
-## Extensions
-
-Clojure-protobuf supports extensions to protocol buffers which provide sets and maps using
-repeated fields. You can also provide metadata on protobuf fields using clojure syntax. To
-use these, you must import the extension file and include it when compiling. For example:
-
-```proto
-import "flatland/protobuf/core/extensions.proto";
-
-message Photo {
-  required int32  id     = 1;
-  required string path   = 2;
-  repeated Label  labels = 3 [(set)    = true];
-  repeated Attr   attrs  = 4 [(map)    = true];
-  repeated Tag    tags   = 5 [(map_by) = "person_id"];
-
-  message Label {
-    required string item   = 1;
-    required bool   exists = 2;
-  }
-
-  message Attr {
-    required string key = 1;
-    optional string val = 2;
-  }
-
-  message Tag {
-    required int32 person_id = 1;
-    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
-    optional int32 y_coord   = 3;
-    optional int32 width     = 4;
-    optional int32 height    = 5;
-  }
-}
-```
-Then you can access the extension fields in Clojure:
-
-```clojure
-(use 'flatland.protobuf.core)
-(import Example$Photo)
-(import Example$Photo$Tag)
-
-(def Photo (protodef Example$Photo))
-(def Tag (protodef Example$Photo$Tag))
-
-(def p (protobuf Photo :id 7  :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}
-                       :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-                       :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
-=> {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
-
-(def b (protobuf-dump p))
-=> #<byte[] [B@7cbe41ec>
-
-(protobuf-load Photo b)
-=> {:id 7 :path "/photos/h2k3j4h9h23" :labels #{"hawaii" "family" "surfing"}...}
-
-(:x-coord (protobuf-schema Tag))
-=> {:max 100.0 :min -100.0}
-```
-
-## Getting Help
-
-If you have any questions or need help, you can find us on IRC in [#flatland](irc://irc.freenode.net/#flatland).

From a36f305467d472658b93b7cef447b06809191bd8 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 16:44:20 -0500
Subject: [PATCH 331/525] Add lein-release support for deploying to clojars

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project.clj b/project.clj
index b5316cb..c2db072 100644
--- a/project.clj
+++ b/project.clj
@@ -5,6 +5,7 @@
   :url "https://github.com/ghaskins/clojure-protobuf"
   :javac-options ["-target" "1.7" "-source" "1.7"]
   :java-source-paths ["src"]
+  :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [com.google.protobuf/protobuf-java "2.6.1"]
                  [org.flatland/useful "0.11.5"]

From 8fdef4e1a3e731f49324d72e621c57a9e565339c Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 17:05:22 -0500
Subject: [PATCH 332/525] Add repository info

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project.clj b/project.clj
index c2db072..f4da670 100644
--- a/project.clj
+++ b/project.clj
@@ -6,6 +6,8 @@
   :javac-options ["-target" "1.7" "-source" "1.7"]
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
+  :repositories [["releases" {:url "https://clojars.org/repo"
+                              :creds :gpg}]]
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [com.google.protobuf/protobuf-java "2.6.1"]
                  [org.flatland/useful "0.11.5"]

From 625499c48348b61c6e24e12772f8ef4548845752 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 17:23:21 -0500
Subject: [PATCH 333/525] More clojars tweaking

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project.clj b/project.clj
index f4da670..c2db072 100644
--- a/project.clj
+++ b/project.clj
@@ -6,8 +6,6 @@
   :javac-options ["-target" "1.7" "-source" "1.7"]
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
-  :repositories [["releases" {:url "https://clojars.org/repo"
-                              :creds :gpg}]]
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [com.google.protobuf/protobuf-java "2.6.1"]
                  [org.flatland/useful "0.11.5"]

From c09854d98bbc06b4b5789dd2b414b9567119a3a5 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 17:23:39 -0500
Subject: [PATCH 334/525] lein-release plugin: preparing 0.1 release

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index c2db072..e4650af 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.1-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "0.1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 16c8e983a23fe10e5db77229baee3a9245cc69c7 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 18 Feb 2016 17:24:13 -0500
Subject: [PATCH 335/525] lein-release plugin: bumped version from 0.1 to
 0.2-SNAPSHOT for next development cycle

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index e4650af..07fecc0 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.1"
+(defproject org.clojars.ghaskins/protobuf "0.2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 27207c8ffbc29ca3517224664466582002b8a85f Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Tue, 17 May 2016 14:53:59 -0400
Subject: [PATCH 336/525] Upgrade to proto3

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 07fecc0..e4ee572 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "2.6.1"]
+                 [com.google.protobuf/protobuf-java "3.0.0-beta-2"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From 798b1b00fb0bd2643d74305da0da22ff797e89b4 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Tue, 17 May 2016 14:57:34 -0400
Subject: [PATCH 337/525] lein-release plugin: preparing 0.2 release

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index e4ee572..ee38a07 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.2-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "0.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 94e2c72846c11e1f0acfd743f8499c4ffa9b1c71 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Tue, 17 May 2016 14:58:21 -0400
Subject: [PATCH 338/525] lein-release plugin: bumped version from 0.2 to
 0.3-SNAPSHOT for next development cycle

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index ee38a07..9f19b33 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.2"
+(defproject org.clojars.ghaskins/protobuf "0.3-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 28fe07099347ebc8ab6ffdc6be601ef000b2624b Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Wed, 29 Jun 2016 08:48:10 -0400
Subject: [PATCH 339/525] Update to protobuf-3-beta3

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 9f19b33..9fd724e 100644
--- a/project.clj
+++ b/project.clj
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.0.0-beta-2"]
+                 [com.google.protobuf/protobuf-java "3.0.0-beta-3"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From 01367bb62865ca40eb4a43fad9edc8a6c5321dd6 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Wed, 29 Jun 2016 09:38:16 -0400
Subject: [PATCH 340/525] Version v0.3

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 9fd724e..2aea4e8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.3-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "0.3"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 411353c6ca2860fa866aa8869bf1cadff483acdf Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Wed, 29 Jun 2016 09:38:55 -0400
Subject: [PATCH 341/525] Prepare for v0.4 development

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 2aea4e8..0eeabb6 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.3"
+(defproject org.clojars.ghaskins/protobuf "0.4-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 2278a863131bf6269dc9b51075123d7f6a997780 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 22 Sep 2016 11:45:14 -0400
Subject: [PATCH 342/525] Upgrade to v3.0.2 released protobuf

We also change our versioning scheme to reflect the protobuf
library we are using.  The schema is $PROTOVER-$RELEASE, e.g.
3.0.2-1

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 0eeabb6..77709ad 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "0.4-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.0.2-1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.0.0-beta-3"]
+                 [com.google.protobuf/protobuf-java "3.0.2"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From 73b066fa646020cff518afcf6cc336a7668df3f7 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 22 Sep 2016 12:08:54 -0400
Subject: [PATCH 343/525] Version 3.0.2-1

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 77709ad..706475e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.0.2-1-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.0.2-1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 350a622a23992cbbcd319e6edfa9848fba56541d Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 22 Sep 2016 13:20:52 -0400
Subject: [PATCH 344/525] Prepare for v3.0.2-2 development

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 706475e..70e7f1c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.0.2-1"
+(defproject org.clojars.ghaskins/protobuf "3.0.2-2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 1d5ff2002270d3aee431bd147a1dbfb2bb2a7c2d Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 22 Sep 2016 14:45:15 -0400
Subject: [PATCH 345/525] Upgrade to java 1.8

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 70e7f1c..4776ec1 100644
--- a/project.clj
+++ b/project.clj
@@ -3,7 +3,7 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/ghaskins/clojure-protobuf"
-  :javac-options ["-target" "1.7" "-source" "1.7"]
+  :javac-options ["-target" "1.8" "-source" "1.8"]
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]

From 2ca00a2814f2df0d7face2a0e75b4eb9e8cfeaa8 Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Thu, 22 Sep 2016 14:52:06 -0400
Subject: [PATCH 346/525] Release v3.0.2-2

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4776ec1..1d449e4 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.0.2-2-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.0.2-2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From b826ed571b0655d0dab4c65724e63c20876f3816 Mon Sep 17 00:00:00 2001
From: Kiran Karkera <kiran.karkera@gmail.com>
Date: Tue, 16 May 2017 15:37:06 +0800
Subject: [PATCH 347/525]  moved to protobuf version 3.1.0

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 1d449e4..4884ba1 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.0.2-2"
+(defproject org.clojars.ghaskins/protobuf "3.1.0"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.0.2"]
+                 [com.google.protobuf/protobuf-java "3.1.0"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From a4618c69e2b829ca5efc8300341fd47192d64f4c Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Tue, 23 May 2017 14:31:29 -0400
Subject: [PATCH 348/525] Release v3.1.0-1

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4884ba1..1364258 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.1.0"
+(defproject org.clojars.ghaskins/protobuf "3.1.0-1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 2d2e1371ba126257d2210a81f7e609dea884ca1a Mon Sep 17 00:00:00 2001
From: Gregory Haskins <gregory.haskins@gmail.com>
Date: Tue, 23 May 2017 14:32:15 -0400
Subject: [PATCH 349/525] Prepare for v3.1.0-2 development

Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 1364258..168b5f1 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.1.0-1"
+(defproject org.clojars.ghaskins/protobuf "3.1.0-2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 51db19398344aea8883499626fa9dd28c9c6bc7b Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Tue, 23 May 2017 14:45:54 -0400
Subject: [PATCH 350/525] Upgrade to protobuf v3.3.1

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 168b5f1..095bfc0 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.1.0-2-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.3.1-1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.1.0"]
+                 [com.google.protobuf/protobuf-java "3.3.1"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From 81e9935cedfd67c59d85e8611b76996d0f45906c Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Tue, 23 May 2017 14:46:33 -0400
Subject: [PATCH 351/525] Release v3.3.1-1

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 095bfc0..fe7ead8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.3.1-1-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.3.1-1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 941118f26362db9128b072054b220992cb7d52e0 Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Tue, 23 May 2017 14:47:06 -0400
Subject: [PATCH 352/525] Prepare for v3.3.1-2 development

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index fe7ead8..baec365 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.3.1-1"
+(defproject org.clojars.ghaskins/protobuf "3.3.1-2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 786c991c88ea64d8d36231339bac3decd7340700 Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Fri, 1 Sep 2017 17:31:35 -0400
Subject: [PATCH 353/525] Upgrade to protobuf v3.4.0

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index baec365..676439a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.3.1-2-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.4.0-1-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
@@ -7,7 +7,7 @@
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.3.1"]
+                 [com.google.protobuf/protobuf-java "3.4.0"]
                  [org.flatland/useful "0.11.5"]
                  [org.flatland/schematic "0.1.5"]
                  [org.flatland/io "0.3.0"]

From b2fd75bd99c878b630f778e95021e05141aa030c Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Fri, 1 Sep 2017 17:32:02 -0400
Subject: [PATCH 354/525] Release v3.4.0-1

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 676439a..54fe6c8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.4.0-1-SNAPSHOT"
+(defproject org.clojars.ghaskins/protobuf "3.4.0-1"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 2c873d4bb0825138b9506a3d4524be19a9f22050 Mon Sep 17 00:00:00 2001
From: Greg Haskins <gregory.haskins@gmail.com>
Date: Fri, 1 Sep 2017 17:32:29 -0400
Subject: [PATCH 355/525] Prepare for v3.4.0-2 development

Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 54fe6c8..cc1d4d6 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.ghaskins/protobuf "3.4.0-1"
+(defproject org.clojars.ghaskins/protobuf "3.4.0-2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From 095a42d3e336d55f50b58c870527ddf014a5e7aa Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 10:29:54 -0600
Subject: [PATCH 356/525] Create a transitional release for the clojusc org.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index cc1d4d6..53afa4c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,8 @@
-(defproject org.clojars.ghaskins/protobuf "3.4.0-2-SNAPSHOT"
+(defproject clojusc/protobuf "3.4.0-2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url "https://github.com/ghaskins/clojure-protobuf"
+  :url "https://github.com/clojusc/clojure-protobuf"
   :javac-options ["-target" "1.8" "-source" "1.8"]
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}

From 64737adff88a20489e90f294ee1281593dc5c4f7 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 11:18:33 -0600
Subject: [PATCH 357/525] Establish a convention for releases; functionally
 identical to ghaskins' b9c386e.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 53afa4c..c32cc0e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.4.0-2-SNAPSHOT"
+(defproject clojusc/protobuf "3.4.0-v0.2-SNAPSHOT"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From df20f2b862d542498ec531d688dbef2ddd896778 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 11:20:50 -0600
Subject: [PATCH 358/525] Release as-is.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index c32cc0e..1fd0b3c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.4.0-v0.2-SNAPSHOT"
+(defproject clojusc/protobuf "3.4.0-v0.2"
   :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

From edb6dc47b9a95074e3f8608eefc627998f4ed6c4 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 11:29:20 -0600
Subject: [PATCH 359/525] Bump version for next dev cycle.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 1fd0b3c..b35dc2e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,5 +1,5 @@
-(defproject clojusc/protobuf "3.4.0-v0.2"
-  :description "Clojure-protobuf provides a clojure interface to Google's protocol buffers."
+(defproject clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"
+  :description "A Clojure interface to Google's protocol buffers"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/clojusc/clojure-protobuf"

From c8919ec96ec2a300ce1c02e4ac0786f6af5783fe Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 10:37:31 -0600
Subject: [PATCH 360/525] Updated Travis CI config.

---
 .travis.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65a5762..d1e6b30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,12 @@
 language: clojure
-lein: lein2
-script: lein2 testall
\ No newline at end of file
+sudo: false
+script: lein testall
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+  - openjdk6
+  - openjdk7
+notifications:
+  email:
+    - oubiwann@gmail.com
+

From 125ea790f4671a493825093836ec2ecbabe3ee29 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 10:40:32 -0600
Subject: [PATCH 361/525] Re-added old testing profiles.

---
 project.clj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b35dc2e..db326c8 100644
--- a/project.clj
+++ b/project.clj
@@ -2,7 +2,7 @@
   :description "A Clojure interface to Google's protocol buffers"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url "https://github.com/clojusc/clojure-protobuf"
+  :url "https://github.com/clojusc/protobuf"
   :javac-options ["-target" "1.8" "-source" "1.8"]
   :java-source-paths ["src"]
   :lein-release {:deploy-via :clojars}
@@ -13,5 +13,8 @@
                  [org.flatland/io "0.3.0"]
                  [ordered-collections "0.4.2"]
                  [gloss "0.2.1"]]
+  :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
+             :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
+             :dev {:dependencies [[gloss "0.2.1"]]}}
   :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
   :checksum-deps true)

From 8bdaace452b2ca1ff37221f05c47ac1d975a093c Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 11:13:57 -0600
Subject: [PATCH 362/525] Re-add lein-protobuf.

---
 project.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project.clj b/project.clj
index db326c8..1573c17 100644
--- a/project.clj
+++ b/project.clj
@@ -13,6 +13,8 @@
                  [org.flatland/io "0.3.0"]
                  [ordered-collections "0.4.2"]
                  [gloss "0.2.1"]]
+  :plugins [[lein-protobuf "0.5.0"]]
+  :protobuf-version "3.4.0"
   :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
              :dev {:dependencies [[gloss "0.2.1"]]}}

From f57f909be91dc9e4205cf929197b3206e9d7e381 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 12:51:09 -0600
Subject: [PATCH 363/525] Updated ignores.

---
 .gitignore | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba264f3..338a8b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,12 @@
-.lein-deps-sum
-.lein-failures
+.lein-*
 .cake
 *~
 lib
 classes
 build
-pom.xml
-pom.xml.asc
+pom.xml*
 *.jar
 *.class
-proto/google/protobuf/descriptor.proto
 docs
 protobuf-*
 protosrc

From 42cc8d2c425881002dade4a6614200012932fe55 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 12:55:02 -0600
Subject: [PATCH 364/525] Got tests running again.

---
 bin/compile-test-protobufs | 11 ++++++++
 project.clj                | 52 +++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100755 bin/compile-test-protobufs

diff --git a/bin/compile-test-protobufs b/bin/compile-test-protobufs
new file mode 100755
index 0000000..64430c0
--- /dev/null
+++ b/bin/compile-test-protobufs
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+OUT_DIR=target/test
+
+mkdir -p $OUT_DIR
+protoc \
+  -I=/usr/include \
+  -I=/usr/local/include \
+  -I=resources/proto \
+  --java_out=$OUT_DIR \
+  resources/proto/flatland/protobuf/test/*.proto
diff --git a/project.clj b/project.clj
index 1573c17..9e6e3a2 100644
--- a/project.clj
+++ b/project.clj
@@ -1,22 +1,38 @@
 (defproject clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"
   :description "A Clojure interface to Google's protocol buffers"
-  :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
   :url "https://github.com/clojusc/protobuf"
-  :javac-options ["-target" "1.8" "-source" "1.8"]
+  :license {
+    :name "Eclipse Public License"
+    :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :exclusions [
+    [org.clojure/clojure]]
+  :dependencies [
+    [org.clojure/clojure "1.8.0"]
+    [com.google.protobuf/protobuf-java "3.4.0"]
+    [org.flatland/useful "0.11.5"]
+    [org.flatland/schematic "0.1.5"]
+    [org.flatland/io "0.3.0"]
+    [ordered-collections "0.4.2"]
+    [gloss "0.2.1"]]
   :java-source-paths ["src"]
-  :lein-release {:deploy-via :clojars}
-  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [com.google.protobuf/protobuf-java "3.4.0"]
-                 [org.flatland/useful "0.11.5"]
-                 [org.flatland/schematic "0.1.5"]
-                 [org.flatland/io "0.3.0"]
-                 [ordered-collections "0.4.2"]
-                 [gloss "0.2.1"]]
-  :plugins [[lein-protobuf "0.5.0"]]
-  :protobuf-version "3.4.0"
-  :profiles {:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
-             :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
-             :dev {:dependencies [[gloss "0.2.1"]]}}
-  :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
-  :checksum-deps true)
+  :profiles {
+    :test {
+      :plugins [[lein-shell "0.5.0"]]
+      :java-source-paths ["target/test"]}
+    :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
+    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}}
+  :aliases {
+    "protoc-test" [
+       "with-profile"
+       "+test"
+       "shell"
+       "bin/compile-test-protobufs"]
+    "test-all" [
+      "with-profile"
+      "+1.3,+1.5,+default"
+      "test"]
+    "build-test" [
+      "do"
+        ["clean"]
+        ["protoc-test"]
+        ["test-all"]]})

From 1c51040972ee167f8f07e585952fc2d4b6e4a94d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 13:02:08 -0600
Subject: [PATCH 365/525] Add protoc to Travis build.

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d1e6b30..afb0c93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: clojure
 sudo: false
-script: lein testall
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y protobuf-compiler libprotoc-dev
+script: lein build-test
 jdk:
   - oraclejdk8
   - oraclejdk7

From bd3d8705f01f314549179a9b1ffd7e30e658e402 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 15:01:04 -0600
Subject: [PATCH 366/525] Added more versions to test.

---
 project.clj | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index 9e6e3a2..e077f4f 100644
--- a/project.clj
+++ b/project.clj
@@ -19,8 +19,10 @@
     :test {
       :plugins [[lein-shell "0.5.0"]]
       :java-source-paths ["target/test"]}
-    :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
-    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}}
+    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
+    :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+    :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+    :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
     "protoc-test" [
        "with-profile"
@@ -29,10 +31,10 @@
        "bin/compile-test-protobufs"]
     "test-all" [
       "with-profile"
-      "+1.3,+1.5,+default"
+      "+1.5:+1.6:+1.7:+1.9:+default"
       "test"]
     "build-test" [
       "do"
-        ["clean"]
-        ["protoc-test"]
-        ["test-all"]]})
+      ["clean"]
+      ["protoc-test"]
+      ["test-all"]]})

From bbd1e1d5b62e9cbcc1f344758ad6789dd202b4f2 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 15:19:00 -0600
Subject: [PATCH 367/525] Added linting profiles and fixed linting errors.

---
 project.clj                     | 23 ++++++++++++++++++++---
 src/flatland/protobuf/codec.clj | 24 ++++++++++++------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/project.clj b/project.clj
index e077f4f..bc539c2 100644
--- a/project.clj
+++ b/project.clj
@@ -8,16 +8,21 @@
     [org.clojure/clojure]]
   :dependencies [
     [org.clojure/clojure "1.8.0"]
-    [com.google.protobuf/protobuf-java "3.4.0"]
+    [com.google.protobuf/protobuf-java "3.5.1"]
     [org.flatland/useful "0.11.5"]
     [org.flatland/schematic "0.1.5"]
     [org.flatland/io "0.3.0"]
     [ordered-collections "0.4.2"]
-    [gloss "0.2.1"]]
+    [gloss "0.2.6"]]
   :java-source-paths ["src"]
   :profiles {
     :test {
-      :plugins [[lein-shell "0.5.0"]]
+      :dependencies [
+        [clojusc/ltest "0.3.0-SNAPSHOT"]]
+      :plugins [
+        [jonase/eastwood "0.2.5"]
+        [lein-ancient "0.6.15"]
+        [lein-shell "0.5.0"]]
       :java-source-paths ["target/test"]}
     :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
     :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
@@ -29,6 +34,17 @@
        "+test"
        "shell"
        "bin/compile-test-protobufs"]
+    "check-deps" [
+      "with-profile"
+      "+test"
+      "ancient"
+      "check"
+      ":all"]
+    "lint" [
+      "with-profile"
+      "+test"
+      "eastwood"
+      "{:namespaces [:source-paths] :source-paths [\"src\"]}"]
     "test-all" [
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"
@@ -36,5 +52,6 @@
     "build-test" [
       "do"
       ["clean"]
+      ["lint"]
       ["protoc-test"]
       ["test-all"]]})
diff --git a/src/flatland/protobuf/codec.clj b/src/flatland/protobuf/codec.clj
index af4f434..7f9f6eb 100644
--- a/src/flatland/protobuf/codec.clj
+++ b/src/flatland/protobuf/codec.clj
@@ -1,16 +1,16 @@
 (ns flatland.protobuf.codec
-  (:use flatland.protobuf.core
-        [gloss.core.protocols :only [Reader Writer]]
-        [gloss.core.formats :only [to-buf-seq]]
-        [flatland.useful.fn :only [fix]]
-        [flatland.useful.experimental :only [lift-meta]]
-        [clojure.java.io :only [input-stream]])
-
-  ;; flatland.io extends Seqable so we can concat InputStream from
-  ;; ByteBuffer sequences.
-  (:require flatland.io.core
-            [flatland.schematic.core :as schema]
-            [gloss.core :as gloss]))
+  (:require
+    [clojure.java.io :refer [input-stream]]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [flatland.protobuf.core :refer :all]
+    [flatland.schematic.core :as schema]
+    [flatland.useful.experimental :refer [lift-meta]]
+    [flatland.useful.fn :refer [fix]]
+    [gloss.core :as gloss]
+    [gloss.core.formats :refer [to-buf-seq]]
+    [gloss.core.protocols :refer [Reader Writer]]))
 
 (declare protobuf-codec)
 

From 14f15b1c9c0b1d8483929e3d07ff5b0274359540 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 15:40:49 -0600
Subject: [PATCH 368/525] Added codox-generated docs.

---
 .gitignore                                 |   1 -
 docs/current/css/default.css               | 638 +++++++++++++++++++++
 docs/current/flatland.protobuf.codec.html  |   3 +
 docs/current/flatland.protobuf.core.html   |   3 +
 docs/current/flatland.protobuf.schema.html |   3 +
 docs/current/highlight/atom-one-dark.css   |  96 ++++
 docs/current/highlight/highlight.min.js    |   2 +
 docs/current/highlight/highlight.pack.js   |   2 +
 docs/current/highlight/solarized-light.css |  84 +++
 docs/current/index.html                    |   3 +
 docs/current/js/jquery.min.js              |   4 +
 docs/current/js/page_effects.js            | 113 ++++
 docs/index.html                            |   2 +
 project.clj                                |  22 +-
 resources/docs/9999-other-versions.md      |   5 +
 15 files changed, 979 insertions(+), 2 deletions(-)
 create mode 100644 docs/current/css/default.css
 create mode 100644 docs/current/flatland.protobuf.codec.html
 create mode 100644 docs/current/flatland.protobuf.core.html
 create mode 100644 docs/current/flatland.protobuf.schema.html
 create mode 100644 docs/current/highlight/atom-one-dark.css
 create mode 100644 docs/current/highlight/highlight.min.js
 create mode 100644 docs/current/highlight/highlight.pack.js
 create mode 100644 docs/current/highlight/solarized-light.css
 create mode 100644 docs/current/index.html
 create mode 100644 docs/current/js/jquery.min.js
 create mode 100644 docs/current/js/page_effects.js
 create mode 100644 docs/index.html
 create mode 100644 resources/docs/9999-other-versions.md

diff --git a/.gitignore b/.gitignore
index 338a8b2..6c512bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ build
 pom.xml*
 *.jar
 *.class
-docs
 protobuf-*
 protosrc
 .classpath
diff --git a/docs/current/css/default.css b/docs/current/css/default.css
new file mode 100644
index 0000000..89df9b5
--- /dev/null
+++ b/docs/current/css/default.css
@@ -0,0 +1,638 @@
+@import url('https://fonts.googleapis.com/css?family=PT+Sans');
+
+body {
+    font-family: 'PT Sans', Helvetica, sans-serif;
+    font-size: 14px;
+}
+
+a {
+    color: #337ab7;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #30426a;
+    text-decoration: underline;
+}
+
+pre, code {
+    font-family: Monaco, DejaVu Sans Mono, Consolas, monospace;
+    font-size: 9pt;
+    margin: 15px 0;
+}
+
+h1 {
+    font-weight: normal;
+    font-size: 29px;
+    margin: 10px 0 2px 0;
+    padding: 0;
+}
+
+h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+h3 > a:hover {
+    text-decoration: none;
+}
+
+.document h1, .namespace-index h1 {
+    font-size: 32px;
+    margin-top: 12px;
+}
+
+#header, #content, .sidebar {
+    position: fixed;
+}
+
+#header {
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 22px;
+    color: #f5f5f5;
+    padding: 5px 7px;
+}
+
+#content {
+    top: 32px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    background: #eee;
+    color: #333;
+    padding: 0 18px;
+}
+
+.sidebar {
+    position: fixed;
+    top: 32px;
+    bottom: 0;
+    overflow: auto;
+    color: white;
+}
+
+.sidebar.primary {
+    background: #1f283b;
+    border-right: solid 1px #1f283b;
+    left: 0;
+    width: 250px;
+    font-size: 110%;
+}
+
+.sidebar.secondary {
+    background: #2a364f;
+    border-right: solid 1px #d7d7d7;
+    left: 251px;
+    width: 200px;
+    font-size: 110%;
+}
+
+#content.namespace-index, #content.document {
+    left: 251px;
+}
+
+#content.namespace-docs {
+    left: 452px;
+}
+
+#content.document {
+    padding-bottom: 10%;
+    left: 200px;
+}
+
+#header {
+    background: #58852b;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.4);
+    z-index: 100;
+}
+
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font-size: 18px;
+    font-weight: lighter;
+}
+
+#header h1 .project-version {
+    font-weight: normal;
+}
+
+.project-version {
+    padding-left: 0.15em;
+}
+
+#header a, .sidebar a {
+    display: block;
+    text-decoration: none;
+}
+
+#header a {
+    color: #f5f5f5;
+}
+
+.sidebar.primary, .sidebar.primary a,
+.sidebar.secondary, .sidebar.secondary a {
+    color: #b2bfdc;
+}
+
+.sidebar.primary a:hover, .sidebar.secondary a:hover {
+    color: white;
+}
+
+#header h2 {
+    float: right;
+    font-size: 9pt;
+    font-weight: normal;
+    margin: 4px 3px;
+    padding: 0;
+    color: #bbb;
+}
+
+#header h2 a {
+    display: inline;
+}
+
+.sidebar h3 {
+    margin: 0;
+    padding: 10px 13px 0 13px;
+    font-size: 19px;
+    font-weight: lighter;
+}
+
+.sidebar.primary h3.no-link, .sidebar.secondary h3 a {
+    text-transform: uppercase;
+    font-size: 12px;
+    color: #738bc0;
+}
+
+.sidebar ul {
+    padding: 7px 0 6px 0;
+    margin: 0;
+}
+
+.sidebar ul.index-link {
+    padding-bottom: 4px;
+}
+
+.sidebar li {
+    display: block;
+    vertical-align: middle;
+}
+
+.sidebar li a, .sidebar li .no-link {
+    border-left: 3px solid transparent;
+    padding: 0 10px;
+    white-space: nowrap;
+}
+
+.sidebar li .inner {
+    display: inline-block;
+    padding-top: 7px;
+    height: 24px;
+}
+
+.sidebar li a, .sidebar li .tree {
+    height: 31px;
+}
+
+.depth-1 .inner { padding-left: 2px; }
+.depth-2 .inner { padding-left: 6px; }
+.depth-3 .inner { padding-left: 20px; }
+.depth-4 .inner { padding-left: 34px; }
+.depth-5 .inner { padding-left: 48px; }
+.depth-6 .inner { padding-left: 62px; }
+.depth-7 .inner { padding-left: 76px; }
+.depth-8 .inner { padding-left: 90px; }
+
+.sidebar li .tree {
+    display: block;
+    float: left;
+    position: relative;
+    top: -10px;
+    margin: 0 4px 0 0;
+    padding: 0;
+}
+
+.sidebar li.depth-1 .tree {
+    display: none;
+}
+
+.sidebar li .tree .top, .sidebar li .tree .bottom {
+    display: block;
+    margin: 0;
+    padding: 0;
+    width: 7px;
+}
+
+.sidebar li .tree .top {
+    border-left: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    height: 19px;
+}
+
+.sidebar li .tree .bottom {
+    height: 22px;
+}
+
+.sidebar li.branch .tree .bottom {
+    border-left: 1px solid #aaa;
+}
+
+.sidebar.primary li.current a,
+.sidebar.secondary li.current a {
+    border-left: 3px solid #58852b;
+    color: white;
+}
+
+.namespace-index h2 {
+    margin: 30px 0 0 0;
+}
+
+.namespace-index h3 {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 0;
+    letter-spacing: 0.05em;
+    border-bottom: solid 1px #ddd;
+    max-width: 680px;
+    background-color: #fafafa;
+    padding: 0.5em;
+}
+
+.namespace-index .topics {
+    padding-left: 30px;
+    margin: 11px 0 0 0;
+}
+
+ul.topics {
+    list-style-type: none;
+}
+
+.namespace-index .topics li {
+    padding: 5px 0;
+}
+
+.namespace-docs h3 {
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.public h3 {
+    margin: 0;
+    float: left;
+}
+
+.usage {
+    clear: both;
+}
+
+.public {
+    margin: 0;
+    border-top: 1px solid #e0e0e0;
+    padding-top: 14px;
+    padding-bottom: 6px;
+}
+
+.public:last-child {
+    margin-bottom: 20%;
+}
+
+.members .public:last-child {
+    margin-bottom: 0;
+}
+
+.members {
+    margin: 15px 0;
+}
+
+.members h4 {
+    color: #555;
+    font-weight: normal;
+    font-variant: small-caps;
+    margin: 0 0 5px 0;
+}
+
+.members .inner {
+    padding-top: 5px;
+    padding-left: 12px;
+    margin-top: 2px;
+    margin-left: 7px;
+    border-left: 1px solid #bbb;
+}
+
+#content .members .inner h3 {
+    font-size: 12pt;
+}
+
+.members .public {
+    border-top: none;
+    margin-top: 0;
+    padding-top: 6px;
+    padding-bottom: 0;
+}
+
+.members .public:first-child {
+    padding-top: 0;
+}
+
+h4.type,
+h4.dynamic,
+h4.added,
+h4.deprecated {
+    float: left;
+    margin: 3px 10px 15px 0;
+    font-size: 15px;
+    font-weight: bold;
+    font-variant: small-caps;
+}
+
+.public h4.type,
+.public h4.dynamic,
+.public h4.added,
+.public h4.deprecated {
+    font-size: 13px;
+    font-weight: bold;
+    margin: 3px 0 0 10px;
+}
+
+.members h4.type,
+.members h4.added,
+.members h4.deprecated {
+    margin-top: 1px;
+}
+
+h4.type {
+    color: #717171;
+}
+
+h4.dynamic {
+    color: #9933aa;
+}
+
+h4.added {
+    color: #508820;
+}
+
+h4.deprecated {
+    color: #880000;
+}
+
+.namespace {
+    margin-bottom: 30px;
+}
+
+.namespace:last-child {
+    margin-bottom: 10%;
+}
+
+.index {
+    padding: 0;
+    font-size: 80%;
+    margin: 15px 0;
+    line-height: 1.6em;
+}
+
+.index * {
+    display: inline;
+}
+
+.index p {
+    padding-right: 3px;
+}
+
+.index li {
+    padding-right: 5px;
+}
+
+.index ul {
+    padding-left: 0;
+}
+
+.type-sig {
+    clear: both;
+    color: #088;
+}
+
+.type-sig pre {
+    padding-top: 10px;
+    margin: 0;
+}
+
+.usage code {
+    display: block;
+    color: #008;
+    margin: 2px 0;
+}
+
+.usage code:first-child {
+    padding-top: 10px;
+}
+
+p {
+    margin: 15px 0;
+}
+
+.public p:first-child, .public pre.plaintext {
+    margin-top: 12px;
+}
+
+.doc {
+    margin: 0 0 26px 0;
+    clear: both;
+}
+
+.public .doc {
+    margin: 0;
+}
+
+.namespace-index {
+  font-size: 120%;
+}
+
+.namespace-index .doc {
+    margin-bottom: 20px;
+}
+
+.namespace-index .namespace .doc {
+    margin-bottom: 10px;
+}
+
+.markdown p, .markdown li, .markdown dt, .markdown dd, .markdown td {
+    line-height: 1.6em;
+}
+
+.markdown h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+#content .markdown h3 {
+    font-size: 20px;
+}
+
+.markdown h4 {
+    font-size: 15px;
+}
+
+.doc, .public, .namespace .index {
+    max-width: 680px;
+    overflow-x: visible;
+}
+
+.markdown pre > code {
+    display: block;
+    padding: 10px;
+}
+
+.markdown pre > code, .src-link a {
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+}
+
+.src-link a {
+    background: #f6f6f6;
+}
+
+.markdown code:not(.hljs) {
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+    font-size: 90%;
+    padding: 2px 4px;
+}
+
+pre.deps {
+    display: inline-block;
+    margin: 0 10px;
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+    padding: 10px;
+    background-color: #f6f6f6;
+}
+
+.markdown hr {
+    border-style: solid;
+    border-top: none;
+    color: #ccc;
+}
+
+.doc ul, .doc ol {
+    padding-left: 30px;
+}
+
+.doc table {
+    border-collapse: collapse;
+    margin: 0 10px;
+}
+
+.doc table td, .doc table th {
+    border: 1px solid #dddddd;
+    padding: 4px 6px;
+}
+
+.doc table th {
+    background: #f2f2f2;
+}
+
+.doc dl {
+    margin: 0 10px 20px 10px;
+}
+
+.doc dl dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 3px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.doc dl dd {
+    padding: 5px 0;
+    margin: 0 0 5px 10px;
+}
+
+.doc abbr {
+    border-bottom: 1px dotted #333;
+    font-variant: none;
+    cursor: help;
+}
+
+.src-link {
+    margin-bottom: 15px;
+}
+
+.src-link a {
+    font-size: 70%;
+    padding: 1px 4px;
+    text-decoration: none;
+    color: #5555bb;
+    background-color: #f6f6f6;
+}
+
+blockquote {
+    opacity: 0.6;
+    border-left: solid 2px #ddd;
+    margin-left: 0;
+    padding-left: 1em;
+}
+
+/* Responsiveness Theme */
+
+@media (max-device-width: 480px) {
+  .sidebar {
+    display:none;
+  }
+
+  #content {
+    position: relative;
+    left: initial !important;
+    top: 110px;
+    padding: 1em 1em 0 1em;
+  }
+
+  #header {
+    display: flex;
+    flex-direction: column-reverse;
+    height: 100px;
+  }
+
+  #header > h1 {
+    font-size: 52px;
+  }
+
+  #header h2 {
+    float: none;
+    font-size: 20px;
+  }
+
+  .namespace-index > h1 {
+    display: none;
+  }
+
+  .public, .doc, .namespace > .index, .namespace > .doc, .namespace > h3 {
+    max-width: initial;
+  }
+
+  .doc {
+    text-align: justify;
+  }
+
+  .public {
+    padding-top: 2em;
+    padding-bottom: 2em;
+  }
+
+  .public > h3 {
+    font-size: 300%;
+  }
+
+  .public > h4.type, .public > h4.added, .public > h4.deprecated {
+    font-size: 150%;
+    margin-top: 1em;
+  }
+
+  pre > code {
+    font-size: 200%;
+  }
+}
diff --git a/docs/current/flatland.protobuf.codec.html b/docs/current/flatland.protobuf.codec.html
new file mode 100644
index 0000000..426bbab
--- /dev/null
+++ b/docs/current/flatland.protobuf.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.core.html b/docs/current/flatland.protobuf.core.html
new file mode 100644
index 0000000..558fda5
--- /dev/null
+++ b/docs/current/flatland.protobuf.core.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.schema.html b/docs/current/flatland.protobuf.schema.html
new file mode 100644
index 0000000..fbb54d4
--- /dev/null
+++ b/docs/current/flatland.protobuf.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/highlight/atom-one-dark.css b/docs/current/highlight/atom-one-dark.css
new file mode 100644
index 0000000..1616aaf
--- /dev/null
+++ b/docs/current/highlight/atom-one-dark.css
@@ -0,0 +1,96 @@
+/*
+
+Atom One Dark by Daniel Gamage
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+base:    #282c34
+mono-1:  #abb2bf
+mono-2:  #818896
+mono-3:  #5c6370
+hue-1:   #56b6c2
+hue-2:   #61aeee
+hue-3:   #c678dd
+hue-4:   #98c379
+hue-5:   #e06c75
+hue-5-2: #be5046
+hue-6:   #d19a66
+hue-6-2: #e6c07b
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #abb2bf;
+  background: #282c34;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #5c6370;
+  font-style: italic;
+}
+
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #c678dd;
+}
+
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
+.hljs-subst {
+  color: #e06c75;
+}
+
+.hljs-literal {
+  color: #56b6c2;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #98c379;
+}
+
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #e6c07b;
+}
+
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #d19a66;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-title {
+  color: #61aeee;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/docs/current/highlight/highlight.min.js b/docs/current/highlight/highlight.min.js
new file mode 100644
index 0000000..6486ffd
--- /dev/null
+++ b/docs/current/highlight/highlight.min.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.6.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/[&<>]/gm,function(e){return I[e]})}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return R(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||R(i))return i}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}l+="<"+t(e)+w.map.call(e.attributes,r).join("")+">"}function u(e){l+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):E(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"===e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function h(e,n,t,r){var a=r?"":y.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function p(){var e,t,r,a;if(!E.k)return n(B);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(B);r;)a+=n(B.substr(t,r.index-t)),e=g(E,r),e?(M+=e[1],a+=h(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(B);return a+n(B.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!x[E.sL])return n(B);var t=e?l(E.sL,B,!0,L[E.sL]):f(B,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(L[E.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){k+=null!=E.sL?d():p(),B=""}function v(e){k+=e.cN?h(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(B+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?B+=n:(t.eB&&(B+=n),b(),t.rB||t.eB||(B=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?B+=n:(a.rE||a.eE||(B+=n),b(),a.eE&&(B=n));do E.cN&&(k+=C),E.skip||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return B+=n,n.length||1}var N=R(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var w,E=i||N,L={},k="";for(w=E;w!==N;w=w.parent)w.cN&&(k=h(w.cN,"",!0)+k);var B="",M=0;try{for(var I,j,O=0;;){if(E.t.lastIndex=O,I=E.t.exec(t),!I)break;j=m(t.substr(O,I.index-O),I[0]),O=I.index+j}for(m(t.substr(O)),w=E;w.parent;w=w.parent)w.cN&&(k+=C);return{r:M,value:k,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function f(e,t){t=t||y.languages||E(x);var r={r:0,value:n(e)},a=r;return t.filter(R).forEach(function(n){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return y.tabReplace||y.useBR?e.replace(M,function(e,n){return y.useBR&&"\n"===e?"<br>":y.tabReplace?n.replace(/\t/g,y.tabReplace):void 0}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n,t,r,o,s,p=i(e);a(p)||(y.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=p?l(p,s,!0):f(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=g(r.value),e.innerHTML=r.value,e.className=h(e.className,p,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function d(e){y=o(y,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");w.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function N(){return E(x)}function R(e){return e=(e||"").toLowerCase(),x[e]||x[L[e]]}var w=[],E=Object.keys,x={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",y={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},I={"&":"&amp;","<":"&lt;",">":"&gt;"};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=R,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});
\ No newline at end of file
diff --git a/docs/current/highlight/highlight.pack.js b/docs/current/highlight/highlight.pack.js
new file mode 100644
index 0000000..126e338
--- /dev/null
+++ b/docs/current/highlight/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.11.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]\n/,sL:"bash"}}],i:"</"}});hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"meta",b:"^#!",e:"$"},l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},i=b.inherit(b.QSM,{i:null}),t=b.C(";","$",{r:0}),s={b:"\\*",e:"\\*"},u={cN:"symbol",b:"[:&]"+e},d={b:e,r:0},f={b:c},m={b:"\\(",e:"\\)",c:["self",l,i,n,d]},o={c:[n,i,s,u,m,d],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},v={v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},N={b:"\\(\\s*",e:"\\)"},A={eW:!0,r:0};return N.c=[{cN:"name",v:[{b:e},{b:c}]},A],A.c=[o,v,N,l,n,i,t,s,u,f,d],{i:/\S/,c:[n,a,l,i,t,o,v,N,d]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(i,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[a,e.HCM,l,i,{cN:"symbol",b:":(?!\\s)",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:b,c:s}});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});
\ No newline at end of file
diff --git a/docs/current/highlight/solarized-light.css b/docs/current/highlight/solarized-light.css
new file mode 100644
index 0000000..fdcfcc7
--- /dev/null
+++ b/docs/current/highlight/solarized-light.css
@@ -0,0 +1,84 @@
+/*
+
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #fdf6e3;
+  color: #657b83;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #93a1a1;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #eee8d5;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/docs/current/index.html b/docs/current/index.html
new file mode 100644
index 0000000..298162c
--- /dev/null
+++ b/docs/current/index.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf 3.4.0-v0.3-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"]</pre><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/js/jquery.min.js b/docs/current/js/jquery.min.js
new file mode 100644
index 0000000..73f33fb
--- /dev/null
+++ b/docs/current/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/docs/current/js/page_effects.js b/docs/current/js/page_effects.js
new file mode 100644
index 0000000..7ba93bf
--- /dev/null
+++ b/docs/current/js/page_effects.js
@@ -0,0 +1,113 @@
+function visibleInParent(element) {
+    var position = $(element).position().top
+    return position > -50 && position < ($(element).offsetParent().height() - 50)
+}
+
+function hasFragment(link, fragment) {
+    return $(link).attr("href").indexOf("#" + fragment) != -1
+}
+
+function findLinkByFragment(elements, fragment) {
+    return $(elements).filter(function(i, e) { return hasFragment(e, fragment)}).first()
+}
+
+function scrollToCurrentVarLink(elements) {
+    var elements = $(elements);
+    var parent   = elements.offsetParent();
+
+    if (elements.length == 0) return;
+
+    var top    = elements.first().position().top;
+    var bottom = elements.last().position().top + elements.last().height();
+
+    if (top >= 0 && bottom <= parent.height()) return;
+
+    if (top < 0) {
+        parent.scrollTop(parent.scrollTop() + top);
+    }
+    else if (bottom > parent.height()) {
+        parent.scrollTop(parent.scrollTop() + bottom - parent.height());
+    }
+}
+
+function setCurrentVarLink() {
+    $('.secondary a').parent().removeClass('current')
+    $('.anchor').
+        filter(function(index) { return visibleInParent(this) }).
+        each(function(index, element) {
+            findLinkByFragment(".secondary a", element.id).
+                parent().
+                addClass('current')
+        });
+    scrollToCurrentVarLink('.secondary .current');
+}
+
+var hasStorage = (function() { try { return localStorage.getItem } catch(e) {} }())
+
+function scrollPositionId(element) {
+    var directory = window.location.href.replace(/[^\/]+\.html$/, '')
+    return 'scroll::' + $(element).attr('id') + '::' + directory
+}
+
+function storeScrollPosition(element) {
+    if (!hasStorage) return;
+    localStorage.setItem(scrollPositionId(element) + "::x", $(element).scrollLeft())
+    localStorage.setItem(scrollPositionId(element) + "::y", $(element).scrollTop())
+}
+
+function recallScrollPosition(element) {
+    if (!hasStorage) return;
+    $(element).scrollLeft(localStorage.getItem(scrollPositionId(element) + "::x"))
+    $(element).scrollTop(localStorage.getItem(scrollPositionId(element) + "::y"))
+}
+
+function persistScrollPosition(element) {
+    recallScrollPosition(element)
+    $(element).scroll(function() { storeScrollPosition(element) })
+}
+
+function sidebarContentWidth(element) {
+    var widths = $(element).find('.inner').map(function() { return $(this).innerWidth() })
+    return Math.max.apply(Math, widths)
+}
+
+function calculateSize(width, snap, margin, minimum) {
+    if (width == 0) {
+        return 0
+    }
+    else {
+        return Math.max(minimum, (Math.ceil(width / snap) * snap) + (margin * 2))
+    }
+}
+
+function resizeSidebars() {
+    var primaryWidth   = sidebarContentWidth('.primary')
+    var secondaryWidth = 0
+
+    if ($('.secondary').length != 0) {
+        secondaryWidth = sidebarContentWidth('.secondary')
+    }
+
+    // snap to grid
+    primaryWidth   = calculateSize(primaryWidth, 32, 13, 160)
+    secondaryWidth = calculateSize(secondaryWidth, 32, 13, 160)
+
+    $('.primary').css('width', primaryWidth)
+    $('.secondary').css('width', secondaryWidth).css('left', primaryWidth + 1)
+
+    if (secondaryWidth > 0) {
+        $('#content').css('left', primaryWidth + secondaryWidth + 2)
+    }
+    else {
+        $('#content').css('left', primaryWidth + 1)
+    }
+}
+
+$(window).ready(resizeSidebars)
+$(window).ready(setCurrentVarLink)
+$(window).ready(function() { persistScrollPosition('.primary')})
+$(window).ready(function() {
+    $('#content').scroll(setCurrentVarLink)
+    $(window).resize(setCurrentVarLink)
+    $(window).resize(resizeSidebars)
+})
diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 0000000..cbccb08
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,2 @@
+<meta http-equiv="refresh" content="0; url=http://clojusc.github.io/protobuf/current/">
+<link rel="canonical" href="http://clojusc.github.io/protobuf/current/" />
diff --git a/project.clj b/project.clj
index bc539c2..a9ae574 100644
--- a/project.clj
+++ b/project.clj
@@ -27,7 +27,23 @@
     :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
     :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
     :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
-    :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
+    :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
+    :docs {
+      :dependencies [
+        [clojang/codox-theme "0.2.0-SNAPSHOT"]]
+      :plugins [
+        [lein-codox "0.10.3"]]
+      :codox {
+        :project {
+          :name "protobuf"
+          :description "A Clojure interface to Google's protocol buffers"}
+        :namespaces [#"^flatland\.protobuf\.(?!dev)"]
+        :metadata {
+          :doc/format :markdown
+          :doc "Documentation forthcoming"}
+        :themes [:clojang]
+        :doc-paths ["resources/docs"]
+        :output-path "docs/current"}}}
   :aliases {
     "protoc-test" [
        "with-profile"
@@ -45,6 +61,10 @@
       "+test"
       "eastwood"
       "{:namespaces [:source-paths] :source-paths [\"src\"]}"]
+    "docs" [
+      "with-profile"
+      "+docs"
+      "codox"]
     "test-all" [
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"
diff --git a/resources/docs/9999-other-versions.md b/resources/docs/9999-other-versions.md
new file mode 100644
index 0000000..32410f9
--- /dev/null
+++ b/resources/docs/9999-other-versions.md
@@ -0,0 +1,5 @@
+# Other Versions
+
+### API Reference
+
+* [Development](../current)

From 7e2f93d400a9d70ad27568f0cfe4d329d94b6a77 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 15:48:08 -0600
Subject: [PATCH 369/525] Updated README.

---
 README.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e150c95..20b2bbb 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,22 @@
-clojure-protobuf provides a Clojure interface to Google's [protocol buffers](http://code.google.com/p/protobuf).
-Protocol buffers can be used to communicate with other languages over the network, and they are WAY faster to serialize and deserialize than standard Clojure objects.
+# protobuf
+
+[![Build Status][travis-badge]][travis][![Clojars Project][clojars-badge]][clojars][![Clojure version][clojure-v]](project.clj)
+
+*A Clojure interface to Google's protocol buffers*
+
+This project provides a Clojure interface to Google's
+[protocol buffers](http://code.google.com/p/protobuf). Protocol buffers can be
+used to communicate with other languages over the network, and they are WAY
+faster to serialize and deserialize than standard Clojure objects.
+
 
 ## Getting started
 
 Add the dependency to your project.clj
 
-[![Clojars Project](https://img.shields.io/clojars/v/org.clojars.ghaskins/protobuf.svg)](https://clojars.org/org.clojars.ghaskins/protobuf)
+[![Clojars Project][clojars-badge]][clojars]
 
-Assuming you have the following in `resources/proto/person.proto`:
+Then, given a project with the following in `resources/proto/your/namespace/person.proto`:
 
 ```proto
 message Person {
@@ -18,14 +27,34 @@ message Person {
 }
 ```
 
-Compile the proto using the protobuf compiler and include the resulting .java code in your project
+you can compile the proto using the protobuf compiler and include the resulting
+`.java` code in your project:
+
+```shell
+protoc \
+  -I=/usr/include \
+  -I=/usr/local/include \
+  -I=resources/proto \
+  --java_out=$OUT_DIR \
+  resources/proto/your/namespace/*.proto
+```
+
+Note that, at this point, the files are `.java` source files, not `.class`
+files; as such, you will still need to compile them.
+
+We've found a clean way to do this (and how we set up the tests) is to:
+
+* put these `.java` files in an isolated directory
+* add that directory to a `:java-source-paths` entry in the `project.clj`
+* place that in an appropriate `project.clj` profile
 
-    protoc --java_out=./ -proto_dir=resources/proto person.proto
+
+## Usage
 
 Now you can use the protocol buffer in Clojure:
 
 ```clojure
-(use 'flatland.protobuf.core)
+(require '[flatland.protobuf.core :refer :all])
 (import Example$Person)
 
 (def Person (protodef Example$Person))
@@ -46,6 +75,21 @@ Now you can use the protocol buffer in Clojure:
 => {:id 4, :name "Bob", :email "bob@example.com"}
 ```
 
-A protocol buffer map is immutable just like other clojure objects. It is similar to a
-struct-map, except you cannot insert fields that aren't specified in the `.proto` file.
+A protocol buffer map is immutable just like other clojure objects. It is
+similar to a struct-map, except you cannot insert fields that aren't specified
+in the `.proto` file.
+
+
+<!-- Named page links below: /-->
 
+[travis]: https://travis-ci.org/clojusc/protobuf
+[travis-badge]: https://travis-ci.org/clojusc/protobuf.png?branch=master
+[deps]: http://jarkeeper.com/clojusc/protobuf
+[deps-badge]: http://jarkeeper.com/clojusc/protobuf/status.svg
+[logo]: resources/images/Meson-nonet-spin-0-250x.png
+[logo-large]: resources/images/Meson-nonet-spin-0-1000x.png
+[tag-badge]: https://img.shields.io/github/tag/clojusc/protobuf.svg
+[tag]: https://github.com/clojusc/protobuf/tags
+[clojure-v]: https://img.shields.io/badge/clojure-1.8.0-blue.svg
+[clojars]: https://clojars.org/clojusc/protobuf
+[clojars-badge]: https://img.shields.io/clojars/v/clojusc/protobuf.svg

From 4cf05bfd7277414529e27e00697d489581753ed4 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 16:08:26 -0600
Subject: [PATCH 370/525] Updated docs.

---
 docs/current/9999-other-versions.html      | 7 +++++++
 docs/current/flatland.protobuf.codec.html  | 2 +-
 docs/current/flatland.protobuf.core.html   | 2 +-
 docs/current/flatland.protobuf.schema.html | 2 +-
 docs/current/index.html                    | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 docs/current/9999-other-versions.html

diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
new file mode 100644
index 0000000..07eb6bc
--- /dev/null
+++ b/docs/current/9999-other-versions.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
+<ul>
+  <li><a href="../current">Development</a></li>
+</ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.codec.html b/docs/current/flatland.protobuf.codec.html
index 426bbab..c2e0e58 100644
--- a/docs/current/flatland.protobuf.codec.html
+++ b/docs/current/flatland.protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.core.html b/docs/current/flatland.protobuf.core.html
index 558fda5..be1c25b 100644
--- a/docs/current/flatland.protobuf.core.html
+++ b/docs/current/flatland.protobuf.core.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.schema.html b/docs/current/flatland.protobuf.schema.html
index fbb54d4..9008b74 100644
--- a/docs/current/flatland.protobuf.schema.html
+++ b/docs/current/flatland.protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/index.html b/docs/current/index.html
index 298162c..23d97c7 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.4.0-v0.3-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"]</pre><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.4.0-v0.3-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file

From e8b5ee473d9a1b2cdadcf62c51646336f35a6d62 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 16:12:57 -0600
Subject: [PATCH 371/525] Release v0.3.

---
 project.clj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index a9ae574..a347a65 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"
+(defproject clojusc/protobuf "3.4.0-v0.3"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {
@@ -17,8 +17,6 @@
   :java-source-paths ["src"]
   :profiles {
     :test {
-      :dependencies [
-        [clojusc/ltest "0.3.0-SNAPSHOT"]]
       :plugins [
         [jonase/eastwood "0.2.5"]
         [lein-ancient "0.6.15"]

From 9caedd4d4c23d1175a528c057672336bc007ad10 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 16:18:13 -0600
Subject: [PATCH 372/525] Bumped for current release of protocol buffers.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index a347a65..8ebcce8 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.4.0-v0.3"
+(defproject clojusc/protobuf "3.5.1-v0.3"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {

From 301566054acbd6479c32448c9be6f8e159517c69 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 16:18:45 -0600
Subject: [PATCH 373/525] Generated docs for release.

---
 docs/3.5.1-v0.3/9999-other-versions.html      |   8 +
 docs/3.5.1-v0.3/css/default.css               | 638 ++++++++++++++++++
 docs/3.5.1-v0.3/flatland.protobuf.codec.html  |   3 +
 docs/3.5.1-v0.3/flatland.protobuf.core.html   |   3 +
 docs/3.5.1-v0.3/flatland.protobuf.schema.html |   3 +
 docs/3.5.1-v0.3/highlight/atom-one-dark.css   |  96 +++
 docs/3.5.1-v0.3/highlight/highlight.min.js    |   2 +
 docs/3.5.1-v0.3/highlight/highlight.pack.js   |   2 +
 docs/3.5.1-v0.3/highlight/solarized-light.css |  84 +++
 docs/3.5.1-v0.3/index.html                    |   3 +
 docs/3.5.1-v0.3/js/jquery.min.js              |   4 +
 docs/3.5.1-v0.3/js/page_effects.js            | 113 ++++
 docs/current/9999-other-versions.html         |   3 +-
 docs/current/flatland.protobuf.codec.html     |   2 +-
 docs/current/flatland.protobuf.core.html      |   2 +-
 docs/current/flatland.protobuf.schema.html    |   2 +-
 docs/current/index.html                       |   2 +-
 resources/docs/9999-other-versions.md         |   1 +
 18 files changed, 966 insertions(+), 5 deletions(-)
 create mode 100644 docs/3.5.1-v0.3/9999-other-versions.html
 create mode 100644 docs/3.5.1-v0.3/css/default.css
 create mode 100644 docs/3.5.1-v0.3/flatland.protobuf.codec.html
 create mode 100644 docs/3.5.1-v0.3/flatland.protobuf.core.html
 create mode 100644 docs/3.5.1-v0.3/flatland.protobuf.schema.html
 create mode 100644 docs/3.5.1-v0.3/highlight/atom-one-dark.css
 create mode 100644 docs/3.5.1-v0.3/highlight/highlight.min.js
 create mode 100644 docs/3.5.1-v0.3/highlight/highlight.pack.js
 create mode 100644 docs/3.5.1-v0.3/highlight/solarized-light.css
 create mode 100644 docs/3.5.1-v0.3/index.html
 create mode 100644 docs/3.5.1-v0.3/js/jquery.min.js
 create mode 100644 docs/3.5.1-v0.3/js/page_effects.js

diff --git a/docs/3.5.1-v0.3/9999-other-versions.html b/docs/3.5.1-v0.3/9999-other-versions.html
new file mode 100644
index 0000000..97b06a0
--- /dev/null
+++ b/docs/3.5.1-v0.3/9999-other-versions.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
+<ul>
+  <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
+</ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/css/default.css b/docs/3.5.1-v0.3/css/default.css
new file mode 100644
index 0000000..89df9b5
--- /dev/null
+++ b/docs/3.5.1-v0.3/css/default.css
@@ -0,0 +1,638 @@
+@import url('https://fonts.googleapis.com/css?family=PT+Sans');
+
+body {
+    font-family: 'PT Sans', Helvetica, sans-serif;
+    font-size: 14px;
+}
+
+a {
+    color: #337ab7;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #30426a;
+    text-decoration: underline;
+}
+
+pre, code {
+    font-family: Monaco, DejaVu Sans Mono, Consolas, monospace;
+    font-size: 9pt;
+    margin: 15px 0;
+}
+
+h1 {
+    font-weight: normal;
+    font-size: 29px;
+    margin: 10px 0 2px 0;
+    padding: 0;
+}
+
+h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+h3 > a:hover {
+    text-decoration: none;
+}
+
+.document h1, .namespace-index h1 {
+    font-size: 32px;
+    margin-top: 12px;
+}
+
+#header, #content, .sidebar {
+    position: fixed;
+}
+
+#header {
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 22px;
+    color: #f5f5f5;
+    padding: 5px 7px;
+}
+
+#content {
+    top: 32px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    background: #eee;
+    color: #333;
+    padding: 0 18px;
+}
+
+.sidebar {
+    position: fixed;
+    top: 32px;
+    bottom: 0;
+    overflow: auto;
+    color: white;
+}
+
+.sidebar.primary {
+    background: #1f283b;
+    border-right: solid 1px #1f283b;
+    left: 0;
+    width: 250px;
+    font-size: 110%;
+}
+
+.sidebar.secondary {
+    background: #2a364f;
+    border-right: solid 1px #d7d7d7;
+    left: 251px;
+    width: 200px;
+    font-size: 110%;
+}
+
+#content.namespace-index, #content.document {
+    left: 251px;
+}
+
+#content.namespace-docs {
+    left: 452px;
+}
+
+#content.document {
+    padding-bottom: 10%;
+    left: 200px;
+}
+
+#header {
+    background: #58852b;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.4);
+    z-index: 100;
+}
+
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font-size: 18px;
+    font-weight: lighter;
+}
+
+#header h1 .project-version {
+    font-weight: normal;
+}
+
+.project-version {
+    padding-left: 0.15em;
+}
+
+#header a, .sidebar a {
+    display: block;
+    text-decoration: none;
+}
+
+#header a {
+    color: #f5f5f5;
+}
+
+.sidebar.primary, .sidebar.primary a,
+.sidebar.secondary, .sidebar.secondary a {
+    color: #b2bfdc;
+}
+
+.sidebar.primary a:hover, .sidebar.secondary a:hover {
+    color: white;
+}
+
+#header h2 {
+    float: right;
+    font-size: 9pt;
+    font-weight: normal;
+    margin: 4px 3px;
+    padding: 0;
+    color: #bbb;
+}
+
+#header h2 a {
+    display: inline;
+}
+
+.sidebar h3 {
+    margin: 0;
+    padding: 10px 13px 0 13px;
+    font-size: 19px;
+    font-weight: lighter;
+}
+
+.sidebar.primary h3.no-link, .sidebar.secondary h3 a {
+    text-transform: uppercase;
+    font-size: 12px;
+    color: #738bc0;
+}
+
+.sidebar ul {
+    padding: 7px 0 6px 0;
+    margin: 0;
+}
+
+.sidebar ul.index-link {
+    padding-bottom: 4px;
+}
+
+.sidebar li {
+    display: block;
+    vertical-align: middle;
+}
+
+.sidebar li a, .sidebar li .no-link {
+    border-left: 3px solid transparent;
+    padding: 0 10px;
+    white-space: nowrap;
+}
+
+.sidebar li .inner {
+    display: inline-block;
+    padding-top: 7px;
+    height: 24px;
+}
+
+.sidebar li a, .sidebar li .tree {
+    height: 31px;
+}
+
+.depth-1 .inner { padding-left: 2px; }
+.depth-2 .inner { padding-left: 6px; }
+.depth-3 .inner { padding-left: 20px; }
+.depth-4 .inner { padding-left: 34px; }
+.depth-5 .inner { padding-left: 48px; }
+.depth-6 .inner { padding-left: 62px; }
+.depth-7 .inner { padding-left: 76px; }
+.depth-8 .inner { padding-left: 90px; }
+
+.sidebar li .tree {
+    display: block;
+    float: left;
+    position: relative;
+    top: -10px;
+    margin: 0 4px 0 0;
+    padding: 0;
+}
+
+.sidebar li.depth-1 .tree {
+    display: none;
+}
+
+.sidebar li .tree .top, .sidebar li .tree .bottom {
+    display: block;
+    margin: 0;
+    padding: 0;
+    width: 7px;
+}
+
+.sidebar li .tree .top {
+    border-left: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    height: 19px;
+}
+
+.sidebar li .tree .bottom {
+    height: 22px;
+}
+
+.sidebar li.branch .tree .bottom {
+    border-left: 1px solid #aaa;
+}
+
+.sidebar.primary li.current a,
+.sidebar.secondary li.current a {
+    border-left: 3px solid #58852b;
+    color: white;
+}
+
+.namespace-index h2 {
+    margin: 30px 0 0 0;
+}
+
+.namespace-index h3 {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 0;
+    letter-spacing: 0.05em;
+    border-bottom: solid 1px #ddd;
+    max-width: 680px;
+    background-color: #fafafa;
+    padding: 0.5em;
+}
+
+.namespace-index .topics {
+    padding-left: 30px;
+    margin: 11px 0 0 0;
+}
+
+ul.topics {
+    list-style-type: none;
+}
+
+.namespace-index .topics li {
+    padding: 5px 0;
+}
+
+.namespace-docs h3 {
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.public h3 {
+    margin: 0;
+    float: left;
+}
+
+.usage {
+    clear: both;
+}
+
+.public {
+    margin: 0;
+    border-top: 1px solid #e0e0e0;
+    padding-top: 14px;
+    padding-bottom: 6px;
+}
+
+.public:last-child {
+    margin-bottom: 20%;
+}
+
+.members .public:last-child {
+    margin-bottom: 0;
+}
+
+.members {
+    margin: 15px 0;
+}
+
+.members h4 {
+    color: #555;
+    font-weight: normal;
+    font-variant: small-caps;
+    margin: 0 0 5px 0;
+}
+
+.members .inner {
+    padding-top: 5px;
+    padding-left: 12px;
+    margin-top: 2px;
+    margin-left: 7px;
+    border-left: 1px solid #bbb;
+}
+
+#content .members .inner h3 {
+    font-size: 12pt;
+}
+
+.members .public {
+    border-top: none;
+    margin-top: 0;
+    padding-top: 6px;
+    padding-bottom: 0;
+}
+
+.members .public:first-child {
+    padding-top: 0;
+}
+
+h4.type,
+h4.dynamic,
+h4.added,
+h4.deprecated {
+    float: left;
+    margin: 3px 10px 15px 0;
+    font-size: 15px;
+    font-weight: bold;
+    font-variant: small-caps;
+}
+
+.public h4.type,
+.public h4.dynamic,
+.public h4.added,
+.public h4.deprecated {
+    font-size: 13px;
+    font-weight: bold;
+    margin: 3px 0 0 10px;
+}
+
+.members h4.type,
+.members h4.added,
+.members h4.deprecated {
+    margin-top: 1px;
+}
+
+h4.type {
+    color: #717171;
+}
+
+h4.dynamic {
+    color: #9933aa;
+}
+
+h4.added {
+    color: #508820;
+}
+
+h4.deprecated {
+    color: #880000;
+}
+
+.namespace {
+    margin-bottom: 30px;
+}
+
+.namespace:last-child {
+    margin-bottom: 10%;
+}
+
+.index {
+    padding: 0;
+    font-size: 80%;
+    margin: 15px 0;
+    line-height: 1.6em;
+}
+
+.index * {
+    display: inline;
+}
+
+.index p {
+    padding-right: 3px;
+}
+
+.index li {
+    padding-right: 5px;
+}
+
+.index ul {
+    padding-left: 0;
+}
+
+.type-sig {
+    clear: both;
+    color: #088;
+}
+
+.type-sig pre {
+    padding-top: 10px;
+    margin: 0;
+}
+
+.usage code {
+    display: block;
+    color: #008;
+    margin: 2px 0;
+}
+
+.usage code:first-child {
+    padding-top: 10px;
+}
+
+p {
+    margin: 15px 0;
+}
+
+.public p:first-child, .public pre.plaintext {
+    margin-top: 12px;
+}
+
+.doc {
+    margin: 0 0 26px 0;
+    clear: both;
+}
+
+.public .doc {
+    margin: 0;
+}
+
+.namespace-index {
+  font-size: 120%;
+}
+
+.namespace-index .doc {
+    margin-bottom: 20px;
+}
+
+.namespace-index .namespace .doc {
+    margin-bottom: 10px;
+}
+
+.markdown p, .markdown li, .markdown dt, .markdown dd, .markdown td {
+    line-height: 1.6em;
+}
+
+.markdown h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+#content .markdown h3 {
+    font-size: 20px;
+}
+
+.markdown h4 {
+    font-size: 15px;
+}
+
+.doc, .public, .namespace .index {
+    max-width: 680px;
+    overflow-x: visible;
+}
+
+.markdown pre > code {
+    display: block;
+    padding: 10px;
+}
+
+.markdown pre > code, .src-link a {
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+}
+
+.src-link a {
+    background: #f6f6f6;
+}
+
+.markdown code:not(.hljs) {
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+    font-size: 90%;
+    padding: 2px 4px;
+}
+
+pre.deps {
+    display: inline-block;
+    margin: 0 10px;
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+    padding: 10px;
+    background-color: #f6f6f6;
+}
+
+.markdown hr {
+    border-style: solid;
+    border-top: none;
+    color: #ccc;
+}
+
+.doc ul, .doc ol {
+    padding-left: 30px;
+}
+
+.doc table {
+    border-collapse: collapse;
+    margin: 0 10px;
+}
+
+.doc table td, .doc table th {
+    border: 1px solid #dddddd;
+    padding: 4px 6px;
+}
+
+.doc table th {
+    background: #f2f2f2;
+}
+
+.doc dl {
+    margin: 0 10px 20px 10px;
+}
+
+.doc dl dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 3px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.doc dl dd {
+    padding: 5px 0;
+    margin: 0 0 5px 10px;
+}
+
+.doc abbr {
+    border-bottom: 1px dotted #333;
+    font-variant: none;
+    cursor: help;
+}
+
+.src-link {
+    margin-bottom: 15px;
+}
+
+.src-link a {
+    font-size: 70%;
+    padding: 1px 4px;
+    text-decoration: none;
+    color: #5555bb;
+    background-color: #f6f6f6;
+}
+
+blockquote {
+    opacity: 0.6;
+    border-left: solid 2px #ddd;
+    margin-left: 0;
+    padding-left: 1em;
+}
+
+/* Responsiveness Theme */
+
+@media (max-device-width: 480px) {
+  .sidebar {
+    display:none;
+  }
+
+  #content {
+    position: relative;
+    left: initial !important;
+    top: 110px;
+    padding: 1em 1em 0 1em;
+  }
+
+  #header {
+    display: flex;
+    flex-direction: column-reverse;
+    height: 100px;
+  }
+
+  #header > h1 {
+    font-size: 52px;
+  }
+
+  #header h2 {
+    float: none;
+    font-size: 20px;
+  }
+
+  .namespace-index > h1 {
+    display: none;
+  }
+
+  .public, .doc, .namespace > .index, .namespace > .doc, .namespace > h3 {
+    max-width: initial;
+  }
+
+  .doc {
+    text-align: justify;
+  }
+
+  .public {
+    padding-top: 2em;
+    padding-bottom: 2em;
+  }
+
+  .public > h3 {
+    font-size: 300%;
+  }
+
+  .public > h4.type, .public > h4.added, .public > h4.deprecated {
+    font-size: 150%;
+    margin-top: 1em;
+  }
+
+  pre > code {
+    font-size: 200%;
+  }
+}
diff --git a/docs/3.5.1-v0.3/flatland.protobuf.codec.html b/docs/3.5.1-v0.3/flatland.protobuf.codec.html
new file mode 100644
index 0000000..e8b471d
--- /dev/null
+++ b/docs/3.5.1-v0.3/flatland.protobuf.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/flatland.protobuf.core.html b/docs/3.5.1-v0.3/flatland.protobuf.core.html
new file mode 100644
index 0000000..7542d6b
--- /dev/null
+++ b/docs/3.5.1-v0.3/flatland.protobuf.core.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/flatland.protobuf.schema.html b/docs/3.5.1-v0.3/flatland.protobuf.schema.html
new file mode 100644
index 0000000..b0b5db3
--- /dev/null
+++ b/docs/3.5.1-v0.3/flatland.protobuf.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/highlight/atom-one-dark.css b/docs/3.5.1-v0.3/highlight/atom-one-dark.css
new file mode 100644
index 0000000..1616aaf
--- /dev/null
+++ b/docs/3.5.1-v0.3/highlight/atom-one-dark.css
@@ -0,0 +1,96 @@
+/*
+
+Atom One Dark by Daniel Gamage
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+base:    #282c34
+mono-1:  #abb2bf
+mono-2:  #818896
+mono-3:  #5c6370
+hue-1:   #56b6c2
+hue-2:   #61aeee
+hue-3:   #c678dd
+hue-4:   #98c379
+hue-5:   #e06c75
+hue-5-2: #be5046
+hue-6:   #d19a66
+hue-6-2: #e6c07b
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #abb2bf;
+  background: #282c34;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #5c6370;
+  font-style: italic;
+}
+
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #c678dd;
+}
+
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
+.hljs-subst {
+  color: #e06c75;
+}
+
+.hljs-literal {
+  color: #56b6c2;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #98c379;
+}
+
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #e6c07b;
+}
+
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #d19a66;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-title {
+  color: #61aeee;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/docs/3.5.1-v0.3/highlight/highlight.min.js b/docs/3.5.1-v0.3/highlight/highlight.min.js
new file mode 100644
index 0000000..6486ffd
--- /dev/null
+++ b/docs/3.5.1-v0.3/highlight/highlight.min.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.6.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/[&<>]/gm,function(e){return I[e]})}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return R(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||R(i))return i}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}l+="<"+t(e)+w.map.call(e.attributes,r).join("")+">"}function u(e){l+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):E(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"===e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function h(e,n,t,r){var a=r?"":y.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function p(){var e,t,r,a;if(!E.k)return n(B);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(B);r;)a+=n(B.substr(t,r.index-t)),e=g(E,r),e?(M+=e[1],a+=h(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(B);return a+n(B.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!x[E.sL])return n(B);var t=e?l(E.sL,B,!0,L[E.sL]):f(B,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(L[E.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){k+=null!=E.sL?d():p(),B=""}function v(e){k+=e.cN?h(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(B+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?B+=n:(t.eB&&(B+=n),b(),t.rB||t.eB||(B=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?B+=n:(a.rE||a.eE||(B+=n),b(),a.eE&&(B=n));do E.cN&&(k+=C),E.skip||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return B+=n,n.length||1}var N=R(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var w,E=i||N,L={},k="";for(w=E;w!==N;w=w.parent)w.cN&&(k=h(w.cN,"",!0)+k);var B="",M=0;try{for(var I,j,O=0;;){if(E.t.lastIndex=O,I=E.t.exec(t),!I)break;j=m(t.substr(O,I.index-O),I[0]),O=I.index+j}for(m(t.substr(O)),w=E;w.parent;w=w.parent)w.cN&&(k+=C);return{r:M,value:k,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function f(e,t){t=t||y.languages||E(x);var r={r:0,value:n(e)},a=r;return t.filter(R).forEach(function(n){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return y.tabReplace||y.useBR?e.replace(M,function(e,n){return y.useBR&&"\n"===e?"<br>":y.tabReplace?n.replace(/\t/g,y.tabReplace):void 0}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n,t,r,o,s,p=i(e);a(p)||(y.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=p?l(p,s,!0):f(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=g(r.value),e.innerHTML=r.value,e.className=h(e.className,p,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function d(e){y=o(y,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");w.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function N(){return E(x)}function R(e){return e=(e||"").toLowerCase(),x[e]||x[L[e]]}var w=[],E=Object.keys,x={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",y={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},I={"&":"&amp;","<":"&lt;",">":"&gt;"};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=R,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/highlight/highlight.pack.js b/docs/3.5.1-v0.3/highlight/highlight.pack.js
new file mode 100644
index 0000000..126e338
--- /dev/null
+++ b/docs/3.5.1-v0.3/highlight/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.11.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]\n/,sL:"bash"}}],i:"</"}});hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"meta",b:"^#!",e:"$"},l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},i=b.inherit(b.QSM,{i:null}),t=b.C(";","$",{r:0}),s={b:"\\*",e:"\\*"},u={cN:"symbol",b:"[:&]"+e},d={b:e,r:0},f={b:c},m={b:"\\(",e:"\\)",c:["self",l,i,n,d]},o={c:[n,i,s,u,m,d],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},v={v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},N={b:"\\(\\s*",e:"\\)"},A={eW:!0,r:0};return N.c=[{cN:"name",v:[{b:e},{b:c}]},A],A.c=[o,v,N,l,n,i,t,s,u,f,d],{i:/\S/,c:[n,a,l,i,t,o,v,N,d]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(i,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[a,e.HCM,l,i,{cN:"symbol",b:":(?!\\s)",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:b,c:s}});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/highlight/solarized-light.css b/docs/3.5.1-v0.3/highlight/solarized-light.css
new file mode 100644
index 0000000..fdcfcc7
--- /dev/null
+++ b/docs/3.5.1-v0.3/highlight/solarized-light.css
@@ -0,0 +1,84 @@
+/*
+
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #fdf6e3;
+  color: #657b83;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #93a1a1;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #eee8d5;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/docs/3.5.1-v0.3/index.html b/docs/3.5.1-v0.3/index.html
new file mode 100644
index 0000000..afafd0d
--- /dev/null
+++ b/docs/3.5.1-v0.3/index.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v0.3</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v0.3"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v0.3/js/jquery.min.js b/docs/3.5.1-v0.3/js/jquery.min.js
new file mode 100644
index 0000000..73f33fb
--- /dev/null
+++ b/docs/3.5.1-v0.3/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/docs/3.5.1-v0.3/js/page_effects.js b/docs/3.5.1-v0.3/js/page_effects.js
new file mode 100644
index 0000000..7ba93bf
--- /dev/null
+++ b/docs/3.5.1-v0.3/js/page_effects.js
@@ -0,0 +1,113 @@
+function visibleInParent(element) {
+    var position = $(element).position().top
+    return position > -50 && position < ($(element).offsetParent().height() - 50)
+}
+
+function hasFragment(link, fragment) {
+    return $(link).attr("href").indexOf("#" + fragment) != -1
+}
+
+function findLinkByFragment(elements, fragment) {
+    return $(elements).filter(function(i, e) { return hasFragment(e, fragment)}).first()
+}
+
+function scrollToCurrentVarLink(elements) {
+    var elements = $(elements);
+    var parent   = elements.offsetParent();
+
+    if (elements.length == 0) return;
+
+    var top    = elements.first().position().top;
+    var bottom = elements.last().position().top + elements.last().height();
+
+    if (top >= 0 && bottom <= parent.height()) return;
+
+    if (top < 0) {
+        parent.scrollTop(parent.scrollTop() + top);
+    }
+    else if (bottom > parent.height()) {
+        parent.scrollTop(parent.scrollTop() + bottom - parent.height());
+    }
+}
+
+function setCurrentVarLink() {
+    $('.secondary a').parent().removeClass('current')
+    $('.anchor').
+        filter(function(index) { return visibleInParent(this) }).
+        each(function(index, element) {
+            findLinkByFragment(".secondary a", element.id).
+                parent().
+                addClass('current')
+        });
+    scrollToCurrentVarLink('.secondary .current');
+}
+
+var hasStorage = (function() { try { return localStorage.getItem } catch(e) {} }())
+
+function scrollPositionId(element) {
+    var directory = window.location.href.replace(/[^\/]+\.html$/, '')
+    return 'scroll::' + $(element).attr('id') + '::' + directory
+}
+
+function storeScrollPosition(element) {
+    if (!hasStorage) return;
+    localStorage.setItem(scrollPositionId(element) + "::x", $(element).scrollLeft())
+    localStorage.setItem(scrollPositionId(element) + "::y", $(element).scrollTop())
+}
+
+function recallScrollPosition(element) {
+    if (!hasStorage) return;
+    $(element).scrollLeft(localStorage.getItem(scrollPositionId(element) + "::x"))
+    $(element).scrollTop(localStorage.getItem(scrollPositionId(element) + "::y"))
+}
+
+function persistScrollPosition(element) {
+    recallScrollPosition(element)
+    $(element).scroll(function() { storeScrollPosition(element) })
+}
+
+function sidebarContentWidth(element) {
+    var widths = $(element).find('.inner').map(function() { return $(this).innerWidth() })
+    return Math.max.apply(Math, widths)
+}
+
+function calculateSize(width, snap, margin, minimum) {
+    if (width == 0) {
+        return 0
+    }
+    else {
+        return Math.max(minimum, (Math.ceil(width / snap) * snap) + (margin * 2))
+    }
+}
+
+function resizeSidebars() {
+    var primaryWidth   = sidebarContentWidth('.primary')
+    var secondaryWidth = 0
+
+    if ($('.secondary').length != 0) {
+        secondaryWidth = sidebarContentWidth('.secondary')
+    }
+
+    // snap to grid
+    primaryWidth   = calculateSize(primaryWidth, 32, 13, 160)
+    secondaryWidth = calculateSize(secondaryWidth, 32, 13, 160)
+
+    $('.primary').css('width', primaryWidth)
+    $('.secondary').css('width', secondaryWidth).css('left', primaryWidth + 1)
+
+    if (secondaryWidth > 0) {
+        $('#content').css('left', primaryWidth + secondaryWidth + 2)
+    }
+    else {
+        $('#content').css('left', primaryWidth + 1)
+    }
+}
+
+$(window).ready(resizeSidebars)
+$(window).ready(setCurrentVarLink)
+$(window).ready(function() { persistScrollPosition('.primary')})
+$(window).ready(function() {
+    $('#content').scroll(setCurrentVarLink)
+    $(window).resize(setCurrentVarLink)
+    $(window).resize(resizeSidebars)
+})
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 07eb6bc..97b06a0 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
 </ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.codec.html b/docs/current/flatland.protobuf.codec.html
index c2e0e58..e8b471d 100644
--- a/docs/current/flatland.protobuf.codec.html
+++ b/docs/current/flatland.protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.core.html b/docs/current/flatland.protobuf.core.html
index be1c25b..7542d6b 100644
--- a/docs/current/flatland.protobuf.core.html
+++ b/docs/current/flatland.protobuf.core.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.schema.html b/docs/current/flatland.protobuf.schema.html
index 9008b74..b0b5db3 100644
--- a/docs/current/flatland.protobuf.schema.html
+++ b/docs/current/flatland.protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/index.html b/docs/current/index.html
index 23d97c7..afafd0d 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.4.0-v0.3-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.4.0-v0.3-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.4.0-v0.3-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v0.3</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v0.3"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/resources/docs/9999-other-versions.md b/resources/docs/9999-other-versions.md
index 32410f9..9173084 100644
--- a/resources/docs/9999-other-versions.md
+++ b/resources/docs/9999-other-versions.md
@@ -3,3 +3,4 @@
 ### API Reference
 
 * [Development](../current)
+* [3.5.1-v0.3](../3.5.1-v0.3)

From 66da47953b7b6402e4ceb8f10bcc02a7e47c9900 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 16:26:50 -0600
Subject: [PATCH 374/525] Bumped version for next (API-breaking) dev cycle.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 8ebcce8..d40db2c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v0.3"
+(defproject clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {

From f6e7728d61417dc3ae84f3ea361033823155a655 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:25:22 -0600
Subject: [PATCH 375/525] Created dev namespace.

---
 dev-resources/src/protobuf/dev.clj | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 dev-resources/src/protobuf/dev.clj

diff --git a/dev-resources/src/protobuf/dev.clj b/dev-resources/src/protobuf/dev.clj
new file mode 100644
index 0000000..6566983
--- /dev/null
+++ b/dev-resources/src/protobuf/dev.clj
@@ -0,0 +1,7 @@
+(ns protobuf.dev
+  (:require
+    [protobuf.codec :as codec]
+    [protobuf.core :as core]
+    [protobuf.schema :as schema])
+  (:import
+    (protobuf.test.Codec$Foo)))

From 901d5fac2513a6c45c7c4e211e93f9ff53f57a69 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:25:28 -0600
Subject: [PATCH 376/525] Added script for compiling just the extentions
 protocol buffer.

---
 bin/compile-protobuf-extension | 11 +++++++++++
 bin/compile-test-protobufs     |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 bin/compile-protobuf-extension

diff --git a/bin/compile-protobuf-extension b/bin/compile-protobuf-extension
new file mode 100755
index 0000000..ebf0dc4
--- /dev/null
+++ b/bin/compile-protobuf-extension
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+OUT_DIR=src
+
+mkdir -p $OUT_DIR
+protoc \
+  -I=/usr/include \
+  -I=/usr/local/include \
+  -I=resources \
+  --java_out=$OUT_DIR \
+  resources/protobuf/extensions.proto
diff --git a/bin/compile-test-protobufs b/bin/compile-test-protobufs
index 64430c0..4952002 100755
--- a/bin/compile-test-protobufs
+++ b/bin/compile-test-protobufs
@@ -6,6 +6,6 @@ mkdir -p $OUT_DIR
 protoc \
   -I=/usr/include \
   -I=/usr/local/include \
-  -I=resources/proto \
+  -I=resources \
   --java_out=$OUT_DIR \
-  resources/proto/flatland/protobuf/test/*.proto
+  resources/protobuf/test/*.proto

From 87948e07257bb4dda5590e3fd9df645b438bf08d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:26:14 -0600
Subject: [PATCH 377/525] Removed flatland namespace.

---
 project.clj                                   | 50 +++++++++---
 .../flatland => }/protobuf/extensions.proto   |  2 +-
 .../flatland => }/protobuf/test/codec.proto   |  8 +-
 .../flatland => }/protobuf/test/core.proto    |  6 +-
 .../flatland => }/protobuf/test/example.proto |  6 +-
 .../flatland => }/protobuf/test/maps.proto    |  6 +-
 src/{flatland => }/protobuf/Extensions.java   | 78 +++++++++----------
 .../protobuf/PersistentProtocolBufferMap.java |  2 +-
 src/{flatland => }/protobuf/codec.clj         |  6 +-
 src/{flatland => }/protobuf/core.clj          | 27 ++++---
 src/{flatland => }/protobuf/schema.clj        | 21 ++---
 test/{flatland => }/protobuf/codec_test.clj   | 19 +++--
 test/{flatland => }/protobuf/core_test.clj    | 59 +++++++-------
 test/{flatland => }/protobuf/example_test.clj | 11 ++-
 14 files changed, 175 insertions(+), 126 deletions(-)
 rename resources/{proto/flatland => }/protobuf/extensions.proto (94%)
 rename resources/{proto/flatland => }/protobuf/test/codec.proto (87%)
 rename resources/{proto/flatland => }/protobuf/test/core.proto (94%)
 rename resources/{proto/flatland => }/protobuf/test/example.proto (84%)
 rename resources/{proto/flatland => }/protobuf/test/maps.proto (85%)
 rename src/{flatland => }/protobuf/Extensions.java (78%)
 rename src/{flatland => }/protobuf/PersistentProtocolBufferMap.java (99%)
 rename src/{flatland => }/protobuf/codec.clj (94%)
 rename src/{flatland => }/protobuf/core.clj (84%)
 rename src/{flatland => }/protobuf/schema.clj (86%)
 rename test/{flatland => }/protobuf/codec_test.clj (84%)
 rename test/{flatland => }/protobuf/core_test.clj (91%)
 rename test/{flatland => }/protobuf/example_test.clj (67%)

diff --git a/project.clj b/project.clj
index d40db2c..98f5a61 100644
--- a/project.clj
+++ b/project.clj
@@ -7,25 +7,31 @@
   :exclusions [
     [org.clojure/clojure]]
   :dependencies [
-    [org.clojure/clojure "1.8.0"]
     [com.google.protobuf/protobuf-java "3.5.1"]
-    [org.flatland/useful "0.11.5"]
-    [org.flatland/schematic "0.1.5"]
-    [org.flatland/io "0.3.0"]
+    [gloss "0.2.6"]
     [ordered-collections "0.4.2"]
-    [gloss "0.2.6"]]
+    [org.clojure/clojure "1.8.0"]
+    [org.flatland/io "0.3.0"]
+    [org.flatland/schematic "0.1.5"]
+    [org.flatland/useful "0.11.5"]]
   :java-source-paths ["src"]
   :profiles {
+    :ubercompile {
+      :aot :all}
+    :dev {
+      :source-paths ["dev-resources/src"]}
+    :custom-repl {
+      :repl-options {
+        :init-ns protobuf.dev
+        :prompt ~#(str "\u001B[35m[\u001B[34m"
+                       %
+                       "\u001B[35m]\u001B[33m λ\u001B[m=> ")}}
     :test {
       :plugins [
         [jonase/eastwood "0.2.5"]
         [lein-ancient "0.6.15"]
         [lein-shell "0.5.0"]]
       :java-source-paths ["target/test"]}
-    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
-    :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
-    :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
-    :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
     :docs {
       :dependencies [
         [clojang/codox-theme "0.2.0-SNAPSHOT"]]
@@ -35,14 +41,21 @@
         :project {
           :name "protobuf"
           :description "A Clojure interface to Google's protocol buffers"}
-        :namespaces [#"^flatland\.protobuf\.(?!dev)"]
+        :namespaces [#"^protobuf\.(?!dev)"]
         :metadata {
           :doc/format :markdown
           :doc "Documentation forthcoming"}
         :themes [:clojang]
         :doc-paths ["resources/docs"]
-        :output-path "docs/current"}}}
+        :output-path "docs/current"}}
+    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
+    :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+    :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+    :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
+    "protoc-extension" [
+      "shell"
+      "bin/compile-protobuf-extension"]
     "protoc-test" [
        "with-profile"
        "+test"
@@ -59,6 +72,18 @@
       "+test"
       "eastwood"
       "{:namespaces [:source-paths] :source-paths [\"src\"]}"]
+    "ubercompile" [
+      "with-profile"
+      "+ubercompile"
+      "compile"]
+    "repl" [
+      "with-profile"
+      "+test,+custom-repl"
+      "do"
+      ["clean"]
+      ["protoc-extension"]
+      ["protoc-test"]
+      ["repl"]]
     "docs" [
       "with-profile"
       "+docs"
@@ -71,5 +96,8 @@
       "do"
       ["clean"]
       ["lint"]
+      ["protoc-extension"]
       ["protoc-test"]
+      ;["ubercompile"]
+      ;["clean"]
       ["test-all"]]})
diff --git a/resources/proto/flatland/protobuf/extensions.proto b/resources/protobuf/extensions.proto
similarity index 94%
rename from resources/proto/flatland/protobuf/extensions.proto
rename to resources/protobuf/extensions.proto
index ee15932..05603ca 100644
--- a/resources/proto/flatland/protobuf/extensions.proto
+++ b/resources/protobuf/extensions.proto
@@ -1,6 +1,6 @@
 import "google/protobuf/descriptor.proto";
 
-option java_package = "flatland.protobuf";
+option java_package = "protobuf";
 option java_outer_classname = "Extensions";
 
 extend google.protobuf.FieldOptions {
diff --git a/resources/proto/flatland/protobuf/test/codec.proto b/resources/protobuf/test/codec.proto
similarity index 87%
rename from resources/proto/flatland/protobuf/test/codec.proto
rename to resources/protobuf/test/codec.proto
index 02b6635..bef7701 100644
--- a/resources/proto/flatland/protobuf/test/codec.proto
+++ b/resources/protobuf/test/codec.proto
@@ -1,8 +1,8 @@
-package flatland.protobuf.test.codec;
+package protobuf.test.codec;
 
-import "flatland/protobuf/extensions.proto";
+import "protobuf/extensions.proto";
 
-option java_package = "flatland.protobuf.test";
+option java_package = "protobuf.test";
 option java_outer_classname = "Codec";
 
 message Foo {
@@ -44,4 +44,4 @@ message Node {
   optional int32  foo   = 4;
   optional string bar   = 5;
   repeated int32  baz   = 6;
-}
\ No newline at end of file
+}
diff --git a/resources/proto/flatland/protobuf/test/core.proto b/resources/protobuf/test/core.proto
similarity index 94%
rename from resources/proto/flatland/protobuf/test/core.proto
rename to resources/protobuf/test/core.proto
index 0bda650..cfcdb02 100644
--- a/resources/proto/flatland/protobuf/test/core.proto
+++ b/resources/protobuf/test/core.proto
@@ -1,8 +1,8 @@
-package flatland.protobuf.test.core;
+package protobuf.test.core;
 
-import "flatland/protobuf/extensions.proto";
+import "protobuf/extensions.proto";
 
-option java_package = "flatland.protobuf.test";
+option java_package = "protobuf.test";
 option java_outer_classname = "Core";
 
 message Foo {
diff --git a/resources/proto/flatland/protobuf/test/example.proto b/resources/protobuf/test/example.proto
similarity index 84%
rename from resources/proto/flatland/protobuf/test/example.proto
rename to resources/protobuf/test/example.proto
index 1f8ac8d..9377c28 100644
--- a/resources/proto/flatland/protobuf/test/example.proto
+++ b/resources/protobuf/test/example.proto
@@ -1,8 +1,8 @@
-package flatland.protobuf.test.example;
+package protobuf.test.example;
 
-import "flatland/protobuf/extensions.proto";
+import "protobuf/extensions.proto";
 
-option java_package = "flatland.protobuf.test";
+option java_package = "protobuf.test";
 option java_outer_classname = "Example";
 
 message Photo {
diff --git a/resources/proto/flatland/protobuf/test/maps.proto b/resources/protobuf/test/maps.proto
similarity index 85%
rename from resources/proto/flatland/protobuf/test/maps.proto
rename to resources/protobuf/test/maps.proto
index 42891fa..250bec7 100644
--- a/resources/proto/flatland/protobuf/test/maps.proto
+++ b/resources/protobuf/test/maps.proto
@@ -1,8 +1,8 @@
-package flatland.protobuf.test.maps;
+package protobuf.test.maps;
 
-import "flatland/protobuf/extensions.proto";
+import "protobuf/extensions.proto";
 
-option java_package = "flatland.protobuf.test";
+option java_package = "protobuf.test";
 option java_outer_classname = "Maps";
 
 message Element {
diff --git a/src/flatland/protobuf/Extensions.java b/src/protobuf/Extensions.java
similarity index 78%
rename from src/flatland/protobuf/Extensions.java
rename to src/protobuf/Extensions.java
index c141191..fbb8f74 100644
--- a/src/flatland/protobuf/Extensions.java
+++ b/src/protobuf/Extensions.java
@@ -1,27 +1,27 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: flatland/protobuf/extensions.proto
+// source: protobuf/extensions.proto
 
-package flatland.protobuf;
+package protobuf;
 
 public final class Extensions {
   private Extensions() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
-    registry.add(flatland.protobuf.Extensions.set);
-    registry.add(flatland.protobuf.Extensions.map);
-    registry.add(flatland.protobuf.Extensions.mapBy);
-    registry.add(flatland.protobuf.Extensions.counter);
-    registry.add(flatland.protobuf.Extensions.succession);
-    registry.add(flatland.protobuf.Extensions.mapDeleted);
-    registry.add(flatland.protobuf.Extensions.mapExists);
-    registry.add(flatland.protobuf.Extensions.meta);
-    registry.add(flatland.protobuf.Extensions.nullable);
-    registry.add(flatland.protobuf.Extensions.nullString);
-    registry.add(flatland.protobuf.Extensions.nullInt);
-    registry.add(flatland.protobuf.Extensions.nullLong);
-    registry.add(flatland.protobuf.Extensions.nullFloat);
-    registry.add(flatland.protobuf.Extensions.nullDouble);
-    registry.add(flatland.protobuf.Extensions.nullEnum);
+    registry.add(protobuf.Extensions.set);
+    registry.add(protobuf.Extensions.map);
+    registry.add(protobuf.Extensions.mapBy);
+    registry.add(protobuf.Extensions.counter);
+    registry.add(protobuf.Extensions.succession);
+    registry.add(protobuf.Extensions.mapDeleted);
+    registry.add(protobuf.Extensions.mapExists);
+    registry.add(protobuf.Extensions.meta);
+    registry.add(protobuf.Extensions.nullable);
+    registry.add(protobuf.Extensions.nullString);
+    registry.add(protobuf.Extensions.nullInt);
+    registry.add(protobuf.Extensions.nullLong);
+    registry.add(protobuf.Extensions.nullFloat);
+    registry.add(protobuf.Extensions.nullDouble);
+    registry.add(protobuf.Extensions.nullEnum);
   }
   public static final int SET_FIELD_NUMBER = 52001;
   /**
@@ -197,28 +197,28 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\"flatland/protobuf/extensions.proto\032 go" +
-      "ogle/protobuf/descriptor.proto:,\n\003set\022\035." +
-      "google.protobuf.FieldOptions\030\241\226\003 \001(\010:,\n\003" +
-      "map\022\035.google.protobuf.FieldOptions\030\242\226\003 \001" +
-      "(\010:/\n\006map_by\022\035.google.protobuf.FieldOpti" +
-      "ons\030\243\226\003 \001(\t:0\n\007counter\022\035.google.protobuf" +
-      ".FieldOptions\030\244\226\003 \001(\010:3\n\nsuccession\022\035.go" +
-      "ogle.protobuf.FieldOptions\030\245\226\003 \001(\010:4\n\013ma" +
-      "p_deleted\022\035.google.protobuf.FieldOptions" +
-      "\030\246\226\003 \001(\t:3\n\nmap_exists\022\035.google.protobuf",
-      ".FieldOptions\030\247\226\003 \001(\t:-\n\004meta\022\035.google.p" +
-      "rotobuf.FieldOptions\030\252\226\003 \001(\t:1\n\010nullable" +
-      "\022\035.google.protobuf.FieldOptions\030\264\226\003 \001(\010:" +
-      "4\n\013null_string\022\035.google.protobuf.FieldOp" +
-      "tions\030\265\226\003 \001(\t:1\n\010null_int\022\035.google.proto" +
-      "buf.FieldOptions\030\266\226\003 \001(\021:2\n\tnull_long\022\035." +
-      "google.protobuf.FieldOptions\030\267\226\003 \001(\022:3\n\n" +
-      "null_float\022\035.google.protobuf.FieldOption" +
-      "s\030\270\226\003 \001(\002:4\n\013null_double\022\035.google.protob" +
-      "uf.FieldOptions\030\271\226\003 \001(\001:2\n\tnull_enum\022\035.g",
-      "oogle.protobuf.FieldOptions\030\272\226\003 \001(\rB\037\n\021f" +
-      "latland.protobufB\nExtensions"
+      "\n\031protobuf/extensions.proto\032 google/prot" +
+      "obuf/descriptor.proto:,\n\003set\022\035.google.pr" +
+      "otobuf.FieldOptions\030\241\226\003 \001(\010:,\n\003map\022\035.goo" +
+      "gle.protobuf.FieldOptions\030\242\226\003 \001(\010:/\n\006map" +
+      "_by\022\035.google.protobuf.FieldOptions\030\243\226\003 \001" +
+      "(\t:0\n\007counter\022\035.google.protobuf.FieldOpt" +
+      "ions\030\244\226\003 \001(\010:3\n\nsuccession\022\035.google.prot" +
+      "obuf.FieldOptions\030\245\226\003 \001(\010:4\n\013map_deleted" +
+      "\022\035.google.protobuf.FieldOptions\030\246\226\003 \001(\t:" +
+      "3\n\nmap_exists\022\035.google.protobuf.FieldOpt",
+      "ions\030\247\226\003 \001(\t:-\n\004meta\022\035.google.protobuf.F" +
+      "ieldOptions\030\252\226\003 \001(\t:1\n\010nullable\022\035.google" +
+      ".protobuf.FieldOptions\030\264\226\003 \001(\010:4\n\013null_s" +
+      "tring\022\035.google.protobuf.FieldOptions\030\265\226\003" +
+      " \001(\t:1\n\010null_int\022\035.google.protobuf.Field" +
+      "Options\030\266\226\003 \001(\021:2\n\tnull_long\022\035.google.pr" +
+      "otobuf.FieldOptions\030\267\226\003 \001(\022:3\n\nnull_floa" +
+      "t\022\035.google.protobuf.FieldOptions\030\270\226\003 \001(\002" +
+      ":4\n\013null_double\022\035.google.protobuf.FieldO" +
+      "ptions\030\271\226\003 \001(\001:2\n\tnull_enum\022\035.google.pro",
+      "tobuf.FieldOptions\030\272\226\003 \001(\rB\026\n\010protobufB\n" +
+      "Extensions"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/src/flatland/protobuf/PersistentProtocolBufferMap.java b/src/protobuf/PersistentProtocolBufferMap.java
similarity index 99%
rename from src/flatland/protobuf/PersistentProtocolBufferMap.java
rename to src/protobuf/PersistentProtocolBufferMap.java
index 052b1f9..f663cf5 100644
--- a/src/flatland/protobuf/PersistentProtocolBufferMap.java
+++ b/src/protobuf/PersistentProtocolBufferMap.java
@@ -8,7 +8,7 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-package flatland.protobuf;
+package protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/flatland/protobuf/codec.clj b/src/protobuf/codec.clj
similarity index 94%
rename from src/flatland/protobuf/codec.clj
rename to src/protobuf/codec.clj
index 7f9f6eb..21c0fb4 100644
--- a/src/flatland/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -1,16 +1,16 @@
-(ns flatland.protobuf.codec
+(ns protobuf.codec
   (:require
     [clojure.java.io :refer [input-stream]]
     ;; flatland.io extends Seqable so we can concat InputStream from
     ;; ByteBuffer sequences.
     [flatland.io.core]
-    [flatland.protobuf.core :refer :all]
     [flatland.schematic.core :as schema]
     [flatland.useful.experimental :refer [lift-meta]]
     [flatland.useful.fn :refer [fix]]
     [gloss.core :as gloss]
     [gloss.core.formats :refer [to-buf-seq]]
-    [gloss.core.protocols :refer [Reader Writer]]))
+    [gloss.core.protocols :refer [Reader Writer]]
+    [protobuf.core :refer :all]))
 
 (declare protobuf-codec)
 
diff --git a/src/flatland/protobuf/core.clj b/src/protobuf/core.clj
similarity index 84%
rename from src/flatland/protobuf/core.clj
rename to src/protobuf/core.clj
index 1a0431d..679fc87 100644
--- a/src/flatland/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -1,12 +1,19 @@
-(ns flatland.protobuf.core
-  (:use [flatland.protobuf.schema :only [field-schema]]
-        [flatland.useful.fn :only [fix]]
-        [clojure.java.io :only [input-stream output-stream]])
-  (:require flatland.useful.utils)
-  (:import (flatland.protobuf PersistentProtocolBufferMap PersistentProtocolBufferMap$Def PersistentProtocolBufferMap$Def$NamingStrategy Extensions)
-           (com.google.protobuf GeneratedMessage CodedInputStream Descriptors$Descriptor)
-           (java.io InputStream OutputStream)
-           (clojure.lang Reflector)))
+(ns protobuf.core
+  (:require
+    [clojure.java.io :refer [input-stream output-stream]]
+    [flatland.useful.fn :refer [fix]]
+    [flatland.useful.utils]
+    [protobuf.schema :refer [field-schema]])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy)))
 
 (defn protobuf?
   "Is the given object a PersistentProtocolBufferMap?"
@@ -69,7 +76,7 @@
       (PersistentProtocolBufferMap/parseFrom type in))))
 
 (defn ^"[B" protobuf-dump
-  "Return the byte representation of the given flatland.protobuf."
+  "Return the byte representation of the given protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))
   ([^PersistentProtocolBufferMap$Def type m]
diff --git a/src/flatland/protobuf/schema.clj b/src/protobuf/schema.clj
similarity index 86%
rename from src/flatland/protobuf/schema.clj
rename to src/protobuf/schema.clj
index 5daca83..1b3ba18 100644
--- a/src/flatland/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -1,11 +1,14 @@
-(ns flatland.protobuf.schema
-  (:use [flatland.useful.fn :only [fix]]
-        [clojure.string :only [lower-case]])
-  (:import (flatland.protobuf PersistentProtocolBufferMap
-                              PersistentProtocolBufferMap$Def Extensions)
-           (com.google.protobuf Descriptors$Descriptor
-                                Descriptors$FieldDescriptor
-                                Descriptors$FieldDescriptor$Type)))
+(ns protobuf.schema
+  (:require
+    [clojure.string :refer [lower-case]]
+    [flatland.useful.fn :refer [fix]])
+  (:import
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def )
+    (com.google.protobuf Descriptors$Descriptor
+                         Descriptors$FieldDescriptor
+                         Descriptors$FieldDescriptor$Type)))
 
 (defn extension [ext ^Descriptors$FieldDescriptor field]
   (-> (.getOptions field)
@@ -29,7 +32,7 @@
 
 (defmulti field-schema (fn [field def & _] (field-type field)))
 
-(defn struct-schema [^Descriptors$Descriptor          struct
+(defn struct-schema [^Descriptors$Descriptor struct
                      ^PersistentProtocolBufferMap$Def def
                      & [parents]]
   (let [struct-name (.getFullName struct)]
diff --git a/test/flatland/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
similarity index 84%
rename from test/flatland/protobuf/codec_test.clj
rename to test/protobuf/codec_test.clj
index 5152e6e..c2d1d3d 100644
--- a/test/flatland/protobuf/codec_test.clj
+++ b/test/protobuf/codec_test.clj
@@ -1,9 +1,14 @@
-(ns flatland.protobuf.codec-test
-  (:use clojure.test gloss.io flatland.protobuf.codec)
-  (:import (java.nio ByteBuffer)))
+(ns protobuf.codec-test
+  (:require
+    [clojure.test :refer :all]
+    [gloss.io :refer [decode encode]]
+    [protobuf.codec :refer :all])
+  (:import
+    (java.nio ByteBuffer)
+    (protobuf.test.Codec$Foo)))
 
 (deftest protobuf-codec-test
-  (let [codec (protobuf-codec flatland.protobuf.test.Codec$Foo)]
+  (let [codec (protobuf-codec protobuf.test.Codec$Foo)]
     (testing "decode an encoded data structure"
       (let [val {:foo 1 :bar 2}]
         (is (= val (decode codec (encode codec val))))))
@@ -47,8 +52,8 @@
                (decode codec (concat data1 data2 data3))))))))
 
 (deftest repeated-protobufs
-  (let [len   (length-prefix flatland.protobuf.test.Codec$Foo)
-        codec (protobuf-codec flatland.protobuf.test.Codec$Foo :repeated true)]
+  (let [len   (length-prefix protobuf.test.Codec$Foo)
+        codec (protobuf-codec protobuf.test.Codec$Foo :repeated true)]
     (testing "length-prefix"
       (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
         (is (= i (decode len (encode len i))))))
@@ -56,4 +61,4 @@
       (let [data1 (encode codec [{:foo 1 :bar 2}])
             data2 (encode codec [{:foo 4 :baz 8}])]
         (is (= [{:foo 1 :bar 2} {:foo 4 :baz 8}]
-               (decode codec (concat data1 data2))))))))
\ No newline at end of file
+               (decode codec (concat data1 data2))))))))
diff --git a/test/flatland/protobuf/core_test.clj b/test/protobuf/core_test.clj
similarity index 91%
rename from test/flatland/protobuf/core_test.clj
rename to test/protobuf/core_test.clj
index a45b0b6..b450f3f 100644
--- a/test/flatland/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,17 +1,20 @@
-(ns flatland.protobuf.core-test
-  (:use flatland.protobuf.core clojure.test
-        [flatland.io.core :only [catbytes]]
-        [flatland.useful.utils :only [adjoin]]
-        ordered-map.core)
-  (:import (java.io PipedInputStream PipedOutputStream)))
-
-(def Foo      (protodef flatland.protobuf.test.Core$Foo))
-(def FooUnder (protodef flatland.protobuf.test.Core$Foo
-                        {:naming-strategy flatland.protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
-(def Bar      (protodef flatland.protobuf.test.Core$Bar))
-(def Response (protodef flatland.protobuf.test.Core$Response))
-(def ErrorMsg (protodef flatland.protobuf.test.Core$ErrorMsg))
-(def Maps     (protodef flatland.protobuf.test.Maps$Struct))
+(ns protobuf.core-test
+  (:require
+    [clojure.test :refer :all]
+    [flatland.io.core :refer [catbytes]]
+    [flatland.useful.utils :refer [adjoin]]
+    [ordered-map.core :refer [ordered-map]]
+    [protobuf.core :refer :all])
+  (:import
+    (java.io PipedInputStream PipedOutputStream)))
+
+(def Foo (protodef protobuf.test.Core$Foo))
+(def FooUnder (protodef protobuf.test.Core$Foo
+                        {:naming-strategy protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
+(def Bar (protodef protobuf.test.Core$Bar))
+(def Response (protodef protobuf.test.Core$Response))
+(def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
+(def Maps (protodef protobuf.test.Maps$Struct))
 
 (deftest test-conj
   (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
@@ -355,12 +358,12 @@
 (deftest test-protobuf-schema
   (let [fields
         {:type :struct
-         :name "flatland.protobuf.test.core.Foo"
+         :name "protobuf.test.core.Foo"
          :fields {:id      {:default 43, :type :int}
                   :deleted {:default false, :type :boolean}
                   :lat     {:type :double}
                   :long    {:type :float}
-                  :parent  {:type :struct, :name "flatland.protobuf.test.core.Foo"}
+                  :parent  {:type :struct, :name "protobuf.test.core.Foo"}
                   :floats  {:type :list, :values {:type :float}}
                   :doubles {:type :list, :values {:type :double}}
                   :label   {:type :string, :c 3, :b 2, :a 1}
@@ -368,28 +371,28 @@
                   :tag-set {:type :set,  :values {:type :string}}
                   :counts  {:type   :map
                             :keys   {:type :string}
-                            :values {:type :struct, :name "flatland.protobuf.test.core.Count"
+                            :values {:type :struct, :name "protobuf.test.core.Count"
                                      :fields {:key {:type :string}
                                               :i {:counter true, :type :int}
                                               :d {:counter true, :type :double}}}}
                   :foo-by-id {:type :map
                               :keys   {:default 43, :type :int}
-                              :values {:type :struct, :name "flatland.protobuf.test.core.Foo"}}
+                              :values {:type :struct, :name "protobuf.test.core.Foo"}}
                   :attr-map {:type :map
                              :keys   {:type :string}
                              :values {:type :string}}
                   :pair-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "flatland.protobuf.test.core.Pair"
+                             :values {:type :struct, :name "protobuf.test.core.Pair"
                                       :fields {:key {:type :string}
                                                :val {:type :string}}}}
                   :groups {:type :map
                            :keys   {:type :string}
                            :values {:type :list
-                                    :values {:type :struct, :name "flatland.protobuf.test.core.Foo"}}}
+                                    :values {:type :struct, :name "protobuf.test.core.Foo"}}}
                   :responses {:type :list
                               :values {:type :enum, :values #{:no :yes :maybe :not-sure}}}
-                  :time {:type :struct, :name "flatland.protobuf.test.core.Time", :succession true
+                  :time {:type :struct, :name "protobuf.test.core.Time", :succession true
                          :fields {:year   {:type :int}
                                   :month  {:type :int}
                                   :day    {:type :int}
@@ -397,16 +400,16 @@
                                   :minute {:type :int}}}
                   :item-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "flatland.protobuf.test.core.Item"
+                             :values {:type :struct, :name "protobuf.test.core.Item"
                                       :fields {:item   {:type :string},
                                                :exists {:default true, :type :boolean}}}}
                   :things {:type :map
                            :keys {:type :string}
-                           :values {:type :struct, :name "flatland.protobuf.test.core.Thing"
+                           :values {:type :struct, :name "protobuf.test.core.Thing"
                                     :fields {:id {:type :string}
                                              :marked {:type :boolean}}}}}}]
     (is (= fields (protobuf-schema Foo)))
-    (is (= fields (protobuf-schema flatland.protobuf.test.Core$Foo)))))
+    (is (= fields (protobuf-schema protobuf.test.Core$Foo)))))
 
 (comment deftest test-default-protobuf
   (is (= 43    (default-protobuf Foo :id)))
@@ -421,7 +424,7 @@
   (is (= {}    (default-protobuf Foo :groups)))
   (is (= {}    (default-protobuf Foo :item-map)))
   (is (= false (default-protobuf Foo :deleted)))
-  (is (= {}    (default-protobuf flatland.protobuf.test.Core$Foo :groups))))
+  (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
   (let [dashes      (protobuf Foo      {:tag_set ["odd"]
@@ -460,7 +463,7 @@
            (protobuf-seq Foo in)))))
 
 (deftest test-encoding-errors
-  (is (thrown-with-msg? IllegalArgumentException #"error setting string field flatland.protobuf.test.core.Foo.label to 8"
+  (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
         (protobuf Foo :label 8)))
-  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field flatland.protobuf.test.core.Foo.tags"
-        (protobuf Foo :tags [1 2 3]))))
\ No newline at end of file
+  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
+        (protobuf Foo :tags [1 2 3]))))
diff --git a/test/flatland/protobuf/example_test.clj b/test/protobuf/example_test.clj
similarity index 67%
rename from test/flatland/protobuf/example_test.clj
rename to test/protobuf/example_test.clj
index edee65a..91c726f 100644
--- a/test/flatland/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -1,8 +1,11 @@
-(ns flatland.protobuf.example-test
-  (:use flatland.protobuf.core clojure.test)
-  (:import com.google.protobuf.ByteString))
+(ns protobuf.example-test
+  (:require
+    [clojure.test :refer :all]
+    [protobuf.core :refer :all])
+  (:import
+    (com.google.protobuf ByteString)))
 
-(def Photo (protodef flatland.protobuf.test.Example$Photo))
+(def Photo (protodef protobuf.test.Example$Photo))
 
 (def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"},
            :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"},

From bc8c8c9818e4fc3072257e02395fbe0e6d5bf198 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:28:18 -0600
Subject: [PATCH 378/525] Regenerated docs.

---
 docs/current/9999-other-versions.html      |  2 +-
 docs/current/flatland.protobuf.codec.html  |  3 -
 docs/current/flatland.protobuf.core.html   |  3 -
 docs/current/flatland.protobuf.schema.html |  3 -
 docs/current/highlight/highlight.min.js    |  2 -
 docs/current/highlight/solarized-light.css | 84 ----------------------
 docs/current/index.html                    |  2 +-
 docs/current/protobuf.codec.html           |  3 +
 docs/current/protobuf.core.html            |  3 +
 docs/current/protobuf.schema.html          |  3 +
 10 files changed, 11 insertions(+), 97 deletions(-)
 delete mode 100644 docs/current/flatland.protobuf.codec.html
 delete mode 100644 docs/current/flatland.protobuf.core.html
 delete mode 100644 docs/current/flatland.protobuf.schema.html
 delete mode 100644 docs/current/highlight/highlight.min.js
 delete mode 100644 docs/current/highlight/solarized-light.css
 create mode 100644 docs/current/protobuf.codec.html
 create mode 100644 docs/current/protobuf.core.html
 create mode 100644 docs/current/protobuf.schema.html

diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 97b06a0..7db535a 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/flatland.protobuf.codec.html b/docs/current/flatland.protobuf.codec.html
deleted file mode 100644
index e8b471d..0000000
--- a/docs/current/flatland.protobuf.codec.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html PUBLIC ""
-    "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch current"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.core.html b/docs/current/flatland.protobuf.core.html
deleted file mode 100644
index 7542d6b..0000000
--- a/docs/current/flatland.protobuf.core.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html PUBLIC ""
-    "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch current"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given flatland.protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/flatland.protobuf.schema.html b/docs/current/flatland.protobuf.schema.html
deleted file mode 100644
index b0b5db3..0000000
--- a/docs/current/flatland.protobuf.schema.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html PUBLIC ""
-    "">
-<html><head><meta charset="UTF-8" /><title>flatland.protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3 current"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="flatland.protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="flatland.protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">flatland.protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/highlight/highlight.min.js b/docs/current/highlight/highlight.min.js
deleted file mode 100644
index 6486ffd..0000000
--- a/docs/current/highlight/highlight.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! highlight.js v9.6.0 | BSD3 License | git.io/hljslicense */
-!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/[&<>]/gm,function(e){return I[e]})}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return R(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||R(i))return i}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}l+="<"+t(e)+w.map.call(e.attributes,r).join("")+">"}function u(e){l+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):E(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"===e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function h(e,n,t,r){var a=r?"":y.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function p(){var e,t,r,a;if(!E.k)return n(B);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(B);r;)a+=n(B.substr(t,r.index-t)),e=g(E,r),e?(M+=e[1],a+=h(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(B);return a+n(B.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!x[E.sL])return n(B);var t=e?l(E.sL,B,!0,L[E.sL]):f(B,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(L[E.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){k+=null!=E.sL?d():p(),B=""}function v(e){k+=e.cN?h(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(B+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?B+=n:(t.eB&&(B+=n),b(),t.rB||t.eB||(B=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?B+=n:(a.rE||a.eE||(B+=n),b(),a.eE&&(B=n));do E.cN&&(k+=C),E.skip||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return B+=n,n.length||1}var N=R(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var w,E=i||N,L={},k="";for(w=E;w!==N;w=w.parent)w.cN&&(k=h(w.cN,"",!0)+k);var B="",M=0;try{for(var I,j,O=0;;){if(E.t.lastIndex=O,I=E.t.exec(t),!I)break;j=m(t.substr(O,I.index-O),I[0]),O=I.index+j}for(m(t.substr(O)),w=E;w.parent;w=w.parent)w.cN&&(k+=C);return{r:M,value:k,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function f(e,t){t=t||y.languages||E(x);var r={r:0,value:n(e)},a=r;return t.filter(R).forEach(function(n){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return y.tabReplace||y.useBR?e.replace(M,function(e,n){return y.useBR&&"\n"===e?"<br>":y.tabReplace?n.replace(/\t/g,y.tabReplace):void 0}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n,t,r,o,s,p=i(e);a(p)||(y.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=p?l(p,s,!0):f(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=g(r.value),e.innerHTML=r.value,e.className=h(e.className,p,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function d(e){y=o(y,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");w.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function N(){return E(x)}function R(e){return e=(e||"").toLowerCase(),x[e]||x[L[e]]}var w=[],E=Object.keys,x={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",y={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},I={"&":"&amp;","<":"&lt;",">":"&gt;"};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=R,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});
\ No newline at end of file
diff --git a/docs/current/highlight/solarized-light.css b/docs/current/highlight/solarized-light.css
deleted file mode 100644
index fdcfcc7..0000000
--- a/docs/current/highlight/solarized-light.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-
-Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #fdf6e3;
-  color: #657b83;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #93a1a1;
-}
-
-/* Solarized Green */
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-addition {
-  color: #859900;
-}
-
-/* Solarized Cyan */
-.hljs-number,
-.hljs-string,
-.hljs-meta .hljs-meta-string,
-.hljs-literal,
-.hljs-doctag,
-.hljs-regexp {
-  color: #2aa198;
-}
-
-/* Solarized Blue */
-.hljs-title,
-.hljs-section,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #268bd2;
-}
-
-/* Solarized Yellow */
-.hljs-attribute,
-.hljs-attr,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-class .hljs-title,
-.hljs-type {
-  color: #b58900;
-}
-
-/* Solarized Orange */
-.hljs-symbol,
-.hljs-bullet,
-.hljs-subst,
-.hljs-meta,
-.hljs-meta .hljs-keyword,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-link {
-  color: #cb4b16;
-}
-
-/* Solarized Red */
-.hljs-built_in,
-.hljs-deletion {
-  color: #dc322f;
-}
-
-.hljs-formula {
-  background: #eee8d5;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
diff --git a/docs/current/index.html b/docs/current/index.html
index afafd0d..2601bb0 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v0.3</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-3 branch"><a href="flatland.protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-3 branch"><a href="flatland.protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-3"><a href="flatland.protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v0.3</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v0.3"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="flatland.protobuf.codec.html">flatland.protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="flatland.protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="flatland.protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.core.html">flatland.protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="flatland.protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="flatland.protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="flatland.protobuf.schema.html">flatland.protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="flatland.protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-extension">extension</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="flatland.protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="flatland.protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
new file mode 100644
index 0000000..c65c95d
--- /dev/null
+++ b/docs/current/protobuf.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
new file mode 100644
index 0000000..eb26d39
--- /dev/null
+++ b/docs/current/protobuf.core.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
new file mode 100644
index 0000000..6e13c0e
--- /dev/null
+++ b/docs/current/protobuf.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file

From 5cf4b282df50c53012848e7db61211a0cd06de1e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:31:40 -0600
Subject: [PATCH 379/525] Re-enabled ubercompile in build.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index 98f5a61..b11bbfe 100644
--- a/project.clj
+++ b/project.clj
@@ -95,9 +95,9 @@
     "build-test" [
       "do"
       ["clean"]
+      ["ubercompile"]
+      ["clean"]
       ["lint"]
       ["protoc-extension"]
       ["protoc-test"]
-      ;["ubercompile"]
-      ;["clean"]
       ["test-all"]]})

From 9104f20bf80c8b5727f8cd0c43b0427b7a794998 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 17:34:12 -0600
Subject: [PATCH 380/525] Added tags badge.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 20b2bbb..332cd65 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # protobuf
 
-[![Build Status][travis-badge]][travis][![Clojars Project][clojars-badge]][clojars][![Clojure version][clojure-v]](project.clj)
+[![Build Status][travis-badge]][travis][![Clojars Project][clojars-badge]][clojars][![Releases][tag-badge]][tag][![Clojure version][clojure-v]](project.clj)
 
 *A Clojure interface to Google's protocol buffers*
 

From 5cbf2046bb1a7c5c32587ceed5ebb28fc241ab28 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 19:43:00 -0600
Subject: [PATCH 381/525] Added function from the 'useful' lib by @amalloy.

---
 src/protobuf/util.clj | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/protobuf/util.clj

diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
new file mode 100644
index 0000000..29cdc90
--- /dev/null
+++ b/src/protobuf/util.clj
@@ -0,0 +1,19 @@
+(ns protobuf.util)
+
+(defn fix
+  "Walk through clauses, a series of predicate/transform pairs. The
+  first predicate that x satisfies has its transformation clause
+  called on x. Predicates or transforms may be values (eg true or nil)
+  rather than functions; these will be treated as functions that
+  return that value.
+  The last \"pair\" may be only a transform with no pred: in that case it
+  is unconditionally used to transform x, if nothing previously matched.
+  If no predicate matches, then x is returned unchanged."
+  [x & clauses]
+  (let [call #((as-fn %) x)]
+    (first (or (seq (for [[pred & [transform :as exists?]] (partition-all 2 clauses)
+                          :let [[pred transform] ;; handle odd number of clauses
+                                (if exists? [pred transform] [true pred])]
+                          :when (call pred)]
+                      (call transform)))
+               [x]))))

From 47cffd5c71a42913ce81cb9bbdf75a4300be8043 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 19:54:23 -0600
Subject: [PATCH 382/525] Added protocol from the 'useful' lib by @amalloy.

---
 src/protobuf/util.clj | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 29cdc90..0489578 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -1,4 +1,10 @@
-(ns protobuf.util)
+(ns protobuf.util
+  (:import
+    (clojure.lang IDeref
+                  ISeq
+                  IPersistentMap
+                  IPersistentSet
+                  IPersistentCollection)))
 
 (defn fix
   "Walk through clauses, a series of predicate/transform pairs. The
@@ -17,3 +23,37 @@
                           :when (call pred)]
                       (call transform)))
                [x]))))
+
+(defprotocol Adjoin
+  (adjoin-onto [left right]
+    "Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them."))
+
+(extend-protocol Adjoin
+  IPersistentMap
+  (adjoin-onto [this other]
+    (merge-with adjoin-onto this other))
+
+  IPersistentSet
+  (adjoin-onto [this other]
+    (into-set this other))
+
+  ISeq
+  (adjoin-onto [this other]
+    (concat this other))
+
+  IPersistentCollection
+  (adjoin-onto [this other]
+    (into this other))
+
+  Object
+  (adjoin-onto [this other]
+    other)
+
+  nil
+  (adjoin-onto [this other]
+    other))

From 28bb73be8648feb3e91d643f708fe1ff55d764b1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 19:56:23 -0600
Subject: [PATCH 383/525] Added function from the 'useful' lib by @amalloy.

---
 src/protobuf/util.clj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 0489578..6a27427 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -6,6 +6,11 @@
                   IPersistentSet
                   IPersistentCollection)))
 
+(defn as-fn
+  "Turn an object into a fn if it is not already, by wrapping it in constantly."
+  [x]
+  (if (ifn? x) x, (constantly x)))
+
 (defn fix
   "Walk through clauses, a series of predicate/transform pairs. The
   first predicate that x satisfies has its transformation clause

From 6fa94a3190435944d4299fe17a03c531350578e0 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 19:57:29 -0600
Subject: [PATCH 384/525] Added function from the 'useful' lib by @amalloy.

---
 src/protobuf/util.clj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 6a27427..0ac579e 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -11,6 +11,14 @@
   [x]
   (if (ifn? x) x, (constantly x)))
 
+(defn into-set
+  "Update the given set using an existence map."
+  [set map]
+  (if (map? map)
+    (reduce (fn [set [k v]] ((if v conj disj) set k))
+            set map)
+    (into set map)))
+
 (defn fix
   "Walk through clauses, a series of predicate/transform pairs. The
   first predicate that x satisfies has its transformation clause

From 8d1bca8e390137e64e5dd15ca0ff57224050fe83 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 21:47:57 -0600
Subject: [PATCH 385/525] Added many more functions originally written by
 @amalloy and team.

---
 src/protobuf/util.clj | 111 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 0ac579e..17c5166 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -37,6 +37,65 @@
                       (call transform)))
                [x]))))
 
+(defn to-fix
+  "A \"curried\" version of fix, which sets the clauses once, yielding a
+  function that calls fix with the specified first argument."
+  [& clauses]
+  (fn [x]
+    (apply fix x clauses)))
+
+(defmacro given
+  "A macro combining the features of fix and fixing, by using parentheses to group the
+   additional arguments to each clause:
+   (-> x
+       (given string? read-string
+              map? (dissoc :x :y :z)
+              even? (/ 2)))"
+  [x & clauses]
+  (let [[clauses default] (if (even? (count clauses))
+                            [clauses `identity]
+                            [(butlast clauses) (last clauses)])]
+    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
+                     arg [pred `#(-> % ~transform)]]
+                 arg)
+          ~default)))
+
+(defmacro map-entry
+  "Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
+  flatland.useful.experimental.unicode contains a shortcut to this, named ·."
+  [a b]
+  `(clojure.lang.MapEntry. ~a ~b))
+
+(defn update-in*
+  "Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
+  function that will take the old value and any supplied args and return the new value, and returns
+  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
+  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
+  values are not re-assoc'd."
+  [m keys f & args]
+  (if-let [[k & ks] (seq keys)]
+    (let [old (get m k)
+          new (apply update-in* old ks f args)]
+      (if (identical? old new)
+        m
+        (assoc m k new)))
+     (apply f m args)))
+
+(defn update
+  "Update a value for the given key in a map where f is a function that takes the previous value and
+  the supplied args and returns the new value. Like update-in*, unchanged values are not
+  re-assoc'd."
+  [m key f & args]
+  (apply update-in* m [key] f args))
+
+(defn map-vals
+  "Create a new map from m by calling function f on each value to get a new value."
+  [m f & args]
+  (when m
+    (into {}
+          (for [[k v] m]
+            (map-entry k (apply f v args))))))
+
 (defprotocol Adjoin
   (adjoin-onto [left right]
     "Merge two data structures by combining the contents. For maps, merge recursively by
@@ -70,3 +129,55 @@
   nil
   (adjoin-onto [this other]
     other))
+
+(defn adjoin
+  "Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them."
+  [a b]
+  (adjoin-onto a b))
+
+(defn catbytes [& args]
+  (let [out-buf (byte-array (loop [len 0, args (seq args)]
+                              (if-let [[arg & args] args]
+                                (recur (+ len (alength ^bytes arg)) args)
+                                len)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array & more] (seq args)]
+        (let [size (alength array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))
+
+(defn walk
+  "Traverse all child types of the given schema, calling inner on each, then call outer on the result."
+  [inner outer schema]
+  (outer
+   (case (:type schema)
+     :struct           (update schema :fields map-vals inner)
+     (:set :list :map) (-> schema
+                           (given :values (update :values inner))
+                           (given :keys   (update :keys   inner)))
+     schema)))
+
+(defn postwalk
+  "Perform a depth-first, post-order traversal of all types within the given schema, replacing each
+  and type with the result of calling f on it."
+  [f schema]
+  (walk (partial postwalk f) f schema))
+
+(defn prewalk
+  "Like postwalk, but do a pre-order traversal."
+  [f schema]
+  (walk (partial prewalk f) identity (f schema)))
+
+(defn dissoc-fields
+  "Traverse the given schema, removing the given fields at any level."
+  [schema & fields]
+  (prewalk (to-fix #(= :struct (:type %))
+                   #(apply update % :fields dissoc fields))
+           schema))

From dc8ab430893fa9fbe9646ee32c65dd064fa92cc3 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 21:48:17 -0600
Subject: [PATCH 386/525] Updated namespaces to use new util ns.

Also, removed :refer :all and replaced with explicit function calls in ns's.
---
 src/protobuf/codec.clj      |  40 ++++-----
 src/protobuf/core.clj       |  15 ++--
 src/protobuf/schema.clj     |   8 +-
 test/protobuf/core_test.clj | 173 ++++++++++++++++++------------------
 4 files changed, 116 insertions(+), 120 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 21c0fb4..b0123dc 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -1,16 +1,14 @@
 (ns protobuf.codec
   (:require
-    [clojure.java.io :refer [input-stream]]
+    [clojure.java.io :as io]
     ;; flatland.io extends Seqable so we can concat InputStream from
     ;; ByteBuffer sequences.
     [flatland.io.core]
-    [flatland.schematic.core :as schema]
-    [flatland.useful.experimental :refer [lift-meta]]
-    [flatland.useful.fn :refer [fix]]
     [gloss.core :as gloss]
-    [gloss.core.formats :refer [to-buf-seq]]
-    [gloss.core.protocols :refer [Reader Writer]]
-    [protobuf.core :refer :all]))
+    [gloss.core.formats :as gloss-formats]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.core :as protobuf]
+    [protobuf.util :as util]))
 
 (declare protobuf-codec)
 
@@ -18,9 +16,9 @@
 (def ^{:private true} reset-key :codec_reset)
 
 (defn length-prefix [proto]
-  (let [proto (protodef proto)
-        min   (alength (protobuf-dump proto {len-key 0}))
-        max   (alength (protobuf-dump proto {len-key Integer/MAX_VALUE}))]
+  (let [proto (protobuf/protodef proto)
+        min   (alength (protobuf/protobuf-dump proto {len-key 0}))
+        max   (alength (protobuf/protobuf-dump proto {len-key Integer/MAX_VALUE}))]
     (letfn [(check [test msg]
               (when-not test
                 (throw (Exception. (format "In %s: %s %s"
@@ -34,25 +32,27 @@
                          len-key)))
 
 (defn protobuf-codec [proto & {:keys [validator repeated]}]
-  (let [proto (protodef proto)]
+  (let [proto (protobuf/protodef proto)]
     (-> (reify
-          Reader
+          ;; Reader method
+          gloss-protocols/Reader
           (read-bytes [this buf-seq]
-            [true (protobuf-load-stream proto (input-stream buf-seq)) nil])
-          Writer
+            [true (protobuf/protobuf-load-stream proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
           (sizeof [this] nil)
           (write-bytes [this _ val]
             (when (and validator (not (validator val)))
               (throw (IllegalStateException. "Invalid value in protobuf-codec")))
-            (to-buf-seq
-             (protobuf-dump
-              (if (protobuf? val)
+            (gloss-formats/to-buf-seq
+             (protobuf/protobuf-dump
+              (if (protobuf/protobuf? val)
                 val
-                (protobuf proto val))))))
-        (fix repeated
+                (protobuf/protobuf proto val))))))
+        (util/fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
                               :prefix :none)))))
 
 (defn codec-schema [proto]
-  (schema/dissoc-fields (protobuf-schema proto)
+  (util/dissoc-fields (protobuf/protobuf-schema proto)
                         len-key reset-key))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 679fc87..27cbf71 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -1,9 +1,8 @@
 (ns protobuf.core
   (:require
-    [clojure.java.io :refer [input-stream output-stream]]
-    [flatland.useful.fn :refer [fix]]
-    [flatland.useful.utils]
-    [protobuf.schema :refer [field-schema]])
+    [clojure.java.io :as io]
+    [protobuf.schema :as protobuf-schema]
+    [protobuf.util :as util])
   (:import
     (clojure.lang Reflector)
     (com.google.protobuf CodedInputStream
@@ -56,7 +55,7 @@
   "Return the schema for the given protodef."
   [& args]
   (let [^PersistentProtocolBufferMap$Def def (apply protodef args)]
-    (field-schema (.getMessageType def) def)))
+    (protobuf-schema/field-schema (.getMessageType def) def)))
 
 (defn protobuf-load
   "Load a protobuf of the given type from an array of bytes."
@@ -87,7 +86,7 @@
   [^PersistentProtocolBufferMap$Def type in]
   (lazy-seq
    (io!
-    (let [^InputStream in (input-stream in)]
+    (let [^InputStream in (io/input-stream in)]
       (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
         (cons p (protobuf-seq type in))
         (.close in))))))
@@ -96,12 +95,12 @@
   "Write the given protobufs to the given output stream, prefixing each with its length to delimit them."
   [out & ps]
   (io!
-   (let [^OutputStream out (output-stream out)]
+   (let [^OutputStream out (io/output-stream out)]
      (doseq [^PersistentProtocolBufferMap p ps]
        (.writeDelimitedTo p out))
      (.flush out))))
 
-(extend-protocol flatland.useful.utils/Adjoin
+(extend-protocol util/Adjoin
   PersistentProtocolBufferMap
   (adjoin-onto [^PersistentProtocolBufferMap this other]
     (.append this other)))
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index 1b3ba18..63b8540 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -1,7 +1,7 @@
 (ns protobuf.schema
   (:require
-    [clojure.string :refer [lower-case]]
-    [flatland.useful.fn :refer [fix]])
+    [clojure.string :as string]
+    [protobuf.util :as util])
   (:import
     (protobuf Extensions
               PersistentProtocolBufferMap
@@ -13,7 +13,7 @@
 (defn extension [ext ^Descriptors$FieldDescriptor field]
   (-> (.getOptions field)
       (.getExtension ext)
-      (fix string? not-empty)))
+      (util/fix string? not-empty)))
 
 (defn field-type [field]
   (condp instance? field
@@ -47,7 +47,7 @@
 (defn basic-schema [^Descriptors$FieldDescriptor     field
                     ^PersistentProtocolBufferMap$Def def
                      & [parents]]
-  (let [java-type   (keyword (lower-case (.name (.getJavaType field))))
+  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
         meta-string (extension (Extensions/meta) field)]
     (merge (case java-type
              :message (struct-schema (.getMessageType field) def parents)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index b450f3f..d5776e6 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -1,23 +1,21 @@
 (ns protobuf.core-test
   (:require
     [clojure.test :refer :all]
-    [flatland.io.core :refer [catbytes]]
-    [flatland.useful.utils :refer [adjoin]]
-    [ordered-map.core :refer [ordered-map]]
-    [protobuf.core :refer :all])
+    [protobuf.core :as protobuf]
+    [protobuf.util :as util])
   (:import
     (java.io PipedInputStream PipedOutputStream)))
 
-(def Foo (protodef protobuf.test.Core$Foo))
-(def FooUnder (protodef protobuf.test.Core$Foo
+(def Foo (protobuf/protodef protobuf.test.Core$Foo))
+(def FooUnder (protobuf/protodef protobuf.test.Core$Foo
                         {:naming-strategy protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
-(def Bar (protodef protobuf.test.Core$Bar))
-(def Response (protodef protobuf.test.Core$Response))
-(def ErrorMsg (protodef protobuf.test.Core$ErrorMsg))
-(def Maps (protodef protobuf.test.Maps$Struct))
+(def Bar (protobuf/protodef protobuf.test.Core$Bar))
+(def Response (protobuf/protodef protobuf.test.Core$Response))
+(def ErrorMsg (protobuf/protodef protobuf.test.Core$ErrorMsg))
+(def Maps (protobuf/protodef protobuf.test.Maps$Struct))
 
 (deftest test-conj
-  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
     (let [p (conj p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
@@ -31,33 +29,33 @@
       (is (= "very" (:label p))))))
 
 (deftest test-adjoin
-  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
-    (let [p (adjoin p {:label "bar"})]
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
+    (let [p (util/adjoin p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
       (is (= false (:deleted p)))
       (is (= ["little" "yellow"] (:tags p))))
-    (let [p (adjoin (assoc p :deleted true) p)]
+    (let [p (util/adjoin (assoc p :deleted true) p)]
       (is (= true (:deleted p))))
-    (let [p (adjoin p {:tags ["different"]})]
+    (let [p (util/adjoin p {:tags ["different"]})]
       (is (= ["little" "yellow" "different"] (:tags p))))
-    (let [p (adjoin p {:tags ["different"] :label "very"})]
+    (let [p (util/adjoin p {:tags ["different"] :label "very"})]
       (is (= ["little" "yellow" "different"] (:tags p)))
       (is (= "very" (:label p))))
-    (let [p (adjoin p {:doubles [3.4] :floats [0.02]})]
+    (let [p (util/adjoin p {:doubles [3.4] :floats [0.02]})]
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p)))))
   (testing "adjoining works with set extension"
-    (let [p (protobuf Foo :tag-set #{"foo" "bar" "baz"})
-          q (protobuf Foo :tag-set {"bar" false "foo" false "bap" true})
-          r (adjoin p q)]
+    (let [p (protobuf/protobuf Foo :tag-set #{"foo" "bar" "baz"})
+          q (protobuf/protobuf Foo :tag-set {"bar" false "foo" false "bap" true})
+          r (util/adjoin p q)]
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
       (is (= #{"bap"}             (q :tag-set)))
       (is (= #{"bap" "baz"}       (r :tag-set)))))
   (testing "adjoining works with counters"
-    (let [p (protobuf Foo :counts {"foo" {:i 5 :d  5.0}})
-          q (protobuf Foo :counts {"foo" {:i 8 :d -3.0}})
-          r (adjoin p q)]
+    (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d  5.0}})
+          q (protobuf/protobuf Foo :counts {"foo" {:i 8 :d -3.0}})
+          r (util/adjoin p q)]
       (is (=  5   (get-in p [:counts "foo" :i])))
       (is (=  5.0 (get-in p [:counts "foo" :d])))
       (is (=  8   (get-in q [:counts "foo" :i])))
@@ -66,17 +64,16 @@
       (is (=  2.0 (get-in r [:counts "foo" :d]))))))
 
 (deftest test-ordered-adjoin
-  (let [inputs (apply ordered-map (for [x (range 26)
-                                        entry [(str x) (str (char (+ (int \a) x)))]]
-                                    entry))]
+  (let [inputs (into (sorted-map) (for [x (range 26)]
+                                    [(str x) (str (char (+ (int \a) x)))]))]
     (= (seq inputs)
        (seq (reduce (fn [m [k v]]
-                      (adjoin m {:attr_map {k v}}))
-                    (protobuf Foo)
+                      (util/adjoin m {:attr_map {k v}}))
+                    (protobuf/protobuf Foo)
                     inputs)))))
 
 (deftest test-assoc
-  (let [p (protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
     (let [p (assoc p :label "baz" :tags ["nuprin"])]
       (is (= ["nuprin"] (:tags p)))
       (is (= "baz"      (:label p))))
@@ -90,21 +87,21 @@
              (:foo-by-id p))))))
 
 (deftest test-dissoc
-  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (let [p (dissoc p :label :tags)]
       (is (= nil (:tags p)))
       (is (= nil (:label p))))))
 
 (deftest test-equality
   (let [m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
-        p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
-        q (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+        p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+        q (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (is (= m p))
     (is (= p m))
     (is (= q p))))
 
 (deftest test-meta
-  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         m {:foo :bar}
         q (with-meta p m)]
     (is (empty? (meta p)))
@@ -112,7 +109,7 @@
     (is (= m (meta q)))))
 
 (deftest test-extmap
-  (let [p (protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
         p2 (assoc p :some-key 10)
         m2 (assoc m :some-key 10)]
@@ -123,7 +120,7 @@
     (is (= (set (keys m2)) (set (keys p2)))))
 
   (let [m {:id 5 :wat 10}
-        p (protobuf Foo m)]
+        p (protobuf/protobuf Foo m)]
     (testing "protobuf function uses extmap"
       (is (= (:wat m) (:wat p)))
       (let [p (conj p {:stuff 15})]
@@ -131,11 +128,11 @@
 
     ;; TODO add test back once we re-enable this check
     (comment
-      (is (thrown? Exception (protobuf-dump p))
+      (is (thrown? Exception (protobuf/protobuf-dump p))
           "Should refuse to serialize with stuff in extmap"))))
 
 (deftest test-string-keys
-  (let [p (protobuf Foo "id" 5 "label" "rad")]
+  (let [p (protobuf/protobuf Foo "id" 5 "label" "rad")]
     (is (= 5 (p :id)))
     (is (= 5 (p "id")))
     (is (= "rad" (p :label)))
@@ -145,15 +142,15 @@
       (is (= ["check" "it" "out"] (p "tags"))))))
 
 (deftest test-append-bytes
-  (let [p (protobuf Foo :id 5 :label "rad" :deleted true
+  (let [p (protobuf/protobuf Foo :id 5 :label "rad" :deleted true
                     :tags ["sweet"] :tag-set #{"foo" "bar" "baz"}
                     :things {"first" {:marked false} "second" {:marked false}})
-        q (protobuf Foo :id 43 :deleted false
+        q (protobuf/protobuf Foo :id 43 :deleted false
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
                     :things {"first" {:marked true}})
-        r (protobuf Foo :label "bad")
-        s (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump q)))
-        t (protobuf-load Foo (catbytes (protobuf-dump p) (protobuf-dump r)))]
+        r (protobuf/protobuf Foo :label "bad")
+        s (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))
+        t (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump r)))]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
     (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
     (is (= "rad" (s :label)))
@@ -167,11 +164,11 @@
     (is (= false (r :deleted)))))
 
 (deftest test-manual-append
-  (let [p (protobuf Foo :id 5 :label "rad" :deleted true
+  (let [p (protobuf/protobuf Foo :id 5 :label "rad" :deleted true
                     :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
-        q (protobuf Foo :id 43 :deleted false
+        q (protobuf/protobuf Foo :id 43 :deleted false
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
-        r (protobuf Foo :label "bad")
+        r (protobuf/protobuf Foo :label "bad")
         s (.append p q)
         t (.append p r)]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
@@ -186,7 +183,7 @@
 
 (deftest test-map-exists
   (doseq [map-key [:element-map-e :element-by-id-e]]
-    (let [p (protobuf Maps map-key {"A" {:foo 1}
+    (let [p (protobuf/protobuf Maps map-key {"A" {:foo 1}
                                     "B" {:foo 2}
                                     "C" {:foo 3}
                                     "D" {:foo 4 :exists true}
@@ -195,7 +192,7 @@
                                     "G" {:foo 7 :exists false}
                                     "H" {:foo 8 :exists false}
                                     "I" {:foo 9 :exists false}})
-          q (protobuf Maps map-key {"A" {:bar 1}
+          q (protobuf/protobuf Maps map-key {"A" {:bar 1}
                                     "B" {:bar 2 :exists true}
                                     "C" {:bar 3 :exists false}
                                     "D" {:bar 4}
@@ -204,7 +201,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :exists true}
                                     "I" {:bar 9 :exists false}})
-          r (protobuf-load Maps (catbytes (protobuf-dump p) (protobuf-dump q)))]
+          r (protobuf/protobuf-load Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :exists]))
            "A" [1   1 nil  ]
@@ -219,7 +216,7 @@
 
 (deftest test-map-deleted
   (doseq [map-key [:element-map-d :element-by-id-d]]
-    (let [p (protobuf Maps map-key {"A" {:foo 1}
+    (let [p (protobuf/protobuf Maps map-key {"A" {:foo 1}
                                     "B" {:foo 2}
                                     "C" {:foo 3}
                                     "D" {:foo 4 :deleted true}
@@ -228,7 +225,7 @@
                                     "G" {:foo 7 :deleted false}
                                     "H" {:foo 8 :deleted false}
                                     "I" {:foo 9 :deleted false}})
-          q (protobuf Maps map-key {"A" {:bar 1}
+          q (protobuf/protobuf Maps map-key {"A" {:bar 1}
                                     "B" {:bar 2 :deleted true}
                                     "C" {:bar 3 :deleted false}
                                     "D" {:bar 4}
@@ -237,7 +234,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :deleted true}
                                     "I" {:bar 9 :deleted false}})
-          r (protobuf-load Maps (catbytes (protobuf-dump p) (protobuf-dump q)))]
+          r (protobuf/protobuf-load Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :deleted]))
            "A" [1   1 nil  ]
@@ -251,21 +248,21 @@
            "I" [9   9 false]))))
 
 (deftest test-coercing
-  (let [p (protobuf Foo :lat 5 :long 6)]
+  (let [p (protobuf/protobuf Foo :lat 5 :long 6)]
     (is (= 5.0 (p :lat)))
     (is (= 6.0 (p :long))))
-  (let [p (protobuf Foo :lat (float 5.0) :long (double 6.0))]
+  (let [p (protobuf/protobuf Foo :lat (float 5.0) :long (double 6.0))]
     (is (= 5.0 (p :lat)))
     (is (= 6.0 (p :long)))))
 
 (deftest test-create
-  (let [p (protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
+  (let [p (protobuf/protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
     (is (= #{"little" "yellow"} (:tag-set p)))
     (is (associative? (:attr-map p)))
     (is (= "different" (get-in p [:attr-map "style"])))
     (is (= "little"    (get-in p [:attr-map "size" ])))
     (is (= "yellow"    (get-in p [:attr-map "color"]))))
-  (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
+  (let [p (protobuf/protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
     (let [five ((p :foo-by-id) 5)
           six  ((p :foo-by-id) 6)]
       (is (= 5      (five :id)))
@@ -274,34 +271,34 @@
       (is (= "six"  (six  :label))))))
 
 (deftest test-map-by-with-required-field
-  (let [p (protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
+  (let [p (protobuf/protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
     (is (= "foo" (get-in p [:item-map "foo" :item])))
     (is (= "bar" (get-in p [:item-map "bar" :item])))))
 
 (deftest test-map-by-with-inconsistent-keys
-  (let [p (protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
+  (let [p (protobuf/protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val]))))
-  (let [p (protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
+  (let [p (protobuf/protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val])))))
 
 (deftest test-conj
-  (let [p (protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
+  (let [p (protobuf/protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
     (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
       (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
       (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
       (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
 
 (deftest test-nested-counters
-  (let [p (protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
+  (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
     (is (= 5   (get-in p [:counts "foo" :i])))
     (is (= 5.0 (get-in p [:counts "foo" :d])))
-    (let [p (adjoin p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
+    (let [p (util/adjoin p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
       (is (= 7   (get-in p [:counts "foo" :i])))
       (is (= 2.6 (get-in p [:counts "foo" :d])))
       (is (= 99  (get-in p [:counts "bar" :i])))
-      (let [p (adjoin p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
+      (let [p (util/adjoin p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
         (is (= -1   (get-in p [:counts "foo" :i])))
         (is (= 6.66 (get-in p [:counts "foo" :d])))
         (is (= 33   (get-in p [:counts "bar" :i])))
@@ -310,22 +307,22 @@
                 {:key "bar", :i 99}
                 {:key "foo", :i -8, :d 4.06}
                 {:key "bar", :i -66}]
-               (get-raw p :counts)))))))
+               (protobuf/get-raw p :counts)))))))
 
 (deftest test-succession
-  (let [p (protobuf Foo :time {:year 1978 :month 11 :day 24})]
+  (let [p (protobuf/protobuf Foo :time {:year 1978 :month 11 :day 24})]
     (is (= 1978 (get-in p [:time :year])))
     (is (= 11   (get-in p [:time :month])))
     (is (= 24   (get-in p [:time :day])))
-    (let [p (adjoin p {:time {:year 1974 :month 1}})]
+    (let [p (util/adjoin p {:time {:year 1974 :month 1}})]
       (is (= 1974 (get-in p [:time :year])))
       (is (= 1    (get-in p [:time :month])))
       (is (= nil  (get-in p [:time :day])))
       (is (= [{:year 1978, :month 11, :day 24} {:year 1974, :month 1}]
-             (get-raw p :time))))))
+             (protobuf/get-raw p :time))))))
 
 (deftest test-nullable
-  (let [p (protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
+  (let [p (protobuf/protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
         keyset #{:int :long :flt :dbl :str :enu}]
     (is (= 1            (get p :int)))
     (is (= 330000000000 (get p :long)))
@@ -334,7 +331,7 @@
     (is (= "foo"        (get p :str)))
     (is (= :a           (get p :enu)))
     (is (= keyset (set (keys p))))
-    (let [p (adjoin p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
+    (let [p (util/adjoin p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
       (is (= nil (get p :int)))
       (is (= nil (get p :long)))
       (is (= nil (get p :flt)))
@@ -343,17 +340,17 @@
       (is (= nil (get p :enu)))
       (is (= keyset (set (keys p)))))
     (testing "nullable successions"
-      (let [p (protobuf Bar :label "foo")]
+      (let [p (protobuf/protobuf Bar :label "foo")]
         (is (= "foo" (get p :label)))
-        (let [p (adjoin p {:label nil})]
+        (let [p (util/adjoin p {:label nil})]
           (is (= nil        (get     p :label)))
-          (is (= ["foo" ""] (get-raw p :label))))))
+          (is (= ["foo" ""] (protobuf/get-raw p :label))))))
     (testing "repeated nullable"
-      (let [p (protobuf Bar :labels ["foo" "bar"])]
+      (let [p (protobuf/protobuf Bar :labels ["foo" "bar"])]
         (is (= ["foo" "bar"] (get p :labels)))
-        (let [p (adjoin p {:labels [nil]})]
+        (let [p (util/adjoin p {:labels [nil]})]
           (is (= ["foo" "bar" nil] (get     p :labels)))
-          (is (= ["foo" "bar" ""]  (get-raw p :labels))))))))
+          (is (= ["foo" "bar" ""]  (protobuf/get-raw p :labels))))))))
 
 (deftest test-protobuf-schema
   (let [fields
@@ -408,8 +405,8 @@
                            :values {:type :struct, :name "protobuf.test.core.Thing"
                                     :fields {:id {:type :string}
                                              :marked {:type :boolean}}}}}}]
-    (is (= fields (protobuf-schema Foo)))
-    (is (= fields (protobuf-schema protobuf.test.Core$Foo)))))
+    (is (= fields (protobuf/protobuf-schema Foo)))
+    (is (= fields (protobuf/protobuf-schema protobuf.test.Core$Foo)))))
 
 (comment deftest test-default-protobuf
   (is (= 43    (default-protobuf Foo :id)))
@@ -427,9 +424,9 @@
   (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
-  (let [dashes      (protobuf Foo      {:tag_set ["odd"]
+  (let [dashes      (protobuf/protobuf Foo      {:tag_set ["odd"]
                                         :responses [:yes :not-sure :maybe :not-sure :no]})
-        underscores (protobuf FooUnder {:tag_set ["odd"]
+        underscores (protobuf/protobuf FooUnder {:tag_set ["odd"]
                                         :responses [:yes :not_sure :maybe :not_sure :no]})]
     (is (= '(:id :responses :tag-set :deleted)   (keys dashes)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses dashes)))
@@ -439,31 +436,31 @@
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
              :pair_map :groups :doubles :floats :item_map :counts :time :lat :long :things}
-           (-> (protobuf-schema FooUnder) :fields keys set)))))
+           (-> (protobuf/protobuf-schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message
-  (let [p (protobuf Response :ok false :error (protobuf ErrorMsg :code -10 :data "abc"))]
+  (let [p (protobuf/protobuf Response :ok false :error (protobuf/protobuf ErrorMsg :code -10 :data "abc"))]
     (is (= "abc" (get-in p [:error :data])))))
 
 (deftest test-protobuf-nested-null-field
-  (let [p (protobuf Response :ok true :error (protobuf ErrorMsg :code -10 :data nil))]
+  (let [p (protobuf/protobuf Response :ok true :error (protobuf/protobuf ErrorMsg :code -10 :data nil))]
     (is (:ok p))))
 
 (deftest test-protobuf-seq-and-write-protobuf
   (let [in  (PipedInputStream.)
         out (PipedOutputStream. in)
-        foo (protobuf Foo :id 1 :label "foo")
-        bar (protobuf Foo :id 2 :label "bar")
-        baz (protobuf Foo :id 3 :label "baz")]
-    (protobuf-write out foo bar baz)
+        foo (protobuf/protobuf Foo :id 1 :label "foo")
+        bar (protobuf/protobuf Foo :id 2 :label "bar")
+        baz (protobuf/protobuf Foo :id 3 :label "baz")]
+    (protobuf/protobuf-write out foo bar baz)
     (.close out)
     (is (= [{:id 1, :label "foo", :deleted false}
             {:id 2, :label "bar", :deleted false}
             {:id 3, :label "baz", :deleted false}]
-           (protobuf-seq Foo in)))))
+           (protobuf/protobuf-seq Foo in)))))
 
 (deftest test-encoding-errors
   (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
-        (protobuf Foo :label 8)))
+        (protobuf/protobuf Foo :label 8)))
   (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
-        (protobuf Foo :tags [1 2 3]))))
+        (protobuf/protobuf Foo :tags [1 2 3]))))

From ac4912912e0e28e71286e3becde3cbf500e87be7 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 23:16:22 -0600
Subject: [PATCH 387/525] Updated usage.

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 332cd65..b9a6d81 100644
--- a/README.md
+++ b/README.md
@@ -54,25 +54,25 @@ We've found a clean way to do this (and how we set up the tests) is to:
 Now you can use the protocol buffer in Clojure:
 
 ```clojure
-(require '[flatland.protobuf.core :refer :all])
+(require '[protobuf.core :refer :all])
 (import Example$Person)
 
 (def Person (protodef Example$Person))
 
-(def p (protobuf Person :id 4 :name "Bob" :email "bob@example.com"))
-=> {:id 4, :name "Bob", :email "bob@example.com"}
+(def p (protobuf Person :id 4 :name "Alice" :email "alice@example.com"))
+=> {:id 4, :name "Alice", :email "alice@example.com"}
 
-(assoc p :name "Bill"))
-=> {:id 4, :name "Bill", :email "bob@example.com"}
+(assoc p :name "Alice B. Carol"))
+=> {:id 4, :name "Alice B. Carol", :email "alice@example.com"}
 
 (assoc p :likes ["climbing" "running" "jumping"])
-=> {:id 4, name "Bob", :email "bob@example.com", :likes ["climbing" "running" "jumping"]}
+=> {:id 4, name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
 
 (def b (protobuf-dump p))
 => #<byte[] [B@7cbe41ec>
 
 (protobuf-load Person b)
-=> {:id 4, :name "Bob", :email "bob@example.com"}
+=> {:id 4, :name "Alice", :email "alice@example.com"}
 ```
 
 A protocol buffer map is immutable just like other clojure objects. It is

From ae01af819bb98f351f60ea9e0b621b49b2ceb5a0 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 23:20:03 -0600
Subject: [PATCH 388/525] Use explicit requires.

---
 test/protobuf/codec_test.clj   | 60 +++++++++++++++++-----------------
 test/protobuf/example_test.clj |  6 ++--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/test/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
index c2d1d3d..f868fd3 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/protobuf/codec_test.clj
@@ -1,64 +1,64 @@
 (ns protobuf.codec-test
   (:require
     [clojure.test :refer :all]
-    [gloss.io :refer [decode encode]]
-    [protobuf.codec :refer :all])
+    [gloss.io :as gloss-io]
+    [protobuf.codec :as protobuf-codec])
   (:import
     (java.nio ByteBuffer)
     (protobuf.test.Codec$Foo)))
 
 (deftest protobuf-codec-test
-  (let [codec (protobuf-codec protobuf.test.Codec$Foo)]
+  (let [codec (protobuf-codec/protobuf-codec protobuf.test.Codec$Foo)]
     (testing "decode an encoded data structure"
       (let [val {:foo 1 :bar 2}]
-        (is (= val (decode codec (encode codec val))))))
+        (is (= val (gloss-io/decode codec (gloss-io/encode codec val))))))
 
     (testing "append two simple encoded data structures"
-      (let [data1 (encode codec {:foo 1 :bar 2})
-            data2 (encode codec {:foo 4 :baz 8})]
+      (let [data1 (gloss-io/encode codec {:foo 1 :bar 2})
+            data2 (gloss-io/encode codec {:foo 4 :baz 8})]
         (is (= {:foo 4 :bar 2 :baz 8}
-               (decode codec (concat data1 data2))))))
+               (gloss-io/decode codec (concat data1 data2))))))
 
     (testing "concat lists when appending"
-      (let [data1 (encode codec {:tags ["foo" "bar"] :foo 1})
-            data2 (encode codec {:tags ["baz" "foo"] :foo 2})]
+      (let [data1 (gloss-io/encode codec {:tags ["foo" "bar"] :foo 1})
+            data2 (gloss-io/encode codec {:tags ["baz" "foo"] :foo 2})]
         (is (= {:foo 2 :tags ["foo" "bar" "baz" "foo"]}
-               (decode codec (concat data1 data2))))))
+               (gloss-io/decode codec (concat data1 data2))))))
 
     (testing "merge maps when appending"
-      (let [data1 (encode codec {:num-map {1 "one" 3 "three"}})
-            data2 (encode codec {:num-map {2 "dos" 3 "tres"}})
-            data3 (encode codec {:num-map {3 "san" 6 "roku"}})]
+      (let [data1 (gloss-io/encode codec {:num-map {1 "one" 3 "three"}})
+            data2 (gloss-io/encode codec {:num-map {2 "dos" 3 "tres"}})
+            data3 (gloss-io/encode codec {:num-map {3 "san" 6 "roku"}})]
         (is (= {:num-map {1 "one" 2 "dos" 3 "san" 6 "roku"}}
-               (decode codec (concat data1 data2 data3))))))
+               (gloss-io/decode codec (concat data1 data2 data3))))))
 
     (testing "merge sets when appending"
-      (let [data1 (encode codec {:tag-set #{"foo" "bar"}})
-            data2 (encode codec {:tag-set #{"baz" "foo"}})]
+      (let [data1 (gloss-io/encode codec {:tag-set #{"foo" "bar"}})
+            data2 (gloss-io/encode codec {:tag-set #{"baz" "foo"}})]
         (is (= {:tag-set #{"foo" "bar" "baz"}}
-               (decode codec (concat data1 data2))))))
+               (gloss-io/decode codec (concat data1 data2))))))
 
     (testing "support set deletion using existence map"
-      (let [data1 (encode codec {:tag-set #{"foo" "bar" "baz"}})
-            data2 (encode codec {:tag-set {"baz" false "foo" true "zap" true "bam" false}})]
+      (let [data1 (gloss-io/encode codec {:tag-set #{"foo" "bar" "baz"}})
+            data2 (gloss-io/encode codec {:tag-set {"baz" false "foo" true "zap" true "bam" false}})]
         (is (= {:tag-set #{"foo" "bar" "zap"}}
-               (decode codec (concat data1 data2))))))
+               (gloss-io/decode codec (concat data1 data2))))))
 
     (testing "merge and append nested data structures when appending"
-      (let [data1 (encode codec {:nested {:foo 1 :tags ["bar"] :nested {:tag-set #{"a" "c"}}}})
-            data2 (encode codec {:nested {:foo 4 :tags ["baz"] :bar 3}})
-            data3 (encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
+      (let [data1 (gloss-io/encode codec {:nested {:foo 1 :tags ["bar"] :nested {:tag-set #{"a" "c"}}}})
+            data2 (gloss-io/encode codec {:nested {:foo 4 :tags ["baz"] :bar 3}})
+            data3 (gloss-io/encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
         (is (= {:nested {:foo 4 :bar 3 :baz 5 :tags ["bar" "baz" "foo"] :nested {:tag-set #{"a" "b"}}}}
-               (decode codec (concat data1 data2 data3))))))))
+               (gloss-io/decode codec (concat data1 data2 data3))))))))
 
 (deftest repeated-protobufs
-  (let [len   (length-prefix protobuf.test.Codec$Foo)
-        codec (protobuf-codec protobuf.test.Codec$Foo :repeated true)]
+  (let [len (protobuf-codec/length-prefix protobuf.test.Codec$Foo)
+        codec (protobuf-codec/protobuf-codec protobuf.test.Codec$Foo :repeated true)]
     (testing "length-prefix"
       (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
-        (is (= i (decode len (encode len i))))))
+        (is (= i (gloss-io/decode len (gloss-io/encode len i))))))
     (testing "repeated"
-      (let [data1 (encode codec [{:foo 1 :bar 2}])
-            data2 (encode codec [{:foo 4 :baz 8}])]
+      (let [data1 (gloss-io/encode codec [{:foo 1 :bar 2}])
+            data2 (gloss-io/encode codec [{:foo 4 :baz 8}])]
         (is (= [{:foo 1 :bar 2} {:foo 4 :baz 8}]
-               (decode codec (concat data1 data2))))))))
+               (gloss-io/decode codec (concat data1 data2))))))))
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
index 91c726f..3dce42b 100644
--- a/test/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -1,11 +1,11 @@
 (ns protobuf.example-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.core :refer :all])
+    [protobuf.core :as protobuf])
   (:import
     (com.google.protobuf ByteString)))
 
-(def Photo (protodef protobuf.test.Example$Photo))
+(def Photo (protobuf/protodef protobuf.test.Example$Photo))
 
 (def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"},
            :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"},
@@ -13,4 +13,4 @@
            :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
 
 (deftest example-test
-  (is (= data (apply protobuf Photo (apply concat data)))))
+  (is (= data (apply protobuf/protobuf Photo (apply concat data)))))

From 2f43f1a5b75080b2c5b0e9bb45aa2c6cdf042aa8 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 23:20:12 -0600
Subject: [PATCH 389/525] Drop dep on ordered-collections.

---
 src/protobuf/PersistentProtocolBufferMap.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/protobuf/PersistentProtocolBufferMap.java b/src/protobuf/PersistentProtocolBufferMap.java
index f663cf5..80626a1 100644
--- a/src/protobuf/PersistentProtocolBufferMap.java
+++ b/src/protobuf/PersistentProtocolBufferMap.java
@@ -21,8 +21,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ordered_map.core.OrderedMap;
-import ordered_set.core.OrderedSet;
 import clojure.lang.APersistentMap;
 import clojure.lang.ASeq;
 import clojure.lang.IFn;
@@ -30,15 +28,16 @@
 import clojure.lang.IObj;
 import clojure.lang.IPersistentCollection;
 import clojure.lang.IPersistentMap;
+import clojure.lang.IPersistentSet;
 import clojure.lang.IPersistentVector;
 import clojure.lang.ISeq;
-import clojure.lang.ITransientMap;
-import clojure.lang.ITransientSet;
 import clojure.lang.Keyword;
 import clojure.lang.MapEntry;
 import clojure.lang.Numbers;
 import clojure.lang.Obj;
 import clojure.lang.PersistentArrayMap;
+import clojure.lang.PersistentTreeMap;
+import clojure.lang.PersistentTreeSet;
 import clojure.lang.PersistentVector;
 import clojure.lang.RT;
 import clojure.lang.SeqIterator;
@@ -408,7 +407,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
         Object map_field_by = def.mapFieldBy(field);
         DescriptorProtos.FieldOptions options = field.getOptions();
         if (map_field_by != null) {
-          ITransientMap map = (ITransientMap)OrderedMap.EMPTY.asTransient();
+          IPersistentMap map = new PersistentTreeMap();
           while (iterator.hasNext()) {
             PersistentProtocolBufferMap v =
               (PersistentProtocolBufferMap)fromProtoValue(field, iterator.next());
@@ -416,7 +415,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
             PersistentProtocolBufferMap existing = (PersistentProtocolBufferMap)map.valAt(k);
             map = map.assoc(k, def.mapValue(field, existing, v));
           }
-          return map.persistent();
+          return map;
         } else if (options.getExtension(Extensions.counter)) {
           Object count = iterator.next();
           while (iterator.hasNext()) {
@@ -430,7 +429,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           Descriptors.FieldDescriptor key_field = type.findFieldByName("key");
           Descriptors.FieldDescriptor val_field = type.findFieldByName("val");
 
-          ITransientMap map = (ITransientMap)OrderedMap.EMPTY.asTransient();
+          IPersistentMap map = new PersistentTreeMap();
           while (iterator.hasNext()) {
             DynamicMessage message = (DynamicMessage)iterator.next();
             Object k = fromProtoValue(key_field, message.getField(key_field));
@@ -447,20 +446,20 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
               map = map.assoc(k, v);
             }
           }
-          return map.persistent();
+          return map;
         } else if (options.getExtension(Extensions.set)) {
           Descriptors.Descriptor type = field.getMessageType();
           Descriptors.FieldDescriptor item_field = type.findFieldByName("item");
           Descriptors.FieldDescriptor exists_field = type.findFieldByName("exists");
 
-          ITransientSet set = (ITransientSet)OrderedSet.EMPTY.asTransient();
+          IPersistentSet set = (IPersistentSet)PersistentTreeSet.EMPTY;
           while (iterator.hasNext()) {
             DynamicMessage message = (DynamicMessage)iterator.next();
             Object item = fromProtoValue(item_field, message.getField(item_field));
             Boolean exists = (Boolean)message.getField(exists_field);
 
             if (exists) {
-              set = (ITransientSet)set.conj(item);
+              set = (IPersistentSet)set.cons(item);
             } else {
               try {
                 set = set.disjoin(item);
@@ -469,7 +468,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
               }
             }
           }
-          return set.persistent();
+          return set;
         }
       }
       List<Object> list = new ArrayList<Object>(values.size());

From cfbe4fb965c559765da94004df89f7202e6c2b12 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 23:20:50 -0600
Subject: [PATCH 390/525] Removed unused deps.

---
 project.clj | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index b11bbfe..2dbfcff 100644
--- a/project.clj
+++ b/project.clj
@@ -9,11 +9,8 @@
   :dependencies [
     [com.google.protobuf/protobuf-java "3.5.1"]
     [gloss "0.2.6"]
-    [ordered-collections "0.4.2"]
     [org.clojure/clojure "1.8.0"]
-    [org.flatland/io "0.3.0"]
-    [org.flatland/schematic "0.1.5"]
-    [org.flatland/useful "0.11.5"]]
+    [org.flatland/io "0.3.0"]]
   :java-source-paths ["src"]
   :profiles {
     :ubercompile {
@@ -54,6 +51,8 @@
     :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
     "protoc-extension" [
+      "with-profile"
+      "+test"
       "shell"
       "bin/compile-protobuf-extension"]
     "protoc-test" [
@@ -92,6 +91,12 @@
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"
       "test"]
+    "clean-test-all" [
+      "do"
+      ["clean"]
+      ["protoc-extension"]
+      ["protoc-test"]
+      ["test-all"]]
     "build-test" [
       "do"
       ["clean"]

From c09f68da619d98128b835fc21d5886f8dd6b8cd0 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sat, 23 Dec 2017 23:28:43 -0600
Subject: [PATCH 391/525] Don't use def as variable.

---
 src/protobuf/core.clj | 80 +++++++++++++++++++++++++------------------
 src/protobuf/util.clj |  2 +-
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 27cbf71..300100e 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -14,85 +14,98 @@
               PersistentProtocolBufferMap$Def
               PersistentProtocolBufferMap$Def$NamingStrategy)))
 
+;;; XXX Create aliases with def docstrings for all the renames below!
+
+;; rename to map?
 (defn protobuf?
   "Is the given object a PersistentProtocolBufferMap?"
   [obj]
   (instance? PersistentProtocolBufferMap obj))
 
+;; rename to mapdef?
 (defn protodef?
   "Is the given object a PersistentProtocolBufferMap$Def?"
   [obj]
   (instance? PersistentProtocolBufferMap$Def obj))
 
+;; rename to mapdef
 (defn ^PersistentProtocolBufferMap$Def protodef
   "Create a protodef from a string or protobuf class."
-  ([def]
-     (if (or (protodef? def) (nil? def))
-       def
-       (protodef def {})))
-  ([def opts]
-     (when def
+  ([mapdef]
+     (if (or (protodef? mapdef) (nil? mapdef))
+       mapdef
+       (protodef mapdef {})))
+  ([mapdef opts]
+     (when mapdef
        (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
                      size-limit]
               :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
                    size-limit 67108864}} opts ;; 64MiB
              ^Descriptors$Descriptor descriptor
-             (if (instance? Descriptors$Descriptor def)
-               def
-               (Reflector/invokeStaticMethod ^Class def "getDescriptor" (to-array nil)))]
+             (if (instance? Descriptors$Descriptor mapdef)
+               mapdef
+               (Reflector/invokeStaticMethod ^Class mapdef "getDescriptor" (to-array nil)))]
          (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))
 
+;; rename to create
 (defn protobuf
-  "Construct a protobuf of the given type."
-  ([^PersistentProtocolBufferMap$Def type]
-     (PersistentProtocolBufferMap/construct type {}))
-  ([^PersistentProtocolBufferMap$Def type m]
-     (PersistentProtocolBufferMap/construct type m))
-  ([^PersistentProtocolBufferMap$Def type k v & kvs]
-     (PersistentProtocolBufferMap/construct type (apply array-map k v kvs))))
+  "Construct a protobuf of the given mapdef."
+  ([^PersistentProtocolBufferMap$Def mapdef]
+     (PersistentProtocolBufferMap/construct mapdef {}))
+  ([^PersistentProtocolBufferMap$Def mapdef m]
+     (PersistentProtocolBufferMap/construct mapdef m))
+  ([^PersistentProtocolBufferMap$Def mapdef k v & kvs]
+     (PersistentProtocolBufferMap/construct mapdef (apply array-map k v kvs))))
 
+;; rename to mapdef->schema
 (defn protobuf-schema
   "Return the schema for the given protodef."
   [& args]
-  (let [^PersistentProtocolBufferMap$Def def (apply protodef args)]
-    (protobuf-schema/field-schema (.getMessageType def) def)))
+  (let [^PersistentProtocolBufferMap$Def mapdef (apply protodef args)]
+    (protobuf-schema/field-schema (.getMessageType mapdef) mapdef)))
 
+;; rename to parse; change to multimethod
 (defn protobuf-load
-  "Load a protobuf of the given type from an array of bytes."
-  ([^PersistentProtocolBufferMap$Def type ^bytes data]
+  "Load a protobuf of the given mapdef from an array of bytes."
+  ([^PersistentProtocolBufferMap$Def mapdef ^bytes data]
      (when data
-       (PersistentProtocolBufferMap/create type data)))
-  ([^PersistentProtocolBufferMap$Def type ^bytes data ^Integer offset ^Integer length]
+       (PersistentProtocolBufferMap/create mapdef data)))
+  ([^PersistentProtocolBufferMap$Def mapdef ^bytes data ^Integer offset ^Integer length]
      (when data
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
-         (PersistentProtocolBufferMap/parseFrom type in)))))
+         (PersistentProtocolBufferMap/parseFrom mapdef in)))))
 
 (defn protobuf-load-stream
-  "Load a protobuf of the given type from an InputStream."
-  [^PersistentProtocolBufferMap$Def type ^InputStream stream]
+  "Load a protobuf of the given mapdef from an InputStream."
+  [^PersistentProtocolBufferMap$Def mapdef ^InputStream stream]
   (when stream
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
-      (PersistentProtocolBufferMap/parseFrom type in))))
+      (PersistentProtocolBufferMap/parseFrom mapdef in))))
 
+;; rename to ->bytes
 (defn ^"[B" protobuf-dump
   "Return the byte representation of the given protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))
-  ([^PersistentProtocolBufferMap$Def type m]
-     (protobuf-dump (PersistentProtocolBufferMap/construct type m))))
+  ([^PersistentProtocolBufferMap$Def mapdef m]
+     (protobuf-dump (PersistentProtocolBufferMap/construct mapdef m))))
 
+;; rename to read
 (defn protobuf-seq
-  "Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream."
-  [^PersistentProtocolBufferMap$Def type in]
+  "Lazily read a sequence of length-delimited protobufs of the specified mapdef
+  from the given input stream."
+  [^PersistentProtocolBufferMap$Def mapdef in]
   (lazy-seq
    (io!
     (let [^InputStream in (io/input-stream in)]
-      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom type in)]
-        (cons p (protobuf-seq type in))
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom mapdef in)]
+        (cons p (protobuf-seq mapdef in))
         (.close in))))))
 
+;; rename to write
 (defn protobuf-write
-  "Write the given protobufs to the given output stream, prefixing each with its length to delimit them."
+  "Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them."
   [out & ps]
   (io!
    (let [^OutputStream out (io/output-stream out)]
@@ -100,6 +113,7 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
+;; Rename util protocol to Combiner and the method to combine
 (extend-protocol util/Adjoin
   PersistentProtocolBufferMap
   (adjoin-onto [^PersistentProtocolBufferMap this other]
diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 17c5166..9999467 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -98,7 +98,7 @@
 
 (defprotocol Adjoin
   (adjoin-onto [left right]
-    "Merge two data structures by combining the contents. For maps, merge recursively by
+  "Merge two data structures by combining the contents. For maps, merge recursively by
   adjoining values with the same key. For collections, combine the right and left using
   into or conj. If the left value is a set and the right value is a map, the right value
   is assumed to be an existence map where the value determines whether the key is in the

From 71684babd604d8bee74bfb62b8fa6cf423518c29 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:02:19 -0600
Subject: [PATCH 392/525] Renamed adjoin function, method, and protocol.

---
 src/protobuf/core.clj       |  9 ++++++---
 src/protobuf/util.clj       | 24 ++++++++++++------------
 test/protobuf/core_test.clj | 36 ++++++++++++++++++------------------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 300100e..fc9ffad 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -113,10 +113,9 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
-;; Rename util protocol to Combiner and the method to combine
-(extend-protocol util/Adjoin
+(extend-protocol util/Combiner
   PersistentProtocolBufferMap
-  (adjoin-onto [^PersistentProtocolBufferMap this other]
+  (combine-onto [^PersistentProtocolBufferMap this other]
     (.append this other)))
 
 ;; TODO make this nil-safe? Or just delete it?
@@ -124,3 +123,7 @@
   "Get value at key ignoring extension fields."
   [^PersistentProtocolBufferMap p key]
   (.getValAt p key false))
+
+;;; Aliases
+(def ^{:doc "Backwards-compatible alias for `util/combine-onto`"}
+  adjoin-onto #'util/combine-onto)
diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 9999467..2cef757 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -96,8 +96,8 @@
           (for [[k v] m]
             (map-entry k (apply f v args))))))
 
-(defprotocol Adjoin
-  (adjoin-onto [left right]
+(defprotocol Combiner
+  (combine-onto [left right]
   "Merge two data structures by combining the contents. For maps, merge recursively by
   adjoining values with the same key. For collections, combine the right and left using
   into or conj. If the left value is a set and the right value is a map, the right value
@@ -105,32 +105,32 @@
   merged set. This makes sets unique from other collections because items can be deleted
   from them."))
 
-(extend-protocol Adjoin
+(extend-protocol Combiner
   IPersistentMap
-  (adjoin-onto [this other]
-    (merge-with adjoin-onto this other))
+  (combine-onto [this other]
+    (merge-with combine-onto this other))
 
   IPersistentSet
-  (adjoin-onto [this other]
+  (combine-onto [this other]
     (into-set this other))
 
   ISeq
-  (adjoin-onto [this other]
+  (combine-onto [this other]
     (concat this other))
 
   IPersistentCollection
-  (adjoin-onto [this other]
+  (combine-onto [this other]
     (into this other))
 
   Object
-  (adjoin-onto [this other]
+  (combine-onto [this other]
     other)
 
   nil
-  (adjoin-onto [this other]
+  (combine-onto [this other]
     other))
 
-(defn adjoin
+(defn combine
   "Merge two data structures by combining the contents. For maps, merge recursively by
   adjoining values with the same key. For collections, combine the right and left using
   into or conj. If the left value is a set and the right value is a map, the right value
@@ -138,7 +138,7 @@
   merged set. This makes sets unique from other collections because items can be deleted
   from them."
   [a b]
-  (adjoin-onto a b))
+  (combine-onto a b))
 
 (defn catbytes [& args]
   (let [out-buf (byte-array (loop [len 0, args (seq args)]
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d5776e6..d42b1f4 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -28,34 +28,34 @@
       (is (= ["little" "yellow" "different"] (:tags p)))
       (is (= "very" (:label p))))))
 
-(deftest test-adjoin
+(deftest test-combine
   (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
-    (let [p (util/adjoin p {:label "bar"})]
+    (let [p (util/combine p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
       (is (= false (:deleted p)))
       (is (= ["little" "yellow"] (:tags p))))
-    (let [p (util/adjoin (assoc p :deleted true) p)]
+    (let [p (util/combine (assoc p :deleted true) p)]
       (is (= true (:deleted p))))
-    (let [p (util/adjoin p {:tags ["different"]})]
+    (let [p (util/combine p {:tags ["different"]})]
       (is (= ["little" "yellow" "different"] (:tags p))))
-    (let [p (util/adjoin p {:tags ["different"] :label "very"})]
+    (let [p (util/combine p {:tags ["different"] :label "very"})]
       (is (= ["little" "yellow" "different"] (:tags p)))
       (is (= "very" (:label p))))
-    (let [p (util/adjoin p {:doubles [3.4] :floats [0.02]})]
+    (let [p (util/combine p {:doubles [3.4] :floats [0.02]})]
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p)))))
-  (testing "adjoining works with set extension"
+  (testing "combining works with set extension"
     (let [p (protobuf/protobuf Foo :tag-set #{"foo" "bar" "baz"})
           q (protobuf/protobuf Foo :tag-set {"bar" false "foo" false "bap" true})
-          r (util/adjoin p q)]
+          r (util/combine p q)]
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
       (is (= #{"bap"}             (q :tag-set)))
       (is (= #{"bap" "baz"}       (r :tag-set)))))
-  (testing "adjoining works with counters"
+  (testing "combining works with counters"
     (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d  5.0}})
           q (protobuf/protobuf Foo :counts {"foo" {:i 8 :d -3.0}})
-          r (util/adjoin p q)]
+          r (util/combine p q)]
       (is (=  5   (get-in p [:counts "foo" :i])))
       (is (=  5.0 (get-in p [:counts "foo" :d])))
       (is (=  8   (get-in q [:counts "foo" :i])))
@@ -63,12 +63,12 @@
       (is (=  13  (get-in r [:counts "foo" :i])))
       (is (=  2.0 (get-in r [:counts "foo" :d]))))))
 
-(deftest test-ordered-adjoin
+(deftest test-ordered-combine
   (let [inputs (into (sorted-map) (for [x (range 26)]
                                     [(str x) (str (char (+ (int \a) x)))]))]
     (= (seq inputs)
        (seq (reduce (fn [m [k v]]
-                      (util/adjoin m {:attr_map {k v}}))
+                      (util/combine m {:attr_map {k v}}))
                     (protobuf/protobuf Foo)
                     inputs)))))
 
@@ -294,11 +294,11 @@
   (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
     (is (= 5   (get-in p [:counts "foo" :i])))
     (is (= 5.0 (get-in p [:counts "foo" :d])))
-    (let [p (util/adjoin p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
+    (let [p (util/combine p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
       (is (= 7   (get-in p [:counts "foo" :i])))
       (is (= 2.6 (get-in p [:counts "foo" :d])))
       (is (= 99  (get-in p [:counts "bar" :i])))
-      (let [p (util/adjoin p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
+      (let [p (util/combine p {:counts {"foo" {:i -8 :d 4.06} "bar" {:i -66}}})]
         (is (= -1   (get-in p [:counts "foo" :i])))
         (is (= 6.66 (get-in p [:counts "foo" :d])))
         (is (= 33   (get-in p [:counts "bar" :i])))
@@ -314,7 +314,7 @@
     (is (= 1978 (get-in p [:time :year])))
     (is (= 11   (get-in p [:time :month])))
     (is (= 24   (get-in p [:time :day])))
-    (let [p (util/adjoin p {:time {:year 1974 :month 1}})]
+    (let [p (util/combine p {:time {:year 1974 :month 1}})]
       (is (= 1974 (get-in p [:time :year])))
       (is (= 1    (get-in p [:time :month])))
       (is (= nil  (get-in p [:time :day])))
@@ -331,7 +331,7 @@
     (is (= "foo"        (get p :str)))
     (is (= :a           (get p :enu)))
     (is (= keyset (set (keys p))))
-    (let [p (util/adjoin p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
+    (let [p (util/combine p {:int nil :long nil :flt nil :dbl nil :str nil :enu nil})]
       (is (= nil (get p :int)))
       (is (= nil (get p :long)))
       (is (= nil (get p :flt)))
@@ -342,13 +342,13 @@
     (testing "nullable successions"
       (let [p (protobuf/protobuf Bar :label "foo")]
         (is (= "foo" (get p :label)))
-        (let [p (util/adjoin p {:label nil})]
+        (let [p (util/combine p {:label nil})]
           (is (= nil        (get     p :label)))
           (is (= ["foo" ""] (protobuf/get-raw p :label))))))
     (testing "repeated nullable"
       (let [p (protobuf/protobuf Bar :labels ["foo" "bar"])]
         (is (= ["foo" "bar"] (get p :labels)))
-        (let [p (util/adjoin p {:labels [nil]})]
+        (let [p (util/combine p {:labels [nil]})]
           (is (= ["foo" "bar" nil] (get     p :labels)))
           (is (= ["foo" "bar" ""]  (protobuf/get-raw p :labels))))))))
 

From 8b69e60472010ccb03233fa36fe5e3d4fbd12f96 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:07:30 -0600
Subject: [PATCH 393/525] Replaced protobuf? with map?.

---
 src/protobuf/codec.clj |  2 +-
 src/protobuf/core.clj  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index b0123dc..3292d7e 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -46,7 +46,7 @@
               (throw (IllegalStateException. "Invalid value in protobuf-codec")))
             (gloss-formats/to-buf-seq
              (protobuf/protobuf-dump
-              (if (protobuf/protobuf? val)
+              (if (protobuf/map? val)
                 val
                 (protobuf/protobuf proto val))))))
         (util/fix repeated
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index fc9ffad..0878e5f 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -12,13 +12,11 @@
     (protobuf Extensions
               PersistentProtocolBufferMap
               PersistentProtocolBufferMap$Def
-              PersistentProtocolBufferMap$Def$NamingStrategy)))
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map?]))
 
-;;; XXX Create aliases with def docstrings for all the renames below!
-
-;; rename to map?
-(defn protobuf?
-  "Is the given object a PersistentProtocolBufferMap?"
+(defn map?
+  "Is the given object a `PersistentProtocolBufferMap?`"
   [obj]
   (instance? PersistentProtocolBufferMap obj))
 
@@ -127,3 +125,6 @@
 ;;; Aliases
 (def ^{:doc "Backwards-compatible alias for `util/combine-onto`"}
   adjoin-onto #'util/combine-onto)
+
+(def ^{:doc "Backwards-compatible alias for `protobuf.core/map?`"}
+  protobuf? #'map?)

From 5d48a5190b936d302f6b9b6ab2056762bf13fff1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:15:26 -0600
Subject: [PATCH 394/525] Replaced protodef? with mapdef?.

---
 src/protobuf/core.clj | 74 +++++++++++++++++++++----------------------
 src/protobuf/util.clj |  3 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 0878e5f..ae68c22 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -20,84 +20,83 @@
   [obj]
   (instance? PersistentProtocolBufferMap obj))
 
-;; rename to mapdef?
-(defn protodef?
-  "Is the given object a PersistentProtocolBufferMap$Def?"
+(defn mapdef?
+  "Is the given object a `PersistentProtocolBufferMap$Def?`"
   [obj]
   (instance? PersistentProtocolBufferMap$Def obj))
 
 ;; rename to mapdef
 (defn ^PersistentProtocolBufferMap$Def protodef
   "Create a protodef from a string or protobuf class."
-  ([mapdef]
-     (if (or (protodef? mapdef) (nil? mapdef))
-       mapdef
-       (protodef mapdef {})))
-  ([mapdef opts]
-     (when mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (protodef map-def {})))
+  ([map-def opts]
+     (when map-def
        (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
                      size-limit]
               :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
                    size-limit 67108864}} opts ;; 64MiB
              ^Descriptors$Descriptor descriptor
-             (if (instance? Descriptors$Descriptor mapdef)
-               mapdef
-               (Reflector/invokeStaticMethod ^Class mapdef "getDescriptor" (to-array nil)))]
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def "getDescriptor" (to-array nil)))]
          (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))
 
 ;; rename to create
 (defn protobuf
-  "Construct a protobuf of the given mapdef."
-  ([^PersistentProtocolBufferMap$Def mapdef]
-     (PersistentProtocolBufferMap/construct mapdef {}))
-  ([^PersistentProtocolBufferMap$Def mapdef m]
-     (PersistentProtocolBufferMap/construct mapdef m))
-  ([^PersistentProtocolBufferMap$Def mapdef k v & kvs]
-     (PersistentProtocolBufferMap/construct mapdef (apply array-map k v kvs))))
+  "Construct a protobuf of the given map-def."
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v & kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))
 
 ;; rename to mapdef->schema
 (defn protobuf-schema
   "Return the schema for the given protodef."
   [& args]
-  (let [^PersistentProtocolBufferMap$Def mapdef (apply protodef args)]
-    (protobuf-schema/field-schema (.getMessageType mapdef) mapdef)))
+  (let [^PersistentProtocolBufferMap$Def map-def (apply protodef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))
 
 ;; rename to parse; change to multimethod
 (defn protobuf-load
-  "Load a protobuf of the given mapdef from an array of bytes."
-  ([^PersistentProtocolBufferMap$Def mapdef ^bytes data]
+  "Load a protobuf of the given map-def from an array of bytes."
+  ([^PersistentProtocolBufferMap$Def map-def ^bytes data]
      (when data
-       (PersistentProtocolBufferMap/create mapdef data)))
-  ([^PersistentProtocolBufferMap$Def mapdef ^bytes data ^Integer offset ^Integer length]
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def ^bytes data ^Integer offset ^Integer length]
      (when data
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
-         (PersistentProtocolBufferMap/parseFrom mapdef in)))))
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))
 
 (defn protobuf-load-stream
-  "Load a protobuf of the given mapdef from an InputStream."
-  [^PersistentProtocolBufferMap$Def mapdef ^InputStream stream]
+  "Load a protobuf of the given map-def from an InputStream."
+  [^PersistentProtocolBufferMap$Def map-def ^InputStream stream]
   (when stream
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
-      (PersistentProtocolBufferMap/parseFrom mapdef in))))
+      (PersistentProtocolBufferMap/parseFrom map-def in))))
 
 ;; rename to ->bytes
 (defn ^"[B" protobuf-dump
   "Return the byte representation of the given protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))
-  ([^PersistentProtocolBufferMap$Def mapdef m]
-     (protobuf-dump (PersistentProtocolBufferMap/construct mapdef m))))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (protobuf-dump (PersistentProtocolBufferMap/construct map-def m))))
 
 ;; rename to read
 (defn protobuf-seq
-  "Lazily read a sequence of length-delimited protobufs of the specified mapdef
+  "Lazily read a sequence of length-delimited protobufs of the specified map-def
   from the given input stream."
-  [^PersistentProtocolBufferMap$Def mapdef in]
+  [^PersistentProtocolBufferMap$Def map-def in]
   (lazy-seq
    (io!
     (let [^InputStream in (io/input-stream in)]
-      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom mapdef in)]
-        (cons p (protobuf-seq mapdef in))
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (protobuf-seq map-def in))
         (.close in))))))
 
 ;; rename to write
@@ -123,8 +122,9 @@
   (.getValAt p key false))
 
 ;;; Aliases
-(def ^{:doc "Backwards-compatible alias for `util/combine-onto`"}
-  adjoin-onto #'util/combine-onto)
 
 (def ^{:doc "Backwards-compatible alias for `protobuf.core/map?`"}
   protobuf? #'map?)
+
+(def ^{:doc "Backwards-compatible alias for `mapdef?`"}
+  protodef? #'mapdef?)
diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 2cef757..39e4769 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -4,7 +4,8 @@
                   ISeq
                   IPersistentMap
                   IPersistentSet
-                  IPersistentCollection)))
+                  IPersistentCollection))
+  (:refer-clojure :exclude [update]))
 
 (defn as-fn
   "Turn an object into a fn if it is not already, by wrapping it in constantly."

From bb784851bc76e3809912a81fbfabb587c7be70b1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:20:56 -0600
Subject: [PATCH 395/525] Replaced protodef with mapdef.

---
 src/protobuf/codec.clj         |  4 ++--
 src/protobuf/core.clj          | 14 ++++++++------
 test/protobuf/core_test.clj    | 12 ++++++------
 test/protobuf/example_test.clj |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 3292d7e..ba41c8e 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -16,7 +16,7 @@
 (def ^{:private true} reset-key :codec_reset)
 
 (defn length-prefix [proto]
-  (let [proto (protobuf/protodef proto)
+  (let [proto (protobuf/mapdef proto)
         min   (alength (protobuf/protobuf-dump proto {len-key 0}))
         max   (alength (protobuf/protobuf-dump proto {len-key Integer/MAX_VALUE}))]
     (letfn [(check [test msg]
@@ -32,7 +32,7 @@
                          len-key)))
 
 (defn protobuf-codec [proto & {:keys [validator repeated]}]
-  (let [proto (protobuf/protodef proto)]
+  (let [proto (protobuf/mapdef proto)]
     (-> (reify
           ;; Reader method
           gloss-protocols/Reader
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index ae68c22..639272d 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -25,13 +25,12 @@
   [obj]
   (instance? PersistentProtocolBufferMap$Def obj))
 
-;; rename to mapdef
-(defn ^PersistentProtocolBufferMap$Def protodef
-  "Create a protodef from a string or protobuf class."
+(defn ^PersistentProtocolBufferMap$Def mapdef
+  "Create a protocol buffer map definition from a string or protobuf class."
   ([map-def]
      (if (or (mapdef? map-def) (nil? map-def))
        map-def
-       (protodef map-def {})))
+       (mapdef map-def {})))
   ([map-def opts]
      (when map-def
        (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
@@ -56,9 +55,9 @@
 
 ;; rename to mapdef->schema
 (defn protobuf-schema
-  "Return the schema for the given protodef."
+  "Return the schema for the given mapdef."
   [& args]
-  (let [^PersistentProtocolBufferMap$Def map-def (apply protodef args)]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
     (protobuf-schema/field-schema (.getMessageType map-def) map-def)))
 
 ;; rename to parse; change to multimethod
@@ -128,3 +127,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `mapdef?`"}
   protodef? #'mapdef?)
+
+(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+  protodef #'mapdef)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d42b1f4..67bf089 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -6,13 +6,13 @@
   (:import
     (java.io PipedInputStream PipedOutputStream)))
 
-(def Foo (protobuf/protodef protobuf.test.Core$Foo))
-(def FooUnder (protobuf/protodef protobuf.test.Core$Foo
+(def Foo (protobuf/mapdef protobuf.test.Core$Foo))
+(def FooUnder (protobuf/mapdef protobuf.test.Core$Foo
                         {:naming-strategy protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
-(def Bar (protobuf/protodef protobuf.test.Core$Bar))
-(def Response (protobuf/protodef protobuf.test.Core$Response))
-(def ErrorMsg (protobuf/protodef protobuf.test.Core$ErrorMsg))
-(def Maps (protobuf/protodef protobuf.test.Maps$Struct))
+(def Bar (protobuf/mapdef protobuf.test.Core$Bar))
+(def Response (protobuf/mapdef protobuf.test.Core$Response))
+(def ErrorMsg (protobuf/mapdef protobuf.test.Core$ErrorMsg))
+(def Maps (protobuf/mapdef protobuf.test.Maps$Struct))
 
 (deftest test-conj
   (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
index 3dce42b..ab98569 100644
--- a/test/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -5,7 +5,7 @@
   (:import
     (com.google.protobuf ByteString)))
 
-(def Photo (protobuf/protodef protobuf.test.Example$Photo))
+(def Photo (protobuf/mapdef protobuf.test.Example$Photo))
 
 (def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"},
            :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"},

From 30bd3475c7cf9fe9d98e3024a48c1e7dfacd88b9 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:26:09 -0600
Subject: [PATCH 396/525] Replaced protobuf/protobuf with protobuf/create.

---
 src/protobuf/codec.clj         |  2 +-
 src/protobuf/core.clj          |  6 ++-
 test/protobuf/core_test.clj    | 94 +++++++++++++++++-----------------
 test/protobuf/example_test.clj |  2 +-
 4 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index ba41c8e..7f8a24f 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -48,7 +48,7 @@
              (protobuf/protobuf-dump
               (if (protobuf/map? val)
                 val
-                (protobuf/protobuf proto val))))))
+                (protobuf/create proto val))))))
         (util/fix repeated
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
                               :prefix :none)))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 639272d..e927158 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -43,8 +43,7 @@
                (Reflector/invokeStaticMethod ^Class map-def "getDescriptor" (to-array nil)))]
          (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))
 
-;; rename to create
-(defn protobuf
+(defn create
   "Construct a protobuf of the given map-def."
   ([^PersistentProtocolBufferMap$Def map-def]
      (PersistentProtocolBufferMap/construct map-def {}))
@@ -130,3 +129,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `mapdef`"}
   protodef #'mapdef)
+
+(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+  protobuf #'create)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 67bf089..d2b90c4 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -15,7 +15,7 @@
 (def Maps (protobuf/mapdef protobuf.test.Maps$Struct))
 
 (deftest test-conj
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
+  (let [p (protobuf/create Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
     (let [p (conj p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
@@ -29,7 +29,7 @@
       (is (= "very" (:label p))))))
 
 (deftest test-combine
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
+  (let [p (protobuf/create Foo :id 5 :tags ["little" "yellow"] :doubles [1.2] :floats [0.01])]
     (let [p (util/combine p {:label "bar"})]
       (is (= 5     (:id p)))
       (is (= "bar" (:label p)))
@@ -46,15 +46,15 @@
       (is (= [1.2 3.4] (:doubles p)))
       (is (= [(float 0.01) (float 0.02)] (:floats  p)))))
   (testing "combining works with set extension"
-    (let [p (protobuf/protobuf Foo :tag-set #{"foo" "bar" "baz"})
-          q (protobuf/protobuf Foo :tag-set {"bar" false "foo" false "bap" true})
+    (let [p (protobuf/create Foo :tag-set #{"foo" "bar" "baz"})
+          q (protobuf/create Foo :tag-set {"bar" false "foo" false "bap" true})
           r (util/combine p q)]
       (is (= #{"foo" "bar" "baz"} (p :tag-set)))
       (is (= #{"bap"}             (q :tag-set)))
       (is (= #{"bap" "baz"}       (r :tag-set)))))
   (testing "combining works with counters"
-    (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d  5.0}})
-          q (protobuf/protobuf Foo :counts {"foo" {:i 8 :d -3.0}})
+    (let [p (protobuf/create Foo :counts {"foo" {:i 5 :d  5.0}})
+          q (protobuf/create Foo :counts {"foo" {:i 8 :d -3.0}})
           r (util/combine p q)]
       (is (=  5   (get-in p [:counts "foo" :i])))
       (is (=  5.0 (get-in p [:counts "foo" :d])))
@@ -69,11 +69,11 @@
     (= (seq inputs)
        (seq (reduce (fn [m [k v]]
                       (util/combine m {:attr_map {k v}}))
-                    (protobuf/protobuf Foo)
+                    (protobuf/create Foo)
                     inputs)))))
 
 (deftest test-assoc
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
+  (let [p (protobuf/create Foo :id 5 :tags ["little" "yellow"] :foo-by-id {1 {:label "one"} 2 {:label "two"}})]
     (let [p (assoc p :label "baz" :tags ["nuprin"])]
       (is (= ["nuprin"] (:tags p)))
       (is (= "baz"      (:label p))))
@@ -87,21 +87,21 @@
              (:foo-by-id p))))))
 
 (deftest test-dissoc
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+  (let [p (protobuf/create Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (let [p (dissoc p :label :tags)]
       (is (= nil (:tags p)))
       (is (= nil (:label p))))))
 
 (deftest test-equality
   (let [m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
-        p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
-        q (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
+        p (protobuf/create Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+        q (protobuf/create Foo :id 5 :tags ["fast" "shiny"] :label "nice")]
     (is (= m p))
     (is (= p m))
     (is (= q p))))
 
 (deftest test-meta
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+  (let [p (protobuf/create Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         m {:foo :bar}
         q (with-meta p m)]
     (is (empty? (meta p)))
@@ -109,7 +109,7 @@
     (is (= m (meta q)))))
 
 (deftest test-extmap
-  (let [p (protobuf/protobuf Foo :id 5 :tags ["fast" "shiny"] :label "nice")
+  (let [p (protobuf/create Foo :id 5 :tags ["fast" "shiny"] :label "nice")
         m {:id 5 :tags ["fast" "shiny"] :label "nice" :deleted false}
         p2 (assoc p :some-key 10)
         m2 (assoc m :some-key 10)]
@@ -120,7 +120,7 @@
     (is (= (set (keys m2)) (set (keys p2)))))
 
   (let [m {:id 5 :wat 10}
-        p (protobuf/protobuf Foo m)]
+        p (protobuf/create Foo m)]
     (testing "protobuf function uses extmap"
       (is (= (:wat m) (:wat p)))
       (let [p (conj p {:stuff 15})]
@@ -132,7 +132,7 @@
           "Should refuse to serialize with stuff in extmap"))))
 
 (deftest test-string-keys
-  (let [p (protobuf/protobuf Foo "id" 5 "label" "rad")]
+  (let [p (protobuf/create Foo "id" 5 "label" "rad")]
     (is (= 5 (p :id)))
     (is (= 5 (p "id")))
     (is (= "rad" (p :label)))
@@ -142,13 +142,13 @@
       (is (= ["check" "it" "out"] (p "tags"))))))
 
 (deftest test-append-bytes
-  (let [p (protobuf/protobuf Foo :id 5 :label "rad" :deleted true
+  (let [p (protobuf/create Foo :id 5 :label "rad" :deleted true
                     :tags ["sweet"] :tag-set #{"foo" "bar" "baz"}
                     :things {"first" {:marked false} "second" {:marked false}})
-        q (protobuf/protobuf Foo :id 43 :deleted false
+        q (protobuf/create Foo :id 43 :deleted false
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
                     :things {"first" {:marked true}})
-        r (protobuf/protobuf Foo :label "bad")
+        r (protobuf/create Foo :label "bad")
         s (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))
         t (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump r)))]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
@@ -164,11 +164,11 @@
     (is (= false (r :deleted)))))
 
 (deftest test-manual-append
-  (let [p (protobuf/protobuf Foo :id 5 :label "rad" :deleted true
+  (let [p (protobuf/create Foo :id 5 :label "rad" :deleted true
                     :tags ["sweet"] :tag-set #{"foo" "bar" "baz"})
-        q (protobuf/protobuf Foo :id 43 :deleted false
+        q (protobuf/create Foo :id 43 :deleted false
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true})
-        r (protobuf/protobuf Foo :label "bad")
+        r (protobuf/create Foo :label "bad")
         s (.append p q)
         t (.append p r)]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
@@ -183,7 +183,7 @@
 
 (deftest test-map-exists
   (doseq [map-key [:element-map-e :element-by-id-e]]
-    (let [p (protobuf/protobuf Maps map-key {"A" {:foo 1}
+    (let [p (protobuf/create Maps map-key {"A" {:foo 1}
                                     "B" {:foo 2}
                                     "C" {:foo 3}
                                     "D" {:foo 4 :exists true}
@@ -192,7 +192,7 @@
                                     "G" {:foo 7 :exists false}
                                     "H" {:foo 8 :exists false}
                                     "I" {:foo 9 :exists false}})
-          q (protobuf/protobuf Maps map-key {"A" {:bar 1}
+          q (protobuf/create Maps map-key {"A" {:bar 1}
                                     "B" {:bar 2 :exists true}
                                     "C" {:bar 3 :exists false}
                                     "D" {:bar 4}
@@ -216,7 +216,7 @@
 
 (deftest test-map-deleted
   (doseq [map-key [:element-map-d :element-by-id-d]]
-    (let [p (protobuf/protobuf Maps map-key {"A" {:foo 1}
+    (let [p (protobuf/create Maps map-key {"A" {:foo 1}
                                     "B" {:foo 2}
                                     "C" {:foo 3}
                                     "D" {:foo 4 :deleted true}
@@ -225,7 +225,7 @@
                                     "G" {:foo 7 :deleted false}
                                     "H" {:foo 8 :deleted false}
                                     "I" {:foo 9 :deleted false}})
-          q (protobuf/protobuf Maps map-key {"A" {:bar 1}
+          q (protobuf/create Maps map-key {"A" {:bar 1}
                                     "B" {:bar 2 :deleted true}
                                     "C" {:bar 3 :deleted false}
                                     "D" {:bar 4}
@@ -248,21 +248,21 @@
            "I" [9   9 false]))))
 
 (deftest test-coercing
-  (let [p (protobuf/protobuf Foo :lat 5 :long 6)]
+  (let [p (protobuf/create Foo :lat 5 :long 6)]
     (is (= 5.0 (p :lat)))
     (is (= 6.0 (p :long))))
-  (let [p (protobuf/protobuf Foo :lat (float 5.0) :long (double 6.0))]
+  (let [p (protobuf/create Foo :lat (float 5.0) :long (double 6.0))]
     (is (= 5.0 (p :lat)))
     (is (= 6.0 (p :long)))))
 
 (deftest test-create
-  (let [p (protobuf/protobuf Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
+  (let [p (protobuf/create Foo :id 5 :tag-set #{"little" "yellow"} :attr-map {"size" "little", "color" "yellow", "style" "different"})]
     (is (= #{"little" "yellow"} (:tag-set p)))
     (is (associative? (:attr-map p)))
     (is (= "different" (get-in p [:attr-map "style"])))
     (is (= "little"    (get-in p [:attr-map "size" ])))
     (is (= "yellow"    (get-in p [:attr-map "color"]))))
-  (let [p (protobuf/protobuf Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
+  (let [p (protobuf/create Foo :id 1 :foo-by-id {5 {:label "five"}, 6 {:label "six"}})]
     (let [five ((p :foo-by-id) 5)
           six  ((p :foo-by-id) 6)]
       (is (= 5      (five :id)))
@@ -271,27 +271,27 @@
       (is (= "six"  (six  :label))))))
 
 (deftest test-map-by-with-required-field
-  (let [p (protobuf/protobuf Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
+  (let [p (protobuf/create Foo :id 1 :item-map {"foo" {:exists true} "bar" {:exists false}})]
     (is (= "foo" (get-in p [:item-map "foo" :item])))
     (is (= "bar" (get-in p [:item-map "bar" :item])))))
 
 (deftest test-map-by-with-inconsistent-keys
-  (let [p (protobuf/protobuf Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
+  (let [p (protobuf/create Foo :pair-map {"foo" {"key" "bar" "val" "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val]))))
-  (let [p (protobuf/protobuf Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
+  (let [p (protobuf/create Foo :pair-map {"foo" {:key "bar" :val "hmm"}})]
     (is (= "hmm" (get-in p [:pair-map "foo" :val])))
     (is (= nil   (get-in p [:pair-map "bar" :val])))))
 
 (deftest test-conj
-  (let [p (protobuf/protobuf Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
+  (let [p (protobuf/create Foo :id 1 :foo-by-id {5 {:label "five", :tag-set ["odd"]}, 6 {:label "six" :tags ["even"]}})]
     (let [p (conj p {:foo-by-id {5 {:tag-set ["prime" "odd"]} 6 {:tags ["odd"]}}})]
       (is (= #{"prime" "odd"} (get-in p [:foo-by-id 5 :tag-set])))
       (is (= ["odd"]          (get-in p [:foo-by-id 6 :tags])))
       (is (= nil              (get-in p [:foo-by-id 6 :label]))))))
 
 (deftest test-nested-counters
-  (let [p (protobuf/protobuf Foo :counts {"foo" {:i 5 :d 5.0}})]
+  (let [p (protobuf/create Foo :counts {"foo" {:i 5 :d 5.0}})]
     (is (= 5   (get-in p [:counts "foo" :i])))
     (is (= 5.0 (get-in p [:counts "foo" :d])))
     (let [p (util/combine p {:counts {"foo" {:i 2 :d -2.4} "bar" {:i 99}}})]
@@ -310,7 +310,7 @@
                (protobuf/get-raw p :counts)))))))
 
 (deftest test-succession
-  (let [p (protobuf/protobuf Foo :time {:year 1978 :month 11 :day 24})]
+  (let [p (protobuf/create Foo :time {:year 1978 :month 11 :day 24})]
     (is (= 1978 (get-in p [:time :year])))
     (is (= 11   (get-in p [:time :month])))
     (is (= 24   (get-in p [:time :day])))
@@ -322,7 +322,7 @@
              (protobuf/get-raw p :time))))))
 
 (deftest test-nullable
-  (let [p (protobuf/protobuf Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
+  (let [p (protobuf/create Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
         keyset #{:int :long :flt :dbl :str :enu}]
     (is (= 1            (get p :int)))
     (is (= 330000000000 (get p :long)))
@@ -340,13 +340,13 @@
       (is (= nil (get p :enu)))
       (is (= keyset (set (keys p)))))
     (testing "nullable successions"
-      (let [p (protobuf/protobuf Bar :label "foo")]
+      (let [p (protobuf/create Bar :label "foo")]
         (is (= "foo" (get p :label)))
         (let [p (util/combine p {:label nil})]
           (is (= nil        (get     p :label)))
           (is (= ["foo" ""] (protobuf/get-raw p :label))))))
     (testing "repeated nullable"
-      (let [p (protobuf/protobuf Bar :labels ["foo" "bar"])]
+      (let [p (protobuf/create Bar :labels ["foo" "bar"])]
         (is (= ["foo" "bar"] (get p :labels)))
         (let [p (util/combine p {:labels [nil]})]
           (is (= ["foo" "bar" nil] (get     p :labels)))
@@ -424,9 +424,9 @@
   (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
 
 (deftest test-use-underscores
-  (let [dashes      (protobuf/protobuf Foo      {:tag_set ["odd"]
+  (let [dashes      (protobuf/create Foo      {:tag_set ["odd"]
                                         :responses [:yes :not-sure :maybe :not-sure :no]})
-        underscores (protobuf/protobuf FooUnder {:tag_set ["odd"]
+        underscores (protobuf/create FooUnder {:tag_set ["odd"]
                                         :responses [:yes :not_sure :maybe :not_sure :no]})]
     (is (= '(:id :responses :tag-set :deleted)   (keys dashes)))
     (is (= [:yes :not-sure :maybe :not-sure :no] (:responses dashes)))
@@ -439,19 +439,19 @@
            (-> (protobuf/protobuf-schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message
-  (let [p (protobuf/protobuf Response :ok false :error (protobuf/protobuf ErrorMsg :code -10 :data "abc"))]
+  (let [p (protobuf/create Response :ok false :error (protobuf/create ErrorMsg :code -10 :data "abc"))]
     (is (= "abc" (get-in p [:error :data])))))
 
 (deftest test-protobuf-nested-null-field
-  (let [p (protobuf/protobuf Response :ok true :error (protobuf/protobuf ErrorMsg :code -10 :data nil))]
+  (let [p (protobuf/create Response :ok true :error (protobuf/create ErrorMsg :code -10 :data nil))]
     (is (:ok p))))
 
 (deftest test-protobuf-seq-and-write-protobuf
   (let [in  (PipedInputStream.)
         out (PipedOutputStream. in)
-        foo (protobuf/protobuf Foo :id 1 :label "foo")
-        bar (protobuf/protobuf Foo :id 2 :label "bar")
-        baz (protobuf/protobuf Foo :id 3 :label "baz")]
+        foo (protobuf/create Foo :id 1 :label "foo")
+        bar (protobuf/create Foo :id 2 :label "bar")
+        baz (protobuf/create Foo :id 3 :label "baz")]
     (protobuf/protobuf-write out foo bar baz)
     (.close out)
     (is (= [{:id 1, :label "foo", :deleted false}
@@ -461,6 +461,6 @@
 
 (deftest test-encoding-errors
   (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
-        (protobuf/protobuf Foo :label 8)))
+        (protobuf/create Foo :label 8)))
   (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
-        (protobuf/protobuf Foo :tags [1 2 3]))))
+        (protobuf/create Foo :tags [1 2 3]))))
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
index ab98569..83a83c6 100644
--- a/test/protobuf/example_test.clj
+++ b/test/protobuf/example_test.clj
@@ -13,4 +13,4 @@
            :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
 
 (deftest example-test
-  (is (= data (apply protobuf/protobuf Photo (apply concat data)))))
+  (is (= data (apply protobuf/create Photo (apply concat data)))))

From 3d44f1865be9ac3a6db8f5d4dfc2df68f760b833 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:30:35 -0600
Subject: [PATCH 397/525] Replaced protobuf-schema with mapdef->schema.

---
 src/protobuf/codec.clj      | 2 +-
 src/protobuf/core.clj       | 6 ++++--
 test/protobuf/core_test.clj | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 7f8a24f..ed9ae9f 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -54,5 +54,5 @@
                               :prefix :none)))))
 
 (defn codec-schema [proto]
-  (util/dissoc-fields (protobuf/protobuf-schema proto)
+  (util/dissoc-fields (protobuf/mapdef->schema proto)
                         len-key reset-key))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index e927158..e36fb9f 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -52,8 +52,7 @@
   ([^PersistentProtocolBufferMap$Def map-def k v & kvs]
      (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))
 
-;; rename to mapdef->schema
-(defn protobuf-schema
+(defn mapdef->schema
   "Return the schema for the given mapdef."
   [& args]
   (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
@@ -132,3 +131,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `mapdef`"}
   protobuf #'create)
+
+(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+  protobuf-schema #'mapdef->schema)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d2b90c4..f843c84 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -352,7 +352,7 @@
           (is (= ["foo" "bar" nil] (get     p :labels)))
           (is (= ["foo" "bar" ""]  (protobuf/get-raw p :labels))))))))
 
-(deftest test-protobuf-schema
+(deftest test-mapdef->schema
   (let [fields
         {:type :struct
          :name "protobuf.test.core.Foo"
@@ -405,8 +405,8 @@
                            :values {:type :struct, :name "protobuf.test.core.Thing"
                                     :fields {:id {:type :string}
                                              :marked {:type :boolean}}}}}}]
-    (is (= fields (protobuf/protobuf-schema Foo)))
-    (is (= fields (protobuf/protobuf-schema protobuf.test.Core$Foo)))))
+    (is (= fields (protobuf/mapdef->schema Foo)))
+    (is (= fields (protobuf/mapdef->schema protobuf.test.Core$Foo)))))
 
 (comment deftest test-default-protobuf
   (is (= 43    (default-protobuf Foo :id)))
@@ -436,7 +436,7 @@
 
     (is (= #{:id :label :tags :parent :responses :tag_set :deleted :attr_map :foo_by_id
              :pair_map :groups :doubles :floats :item_map :counts :time :lat :long :things}
-           (-> (protobuf/protobuf-schema FooUnder) :fields keys set)))))
+           (-> (protobuf/mapdef->schema FooUnder) :fields keys set)))))
 
 (deftest test-protobuf-nested-message
   (let [p (protobuf/create Response :ok false :error (protobuf/create ErrorMsg :code -10 :data "abc"))]

From 7dd20eb3ef48af49ab5c324c50ea592ab8e8862f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:51:02 -0600
Subject: [PATCH 398/525] Replaced protobuf-load(-stream) with parse.

---
 src/protobuf/codec.clj      |  2 +-
 src/protobuf/core.clj       | 27 +++++++++++++++++++--------
 test/protobuf/core_test.clj |  8 ++++----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index ed9ae9f..4928455 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -37,7 +37,7 @@
           ;; Reader method
           gloss-protocols/Reader
           (read-bytes [this buf-seq]
-            [true (protobuf/protobuf-load-stream proto (io/input-stream buf-seq)) nil])
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
           ;; Writer method
           gloss-protocols/Writer
           (sizeof [this] nil)
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index e36fb9f..4730b3e 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -58,20 +58,25 @@
   (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
     (protobuf-schema/field-schema (.getMessageType map-def) map-def)))
 
-;; rename to parse; change to multimethod
-(defn protobuf-load
-  "Load a protobuf of the given map-def from an array of bytes."
-  ([^PersistentProtocolBufferMap$Def map-def ^bytes data]
+(defmulti parse
+  (fn [map-def data & _]
+    (type data)))
+
+(defmethod
+  ^{:doc "Load a protobuf of the given map-def from an array of bytes."}
+  parse (Class/forName "[B")
+  ([^PersistentProtocolBufferMap$Def map-def data]
      (when data
        (PersistentProtocolBufferMap/create map-def data)))
-  ([^PersistentProtocolBufferMap$Def map-def ^bytes data ^Integer offset ^Integer length]
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
      (when data
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
          (PersistentProtocolBufferMap/parseFrom map-def in)))))
 
-(defn protobuf-load-stream
-  "Load a protobuf of the given map-def from an InputStream."
-  [^PersistentProtocolBufferMap$Def map-def ^InputStream stream]
+(defmethod
+  ^{:doc "Load a protobuf of the given map-def from an `InputStream`."}
+  parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
   (when stream
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
       (PersistentProtocolBufferMap/parseFrom map-def in))))
@@ -134,3 +139,9 @@
 
 (def ^{:doc "Backwards-compatible alias for `mapdef`"}
   protobuf-schema #'mapdef->schema)
+
+(def ^{:doc "Backwards-compatible alias for `parse`"}
+  protobuf-load #'parse)
+
+(def ^{:doc "Backwards-compatible alias for `parse`"}
+  protobuf-load-stream #'parse)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index f843c84..effd82f 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -149,8 +149,8 @@
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
                     :things {"first" {:marked true}})
         r (protobuf/create Foo :label "bad")
-        s (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))
-        t (protobuf/protobuf-load Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump r)))]
+        s (protobuf/parse Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))
+        t (protobuf/parse Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump r)))]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
     (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
     (is (= "rad" (s :label)))
@@ -201,7 +201,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :exists true}
                                     "I" {:bar 9 :exists false}})
-          r (protobuf/protobuf-load Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :exists]))
            "A" [1   1 nil  ]
@@ -234,7 +234,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :deleted true}
                                     "I" {:bar 9 :deleted false}})
-          r (protobuf/protobuf-load Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :deleted]))
            "A" [1   1 nil  ]

From 99eead330f2fd9596b2c42ce5b3af232410b475e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 01:56:57 -0600
Subject: [PATCH 399/525] Replaced protobuf-dump with ->bytes.

---
 src/protobuf/codec.clj      |  6 +++---
 src/protobuf/core.clj       |  8 +++++---
 test/protobuf/core_test.clj | 10 +++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 4928455..afe3335 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -17,8 +17,8 @@
 
 (defn length-prefix [proto]
   (let [proto (protobuf/mapdef proto)
-        min   (alength (protobuf/protobuf-dump proto {len-key 0}))
-        max   (alength (protobuf/protobuf-dump proto {len-key Integer/MAX_VALUE}))]
+        min   (alength (protobuf/->bytes proto {len-key 0}))
+        max   (alength (protobuf/->bytes proto {len-key Integer/MAX_VALUE}))]
     (letfn [(check [test msg]
               (when-not test
                 (throw (Exception. (format "In %s: %s %s"
@@ -45,7 +45,7 @@
             (when (and validator (not (validator val)))
               (throw (IllegalStateException. "Invalid value in protobuf-codec")))
             (gloss-formats/to-buf-seq
-             (protobuf/protobuf-dump
+             (protobuf/->bytes
               (if (protobuf/map? val)
                 val
                 (protobuf/create proto val))))))
diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 4730b3e..98c6324 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -81,13 +81,12 @@
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
       (PersistentProtocolBufferMap/parseFrom map-def in))))
 
-;; rename to ->bytes
-(defn ^"[B" protobuf-dump
+(defn ^"[B" ->bytes
   "Return the byte representation of the given protobuf."
   ([^PersistentProtocolBufferMap p]
      (.toByteArray p))
   ([^PersistentProtocolBufferMap$Def map-def m]
-     (protobuf-dump (PersistentProtocolBufferMap/construct map-def m))))
+     (->bytes (PersistentProtocolBufferMap/construct map-def m))))
 
 ;; rename to read
 (defn protobuf-seq
@@ -145,3 +144,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `parse`"}
   protobuf-load-stream #'parse)
+
+(def ^{:doc "Backwards-compatible alias for `->bytes`"}
+  protobuf-dump #'->bytes)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index effd82f..a58c884 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -128,7 +128,7 @@
 
     ;; TODO add test back once we re-enable this check
     (comment
-      (is (thrown? Exception (protobuf/protobuf-dump p))
+      (is (thrown? Exception (protobuf/->bytes p))
           "Should refuse to serialize with stuff in extmap"))))
 
 (deftest test-string-keys
@@ -149,8 +149,8 @@
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
                     :things {"first" {:marked true}})
         r (protobuf/create Foo :label "bad")
-        s (protobuf/parse Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))
-        t (protobuf/parse Foo (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump r)))]
+        s (protobuf/parse Foo (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))
+        t (protobuf/parse Foo (util/catbytes (protobuf/->bytes p) (protobuf/->bytes r)))]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
     (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
     (is (= "rad" (s :label)))
@@ -201,7 +201,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :exists true}
                                     "I" {:bar 9 :exists false}})
-          r (protobuf/parse Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :exists]))
            "A" [1   1 nil  ]
@@ -234,7 +234,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :deleted true}
                                     "I" {:bar 9 :deleted false}})
-          r (protobuf/parse Maps (util/catbytes (protobuf/protobuf-dump p) (protobuf/protobuf-dump q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :deleted]))
            "A" [1   1 nil  ]

From 7e276ba0c5b30cc15a14a61309f567c8eb1a7dbf Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:01:12 -0600
Subject: [PATCH 400/525] Replaced protobuf-seq with read.

---
 src/protobuf/core.clj       | 10 ++++++----
 test/protobuf/core_test.clj |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 98c6324..e3fbe1d 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -13,7 +13,7 @@
               PersistentProtocolBufferMap
               PersistentProtocolBufferMap$Def
               PersistentProtocolBufferMap$Def$NamingStrategy))
-  (:refer-clojure :exclude [map?]))
+  (:refer-clojure :exclude [map? read]))
 
 (defn map?
   "Is the given object a `PersistentProtocolBufferMap?`"
@@ -88,8 +88,7 @@
   ([^PersistentProtocolBufferMap$Def map-def m]
      (->bytes (PersistentProtocolBufferMap/construct map-def m))))
 
-;; rename to read
-(defn protobuf-seq
+(defn read
   "Lazily read a sequence of length-delimited protobufs of the specified map-def
   from the given input stream."
   [^PersistentProtocolBufferMap$Def map-def in]
@@ -97,7 +96,7 @@
    (io!
     (let [^InputStream in (io/input-stream in)]
       (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
-        (cons p (protobuf-seq map-def in))
+        (cons p (read map-def in))
         (.close in))))))
 
 ;; rename to write
@@ -147,3 +146,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `->bytes`"}
   protobuf-dump #'->bytes)
+
+(def ^{:doc "Backwards-compatible alias for `read`"}
+  protobuf-seq #'read)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index a58c884..efbc6b1 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -446,7 +446,7 @@
   (let [p (protobuf/create Response :ok true :error (protobuf/create ErrorMsg :code -10 :data nil))]
     (is (:ok p))))
 
-(deftest test-protobuf-seq-and-write-protobuf
+(deftest test-read-and-write
   (let [in  (PipedInputStream.)
         out (PipedOutputStream. in)
         foo (protobuf/create Foo :id 1 :label "foo")
@@ -457,7 +457,7 @@
     (is (= [{:id 1, :label "foo", :deleted false}
             {:id 2, :label "bar", :deleted false}
             {:id 3, :label "baz", :deleted false}]
-           (protobuf/protobuf-seq Foo in)))))
+           (protobuf/read Foo in)))))
 
 (deftest test-encoding-errors
   (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"

From 3747777ef54724521e0c7000c350f3beba1b407e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:02:53 -0600
Subject: [PATCH 401/525] Replaced protobuf-write with write.

---
 src/protobuf/core.clj       | 6 ++++--
 test/protobuf/core_test.clj | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index e3fbe1d..6283c23 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -99,8 +99,7 @@
         (cons p (read map-def in))
         (.close in))))))
 
-;; rename to write
-(defn protobuf-write
+(defn write
   "Write the given protobufs to the given output stream, prefixing each with
   its length to delimit them."
   [out & ps]
@@ -149,3 +148,6 @@
 
 (def ^{:doc "Backwards-compatible alias for `read`"}
   protobuf-seq #'read)
+
+(def ^{:doc "Backwards-compatible alias for `write`"}
+  protobuf-write #'write)
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index efbc6b1..43de862 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -452,7 +452,7 @@
         foo (protobuf/create Foo :id 1 :label "foo")
         bar (protobuf/create Foo :id 2 :label "bar")
         baz (protobuf/create Foo :id 3 :label "baz")]
-    (protobuf/protobuf-write out foo bar baz)
+    (protobuf/write out foo bar baz)
     (.close out)
     (is (= [{:id 1, :label "foo", :deleted false}
             {:id 2, :label "bar", :deleted false}

From 6347d12f08382b7380a78a09a0f8ad8793cfd9ac Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:05:09 -0600
Subject: [PATCH 402/525] Updated usage with new API changes.

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b9a6d81..a518f44 100644
--- a/README.md
+++ b/README.md
@@ -54,12 +54,12 @@ We've found a clean way to do this (and how we set up the tests) is to:
 Now you can use the protocol buffer in Clojure:
 
 ```clojure
-(require '[protobuf.core :refer :all])
+(require '[protobuf.core :as protobuf])
 (import Example$Person)
 
 (def Person (protodef Example$Person))
 
-(def p (protobuf Person :id 4 :name "Alice" :email "alice@example.com"))
+(def p (protobuf/create Person :id 4 :name "Alice" :email "alice@example.com"))
 => {:id 4, :name "Alice", :email "alice@example.com"}
 
 (assoc p :name "Alice B. Carol"))
@@ -68,10 +68,10 @@ Now you can use the protocol buffer in Clojure:
 (assoc p :likes ["climbing" "running" "jumping"])
 => {:id 4, name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
 
-(def b (protobuf-dump p))
+(def b (protobuf/->bytes p))
 => #<byte[] [B@7cbe41ec>
 
-(protobuf-load Person b)
+(protobuf/parse Person b)
 => {:id 4, :name "Alice", :email "alice@example.com"}
 ```
 

From ae7c49c0b3a947a83319ae6bd00ccbfb4a30c1ba Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:10:37 -0600
Subject: [PATCH 403/525] Fixed multimethod docs.

---
 src/protobuf/core.clj | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 6283c23..639513e 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -59,12 +59,13 @@
     (protobuf-schema/field-schema (.getMessageType map-def) map-def)))
 
 (defmulti parse
+  "Load a protobuf of the given map-def from a data source.
+
+  Supported data sources are either an array of bytes or an input stream."
   (fn [map-def data & _]
     (type data)))
 
-(defmethod
-  ^{:doc "Load a protobuf of the given map-def from an array of bytes."}
-  parse (Class/forName "[B")
+(defmethod parse (Class/forName "[B")
   ([^PersistentProtocolBufferMap$Def map-def data]
      (when data
        (PersistentProtocolBufferMap/create map-def data)))
@@ -73,9 +74,7 @@
        (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
          (PersistentProtocolBufferMap/parseFrom map-def in)))))
 
-(defmethod
-  ^{:doc "Load a protobuf of the given map-def from an `InputStream`."}
-  parse InputStream
+(defmethod parse InputStream
   [^PersistentProtocolBufferMap$Def map-def stream]
   (when stream
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]

From 252db7d3c63bfa2fb6b214f525983401a9e680f5 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:28:41 -0600
Subject: [PATCH 404/525] Added deprecation metadata.

---
 src/protobuf/core.clj | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/protobuf/core.clj b/src/protobuf/core.clj
index 639513e..5b083fe 100644
--- a/src/protobuf/core.clj
+++ b/src/protobuf/core.clj
@@ -121,32 +121,42 @@
 
 ;;; Aliases
 
-(def ^{:doc "Backwards-compatible alias for `protobuf.core/map?`"}
+(def ^{:doc "Backwards-compatible alias for `protobuf.core/map?`"
+       :deprecated "3.5.1-v1.0"}
   protobuf? #'map?)
 
-(def ^{:doc "Backwards-compatible alias for `mapdef?`"}
+(def ^{:doc "Backwards-compatible alias for `mapdef?`"
+       :deprecated "3.5.1-v1.0"}
   protodef? #'mapdef?)
 
-(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+(def ^{:doc "Backwards-compatible alias for `mapdef`"
+       :deprecated "3.5.1-v1.0"}
   protodef #'mapdef)
 
-(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+(def ^{:doc "Backwards-compatible alias for `mapdef`"
+       :deprecated "3.5.1-v1.0"}
   protobuf #'create)
 
-(def ^{:doc "Backwards-compatible alias for `mapdef`"}
+(def ^{:doc "Backwards-compatible alias for `mapdef`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-schema #'mapdef->schema)
 
-(def ^{:doc "Backwards-compatible alias for `parse`"}
+(def ^{:doc "Backwards-compatible alias for `parse`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-load #'parse)
 
-(def ^{:doc "Backwards-compatible alias for `parse`"}
+(def ^{:doc "Backwards-compatible alias for `parse`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-load-stream #'parse)
 
-(def ^{:doc "Backwards-compatible alias for `->bytes`"}
+(def ^{:doc "Backwards-compatible alias for `->bytes`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-dump #'->bytes)
 
-(def ^{:doc "Backwards-compatible alias for `read`"}
+(def ^{:doc "Backwards-compatible alias for `read`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-seq #'read)
 
-(def ^{:doc "Backwards-compatible alias for `write`"}
+(def ^{:doc "Backwards-compatible alias for `write`"
+       :deprecated "3.5.1-v1.0"}
   protobuf-write #'write)

From d88902e776ed392387309fd7b985d3bd63d76ce1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:22:39 -0600
Subject: [PATCH 405/525] Formatting.

---
 src/protobuf/codec.clj  |  9 +++--
 src/protobuf/schema.clj | 78 ++++++++++++++++++++++++-----------------
 src/protobuf/util.clj   |  3 +-
 3 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index afe3335..834671f 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -15,7 +15,8 @@
 (def ^{:private true} len-key :proto_length)
 (def ^{:private true} reset-key :codec_reset)
 
-(defn length-prefix [proto]
+(defn length-prefix
+  [proto]
   (let [proto (protobuf/mapdef proto)
         min   (alength (protobuf/->bytes proto {len-key 0}))
         max   (alength (protobuf/->bytes proto {len-key Integer/MAX_VALUE}))]
@@ -31,7 +32,8 @@
                          #(hash-map len-key %)
                          len-key)))
 
-(defn protobuf-codec [proto & {:keys [validator repeated]}]
+(defn protobuf-codec
+  [proto & {:keys [validator repeated]}]
   (let [proto (protobuf/mapdef proto)]
     (-> (reify
           ;; Reader method
@@ -53,6 +55,7 @@
              #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
                               :prefix :none)))))
 
-(defn codec-schema [proto]
+(defn codec-schema
+  [proto]
   (util/dissoc-fields (protobuf/mapdef->schema proto)
                         len-key reset-key))
diff --git a/src/protobuf/schema.clj b/src/protobuf/schema.clj
index 63b8540..07d2141 100644
--- a/src/protobuf/schema.clj
+++ b/src/protobuf/schema.clj
@@ -10,12 +10,14 @@
                          Descriptors$FieldDescriptor
                          Descriptors$FieldDescriptor$Type)))
 
-(defn extension [ext ^Descriptors$FieldDescriptor field]
+(defn extension
+  [ext ^Descriptors$FieldDescriptor field]
   (-> (.getOptions field)
       (.getExtension ext)
       (util/fix string? not-empty)))
 
-(defn field-type [field]
+(defn field-type
+  [field]
   (condp instance? field
     Descriptors$FieldDescriptor
     (if (.isRepeated ^Descriptors$FieldDescriptor field)
@@ -30,29 +32,32 @@
     Descriptors$Descriptor
     :struct))
 
-(defmulti field-schema (fn [field def & _] (field-type field)))
+(defmulti field-schema
+  (fn [field _ & _] (field-type field)))
 
-(defn struct-schema [^Descriptors$Descriptor struct
-                     ^PersistentProtocolBufferMap$Def def
-                     & [parents]]
+(defn struct-schema
+  [^Descriptors$Descriptor struct
+   ^PersistentProtocolBufferMap$Def map-def
+   & [parents]]
   (let [struct-name (.getFullName struct)]
     (into {:type :struct
            :name struct-name}
           (when (not-any? (partial = struct-name) parents)
             {:fields (into {}
                            (for [^Descriptors$FieldDescriptor field (.getFields struct)]
-                             [(.intern def (.getName field))
-                              (field-schema field def (conj parents struct-name))]))}))))
+                             [(.intern map-def (.getName field))
+                              (field-schema field map-def (conj parents struct-name))]))}))))
 
-(defn basic-schema [^Descriptors$FieldDescriptor     field
-                    ^PersistentProtocolBufferMap$Def def
-                     & [parents]]
+(defn basic-schema
+  [^Descriptors$FieldDescriptor field
+   ^PersistentProtocolBufferMap$Def map-def
+   & [parents]]
   (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
         meta-string (extension (Extensions/meta) field)]
     (merge (case java-type
-             :message (struct-schema (.getMessageType field) def parents)
+             :message (struct-schema (.getMessageType field) map-def parents)
              :enum    {:type   :enum
-                       :values (set (map #(.clojureEnumValue def %)
+                       :values (set (map #(.clojureEnumValue map-def %)
                                          (.. field getEnumType getValues)))}
              {:type java-type})
            (when (.hasDefaultValue field)
@@ -60,38 +65,47 @@
            (when meta-string
              (read-string meta-string)))))
 
-(defn subfield [^Descriptors$FieldDescriptor field field-name]
+(defn subfield
+  [^Descriptors$FieldDescriptor field field-name]
   (.findFieldByName (.getMessageType field) (name field-name)))
 
-(defmethod field-schema :basic [field def & [parents]]
-  (basic-schema field def parents))
+(defmethod field-schema :basic
+  [field map-def & [parents]]
+  (basic-schema field map-def parents))
 
-(defmethod field-schema :list [field def & [parents]]
+(defmethod field-schema :list
+  [field map-def & [parents]]
   {:type   :list
-   :values (basic-schema field def parents)})
+   :values (basic-schema field map-def parents)})
 
-(defmethod field-schema :succession [field def & [parents]]
-  (assoc (basic-schema field def parents)
+(defmethod field-schema :succession
+  [field map-def & [parents]]
+  (assoc (basic-schema field map-def parents)
     :succession true))
 
-(defmethod field-schema :counter [field def & [parents]]
-  (assoc (basic-schema field def parents)
+(defmethod field-schema :counter
+  [field map-def & [parents]]
+  (assoc (basic-schema field map-def parents)
     :counter true))
 
-(defmethod field-schema :set [field def & [parents]]
+(defmethod field-schema :set
+  [field map-def & [parents]]
   {:type   :set
-   :values (field-schema (subfield field :item) def parents)})
+   :values (field-schema (subfield field :item) map-def parents)})
 
-(defmethod field-schema :map [field def & [parents]]
+(defmethod field-schema :map
+  [field map-def & [parents]]
   {:type   :map
-   :keys   (field-schema (subfield field :key) def parents)
-   :values (field-schema (subfield field :val) def parents)})
+   :keys   (field-schema (subfield field :key) map-def parents)
+   :values (field-schema (subfield field :val) map-def parents)})
 
-(defmethod field-schema :map-by [field def & [parents]]
+(defmethod field-schema :map-by
+  [field map-def & [parents]]
   (let [map-by (extension (Extensions/mapBy) field)]
     {:type   :map
-     :keys   (field-schema (subfield field map-by) def parents)
-     :values (basic-schema field def parents)}))
+     :keys   (field-schema (subfield field map-by) map-def parents)
+     :values (basic-schema field map-def parents)}))
 
-(defmethod field-schema :struct [field def & [parents]]
-  (struct-schema field def parents))
+(defmethod field-schema :struct
+  [field map-def & [parents]]
+  (struct-schema field map-def parents))
diff --git a/src/protobuf/util.clj b/src/protobuf/util.clj
index 39e4769..5af176c 100644
--- a/src/protobuf/util.clj
+++ b/src/protobuf/util.clj
@@ -141,7 +141,8 @@
   [a b]
   (combine-onto a b))
 
-(defn catbytes [& args]
+(defn catbytes
+  [& args]
   (let [out-buf (byte-array (loop [len 0, args (seq args)]
                               (if-let [[arg & args] args]
                                 (recur (+ len (alength ^bytes arg)) args)

From b2b68ddbaa20b7b669a4b3020c28384ebccae6a4 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:44:16 -0600
Subject: [PATCH 406/525] Updated codec API.

---
 src/protobuf/codec.clj       | 32 +++++++++++++++------
 test/protobuf/codec_test.clj | 55 ++++++++++++++++++------------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/protobuf/codec.clj b/src/protobuf/codec.clj
index 834671f..b4f7f54 100644
--- a/src/protobuf/codec.clj
+++ b/src/protobuf/codec.clj
@@ -6,11 +6,12 @@
     [flatland.io.core]
     [gloss.core :as gloss]
     [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
     [gloss.core.protocols :as gloss-protocols]
     [protobuf.core :as protobuf]
     [protobuf.util :as util]))
 
-(declare protobuf-codec)
+(declare create)
 
 (def ^{:private true} len-key :proto_length)
 (def ^{:private true} reset-key :codec_reset)
@@ -28,11 +29,11 @@
              "field is required for repeated protobufs")
       (check (= min max)
              "must be of type fixed32 or fixed64"))
-    (gloss/compile-frame (gloss/finite-frame max (protobuf-codec proto))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
                          #(hash-map len-key %)
                          len-key)))
 
-(defn protobuf-codec
+(defn create
   [proto & {:keys [validator repeated]}]
   (let [proto (protobuf/mapdef proto)]
     (-> (reify
@@ -45,17 +46,32 @@
           (sizeof [this] nil)
           (write-bytes [this _ val]
             (when (and validator (not (validator val)))
-              (throw (IllegalStateException. "Invalid value in protobuf-codec")))
+              (throw (IllegalStateException. "Invalid value in #'protobuf.codec/create")))
             (gloss-formats/to-buf-seq
              (protobuf/->bytes
               (if (protobuf/map? val)
                 val
                 (protobuf/create proto val))))))
-        (util/fix repeated
-             #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
-                              :prefix :none)))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))
 
+;;; Aliases
+
+(def ^{:doc "Backwards-compatible alias for `create`"
+       :deprecated "3.5.1-v1.0"}
+  protobuf-codec #'create)
+
+(def ^{:doc "Encoder for a codec."}
+  encode #'gloss-io/encode)
+
+(def ^{:doc "Decoder for a codec."}
+  decode #'gloss-io/decode)
+
+;; XXX what is this used for? Delete, if not used; add docstring if it is
 (defn codec-schema
   [proto]
   (util/dissoc-fields (protobuf/mapdef->schema proto)
-                        len-key reset-key))
+                      len-key
+                      reset-key))
diff --git a/test/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
index f868fd3..f06097c 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/protobuf/codec_test.clj
@@ -1,64 +1,63 @@
 (ns protobuf.codec-test
   (:require
     [clojure.test :refer :all]
-    [gloss.io :as gloss-io]
     [protobuf.codec :as protobuf-codec])
   (:import
     (java.nio ByteBuffer)
     (protobuf.test.Codec$Foo)))
 
 (deftest protobuf-codec-test
-  (let [codec (protobuf-codec/protobuf-codec protobuf.test.Codec$Foo)]
+  (let [codec (protobuf-codec/create protobuf.test.Codec$Foo)]
     (testing "decode an encoded data structure"
       (let [val {:foo 1 :bar 2}]
-        (is (= val (gloss-io/decode codec (gloss-io/encode codec val))))))
+        (is (= val (protobuf-codec/decode codec (protobuf-codec/encode codec val))))))
 
     (testing "append two simple encoded data structures"
-      (let [data1 (gloss-io/encode codec {:foo 1 :bar 2})
-            data2 (gloss-io/encode codec {:foo 4 :baz 8})]
+      (let [data1 (protobuf-codec/encode codec {:foo 1 :bar 2})
+            data2 (protobuf-codec/encode codec {:foo 4 :baz 8})]
         (is (= {:foo 4 :bar 2 :baz 8}
-               (gloss-io/decode codec (concat data1 data2))))))
+               (protobuf-codec/decode codec (concat data1 data2))))))
 
     (testing "concat lists when appending"
-      (let [data1 (gloss-io/encode codec {:tags ["foo" "bar"] :foo 1})
-            data2 (gloss-io/encode codec {:tags ["baz" "foo"] :foo 2})]
+      (let [data1 (protobuf-codec/encode codec {:tags ["foo" "bar"] :foo 1})
+            data2 (protobuf-codec/encode codec {:tags ["baz" "foo"] :foo 2})]
         (is (= {:foo 2 :tags ["foo" "bar" "baz" "foo"]}
-               (gloss-io/decode codec (concat data1 data2))))))
+               (protobuf-codec/decode codec (concat data1 data2))))))
 
     (testing "merge maps when appending"
-      (let [data1 (gloss-io/encode codec {:num-map {1 "one" 3 "three"}})
-            data2 (gloss-io/encode codec {:num-map {2 "dos" 3 "tres"}})
-            data3 (gloss-io/encode codec {:num-map {3 "san" 6 "roku"}})]
+      (let [data1 (protobuf-codec/encode codec {:num-map {1 "one" 3 "three"}})
+            data2 (protobuf-codec/encode codec {:num-map {2 "dos" 3 "tres"}})
+            data3 (protobuf-codec/encode codec {:num-map {3 "san" 6 "roku"}})]
         (is (= {:num-map {1 "one" 2 "dos" 3 "san" 6 "roku"}}
-               (gloss-io/decode codec (concat data1 data2 data3))))))
+               (protobuf-codec/decode codec (concat data1 data2 data3))))))
 
     (testing "merge sets when appending"
-      (let [data1 (gloss-io/encode codec {:tag-set #{"foo" "bar"}})
-            data2 (gloss-io/encode codec {:tag-set #{"baz" "foo"}})]
+      (let [data1 (protobuf-codec/encode codec {:tag-set #{"foo" "bar"}})
+            data2 (protobuf-codec/encode codec {:tag-set #{"baz" "foo"}})]
         (is (= {:tag-set #{"foo" "bar" "baz"}}
-               (gloss-io/decode codec (concat data1 data2))))))
+               (protobuf-codec/decode codec (concat data1 data2))))))
 
     (testing "support set deletion using existence map"
-      (let [data1 (gloss-io/encode codec {:tag-set #{"foo" "bar" "baz"}})
-            data2 (gloss-io/encode codec {:tag-set {"baz" false "foo" true "zap" true "bam" false}})]
+      (let [data1 (protobuf-codec/encode codec {:tag-set #{"foo" "bar" "baz"}})
+            data2 (protobuf-codec/encode codec {:tag-set {"baz" false "foo" true "zap" true "bam" false}})]
         (is (= {:tag-set #{"foo" "bar" "zap"}}
-               (gloss-io/decode codec (concat data1 data2))))))
+               (protobuf-codec/decode codec (concat data1 data2))))))
 
     (testing "merge and append nested data structures when appending"
-      (let [data1 (gloss-io/encode codec {:nested {:foo 1 :tags ["bar"] :nested {:tag-set #{"a" "c"}}}})
-            data2 (gloss-io/encode codec {:nested {:foo 4 :tags ["baz"] :bar 3}})
-            data3 (gloss-io/encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
+      (let [data1 (protobuf-codec/encode codec {:nested {:foo 1 :tags ["bar"] :nested {:tag-set #{"a" "c"}}}})
+            data2 (protobuf-codec/encode codec {:nested {:foo 4 :tags ["baz"] :bar 3}})
+            data3 (protobuf-codec/encode codec {:nested {:baz 5 :tags ["foo"] :nested {:tag-set {"b" true "c" false}}}})]
         (is (= {:nested {:foo 4 :bar 3 :baz 5 :tags ["bar" "baz" "foo"] :nested {:tag-set #{"a" "b"}}}}
-               (gloss-io/decode codec (concat data1 data2 data3))))))))
+               (protobuf-codec/decode codec (concat data1 data2 data3))))))))
 
 (deftest repeated-protobufs
   (let [len (protobuf-codec/length-prefix protobuf.test.Codec$Foo)
-        codec (protobuf-codec/protobuf-codec protobuf.test.Codec$Foo :repeated true)]
+        codec (protobuf-codec/create protobuf.test.Codec$Foo :repeated true)]
     (testing "length-prefix"
       (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
-        (is (= i (gloss-io/decode len (gloss-io/encode len i))))))
+        (is (= i (protobuf-codec/decode len (protobuf-codec/encode len i))))))
     (testing "repeated"
-      (let [data1 (gloss-io/encode codec [{:foo 1 :bar 2}])
-            data2 (gloss-io/encode codec [{:foo 4 :baz 8}])]
+      (let [data1 (protobuf-codec/encode codec [{:foo 1 :bar 2}])
+            data2 (protobuf-codec/encode codec [{:foo 4 :baz 8}])]
         (is (= [{:foo 1 :bar 2} {:foo 4 :baz 8}]
-               (gloss-io/decode codec (concat data1 data2))))))))
+               (protobuf-codec/decode codec (concat data1 data2))))))))

From fcdf1f9348db1439f400ad301a6fba2adc2926f5 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:29:06 -0600
Subject: [PATCH 407/525] Regen'ed docs.

---
 docs/current/9999-other-versions.html | 2 +-
 docs/current/index.html               | 2 +-
 docs/current/protobuf.codec.html      | 2 +-
 docs/current/protobuf.core.html       | 3 ++-
 docs/current/protobuf.schema.html     | 2 +-
 docs/current/protobuf.util.html       | 3 +++
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 docs/current/protobuf.util.html

diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 7db535a..849472b 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index 2601bb0..a4da084 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index c65c95d..d963db9 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><div class="usage"><code>(protobuf-codec proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index eb26d39..77ee8ad 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,3 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><div class="usage"><code>(protobuf type)</code><code>(protobuf type m)</code><code>(protobuf type k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given type.</p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><div class="usage"><code>(protobuf-dump p)</code><code>(protobuf-dump type m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><div class="usage"><code>(protobuf-load type data)</code><code>(protobuf-load type data offset length)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an array of bytes.</p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><div class="usage"><code>(protobuf-load-stream type stream)</code></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given type from an InputStream.</p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><div class="usage"><code>(protobuf-schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given protodef.</p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><div class="usage"><code>(protobuf-seq type in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified type from the given input stream.</p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><div class="usage"><code>(protobuf-write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><div class="usage"><code>(protobuf? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap?</p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><div class="usage"><code>(protodef def)</code><code>(protodef def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protodef from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><div class="usage"><code>(protodef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a PersistentProtocolBufferMap$Def?</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index 6e13c0e..eb4acde 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
new file mode 100644
index 0000000..2734bc3
--- /dev/null
+++ b/docs/current/protobuf.util.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From 22c1331279a535b606907a07610aa59c99c620e0 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 02:51:22 -0600
Subject: [PATCH 408/525] Added logo.

---
 README.md                                       |   6 ++++--
 .../images/google-protocol-buffer-small.png     | Bin 0 -> 16441 bytes
 ux-resources/images/google-protocol-buffer.png  | Bin 0 -> 20451 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 ux-resources/images/google-protocol-buffer-small.png
 create mode 100644 ux-resources/images/google-protocol-buffer.png

diff --git a/README.md b/README.md
index a518f44..87e11fe 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 *A Clojure interface to Google's protocol buffers*
 
+[![][logo]][logo-large]
+
 This project provides a Clojure interface to Google's
 [protocol buffers](http://code.google.com/p/protobuf). Protocol buffers can be
 used to communicate with other languages over the network, and they are WAY
@@ -86,8 +88,8 @@ in the `.proto` file.
 [travis-badge]: https://travis-ci.org/clojusc/protobuf.png?branch=master
 [deps]: http://jarkeeper.com/clojusc/protobuf
 [deps-badge]: http://jarkeeper.com/clojusc/protobuf/status.svg
-[logo]: resources/images/Meson-nonet-spin-0-250x.png
-[logo-large]: resources/images/Meson-nonet-spin-0-1000x.png
+[logo]: ux-resources/images/google-protocol-buffer-small.png
+[logo-large]: ux-resources/images/google-protocol-buffer.png
 [tag-badge]: https://img.shields.io/github/tag/clojusc/protobuf.svg
 [tag]: https://github.com/clojusc/protobuf/tags
 [clojure-v]: https://img.shields.io/badge/clojure-1.8.0-blue.svg
diff --git a/ux-resources/images/google-protocol-buffer-small.png b/ux-resources/images/google-protocol-buffer-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..33c4e102e6292b9f8cc5e6776eb18e83078f78a0
GIT binary patch
literal 16441
zcmZWwb9fzJ6OL`0jhn`{)7UoK*tYF7wr_0R*l3c*ww)XM%kS@R{p_=Q_RP+^Gw;mK
ziBwXMLPj7!00RR<{wXc4^0j~YZ-s;T+D4q~2z>2eOk}0R!9M?+^SjEDzs|rrNNYQT
zfgxi4w}OLZX5)RGgmw8TF9ExQga^k(sJ=b=2Mml1?5DVhn#bySm#2^Vea`2nkN;Fx
zyY|XYh{a|reY8=C8fgsSGlkwzBfgxLIXB*oLq4|nDR(TZ>KV7v_Xn<=lkOOWN~r4Z
zRtxkAP*v*e@X;FoS{9K5>nx|c9(^`@gr>T*(GsXa*0ZK3q`q+-ZSH4JdkRgzzJGkb
zLgnW9zX>^FkVC}EN^{7p%F9GqSRy8zEXWEp6-6KUNhMeugg^lSWiJcV?u@5|NaD9r
zt|ai$Q@g$yAl7L+<#2~2I#zfu5zy2Riyax%A&r4YlXtMBGDBSAw}%D!v}~$S?QGb4
zY!~HI&{`=QV$TFM6RyiU=kpQIvl((kvMAb%y7yn|$__!`K}leh<d^mdtsi~zx6efH
z$4!opj!t2*WRzPJ5)4agsSlWN#2A4EN0p-|Umy4R7yb!Y=awNdHGxwODSz=R8!pVD
z#yJ}`{M5N~IQr+ZFeJIxjV=y81XxX2=wFBhdppT&<T)A>>Lk1rCZ#8Tl!&SDgwH|l
zd{D%o3W<WVD$aih4HoU{dRj-q|HG#jgCA%`k`O-nD?xPV5VA;oQrZX$KpCJHVx#T^
z)gUrJMuMht-5~-?8Ud*vS?iYI7NU`lzu;SbDPhJ{hxki$xj^HQa+W^KB39}Vciz@c
zaM|<fdzKX%1CDw<AXh|ci4$}=lsq<di`U%IhaUndAaJ*Nhrucu#$s(?rmIbtOBNBe
ztE_a}|0;T=pQbp~k~pI^^N$QVB0K6dqxU2tJMOeXn4DrK*-aVXjkbaSj6LP+%|fux
zx4}%@(Ar2f)a<$Kjql=fjxy7-2CLL?^*%?U7U;~rFfYMcT;MZx%rE=n_Qy~z<`K{E
z6-C~hN`y8}TJq0n#0X*2qqn<U7Qc#E!OiXow=xgm0fhJz^gEn`q|63I3G|L@%2J@F
zNNfH}oKC0wme<)vKiA`3q?X$hEvJUW5J0li#OJs@ZCP1EPDH<mjRN*%TYatx1C;mM
zXyhO{(LoE%5M)jG>TyA=i6sG-#fHWs7ILdh&7k+KKa?!7$qEg6#<sU~Tb7IAO=7+~
z!?4p>iuBl00sWq_5MWAtjB?jkMa&kJ(3bet?A!G))i6d`#c~vs&6I93Ll+?j(-5YC
zNY~3pdlra`?hD^sd$eTpB%23&D8+=mx~9&?kD$SKOne+H%-C4^kHj`r3s11gON?t<
zK24rL;hPUS1txkIUK<4W1cxW-@mk<L?R3y$aCf%h+%oP9h@#IUvuF6=8s#n!X}U~t
zIBX!q6fKo|@6>BJu2r6&(QG&-<GTk{ep+A(W%jAgMMQ5r#B{-Y;R^(Y{b=pV{QO1>
zo9x)Nsf$G@Tx)P98Z^h5ek0G!E9NDl5>rs3jhrq+QQp@4(bL24<l&#R{OTe2aE-!K
z&ed*up6`Ak1lvE^KYaZD4yV1W$1})8#!r&XZ$^p>3=7^CT64j^)LXj`Q4MmyV3gz^
zmOLKqA4nuiOu8g!BVbb`9q3eVRcu9oiUEsOQs*oEM_jFsej_#3wS8_EK~pH8Jl_?L
z49NG<W=jir7HbhU+VTrRl5Xz<e0==PV+QmLaJ_JcMC;)|BLjDE#Q?#`*oFNiTf0-p
zH}xZvz4l-1;(b?!4i^W)LQR`l2BM?1l1QdjFK!<;ohBwVxF~-`_r1hxAn6<!-BbeN
zDc?|1rRqO0pIu{hUyGH^HMcVq$i|m5|JHO79e3Fr{aAjML+2zZb<j7ouj_hy+mURj
zg>I+2-cCBxv6)$K=P1_?yw^Njvi*8|9KJ*Zwj6sj%e3H`FzG3BT~Q$xI+eftmgf>5
zQzw}&TZ7%;C?nibuo-t9j4g>_@VGtyJt>L)T3hAgzfzD&RcL?nJ<44{d5$?%IowUe
z$kW#S{*L#L-a&*Ydo&jH-q<#j7Bz&kJhcU?*_8)}4`*H8WFf!zaasHw2^I)bD*~cp
zF_F&N3>n~@6gI-y%jR7vK9y#`8{_!j2qgFY;&12ry$C6vW3|<W3tV1VK{}*GIs3J~
zLxH(9R`d+ufp4pjV0i{kD7iia1ql1>QnEVYck)q!0r&nIO0CASdB19aPyzML$S8MB
z;{%o{Zkn?6#|v2>i&U76Y>fk?xch7oDcroXvjg^OPo9?6M_pw-*G^KPk+lgKIL|PL
zQPU^YX}%d%LEKte<lIeIq%@AyG&!mL=m<54TuO>+b7fz=g{z|_&NuSsfvrtvLfl$-
zz-COfwL^Xxpk*puG)x^|S9hyx*-Y1S?3dy`DcUoULzJnJbo*nglHWI$_pxP5f{x1F
zb6SQ!K^>B=`DG?;f?ar$am7XlnIudG%DjkAmf|&+$$#68hwrABy|+vkQUNbl(9Osj
zEU!}y(L<RijM8&IIe-7&=A)OPJ?4mMFx44zfS*W1?}kgd0(0*zdZ7kvT`YIKmX+E2
zv2EHiu+ga2c@;tWUW*yfLvsieygZyxsSYLciSJV%4dtK&Y(PBjtPMR|6K);16o4q`
z$~W>+?nKJ<*`_IR2&wiKKMKm8#3aVbL@tH*zr(i8f!DdO^#E$5F8YI3ht&n@(xgRf
zgL!9Q6I%?m#dkV#A<({FCc@xoPvq!P;QqWiBA(@*Lf5=0rVOSPZtIorQMjdz4G7%L
zK%K%gPXTpVmE?|iPPRB-Gq#1;e5eHPRvtaWwXUo+d5&DnQ%TMLo8$ZNvMaJYSf{1F
z4EySETXPoiF%2@P;j61>>Sfi1E+`aR5L2!O>nB=bo@#l$FQ1u)tvlucQ;L6$w(=g7
zpX7oeee)O8ShPXboG|7R(?U!s%IUAzEDd0IJ7n&>A4&#X1uu%v&Bz=ZoLpVfpruj^
z8hx3d?rNa;Fcq(in?fG5O4sN{#Ph6(eR}d-eLu<-V8NfRyxPBx@BySUcEthCpq}Ey
ze4g&=$h9wTo~)?J1e!BQu-=^zxpd)|`^L5LlmI7WP0#eaThrKx(J4hKFJZ|Y?^oD#
zwQEx7DGAbCq9J3-EFbnU989_Q!a%H<`&+Rk(5aJhWvre3<(z7N4`Yd0hRc_jq|og=
zXO2geFmSCydP<y7c@(^&e7W|~9EBK5T*yh-PdPAPLh<eplHF(-F5=#>RbS>k{AigP
znG=)JKFF~Qvpg3|$(0G<{%_?*3hb@TwZPk7)IgcS?C95r{Sp<QXpO{vIGp8w4KnYK
z6|`8)`;qsw-1r5QYU5_Tsh_ESVFPjOA<6_^O7boUxbGG7HuxpvELk4QkgVvY%X3Id
zNBK<t-M$1R3w3a!V$Dyl2SQ;#@cka9DkmpimV~RpRi?uw4ne3HmxYr48rzN6&a%}S
z=3vY}EToAnm3f*0#MmWE6o*m~x(25%Nn|}Qtj5zQf9-wP%$e+FQkASSc_cuZJqgDi
z3_oyLgrF7N6ZmqlMuoiE>)gu@d!Eu#x_d>S|2}|zs%Ul6!9P<)w6`uz6{9$n1%|$5
z{_fAE{`<vx#tn<{`4e#6#kz|MJs?c{mJyxK$lM9QMtf$EpPMxiUfoKd_k&^XF0e~f
zv<R_|)(ixn*%Lk?=q{n#&pez7;70u+XI#WQ!JeIKOaBh#x&*kXVf{2NyqkMyC`_a%
zxQa@5f^DDs83+W?FE^^*ekK_3wP&kEv`lA<i^$iVU&a2m^e_R|MvpRn^(+~}bHQf0
zo$(-S3WnpDuZBOqe<7>G@F+yeUqZZl{|lpiyxjYrPgEX{$RPhu6&-`SpIOXB1<D&+
zT<TcU;M(bJ@HOu5gPsiogr5n&BO%E&Lr;>&{4JbU4M0D^eMjz8=*r;%&6l(cKfrGp
z#U+un2hRK>ywfC;ihikjM|hK+An<^hOYGOKr7Xg*Zs%W>(^6}@`ySmT)h~`xi0j3+
znnLpNU~9$Ah*=lLCMzeq_nP(*?F@*|LW4?Al0`T!kS&Bowpbd|gBD^1E-uHuK7J|U
zeJSY2K425H8@RX9135cnb$JUIV}7+TjWkl9)IX!x=CD9GnK%khicHuf#Qj2EqQu1B
zUt~vU4rL0NuFRtoQN628kB5*5FPkUH5tq}aV-uDsJ_!4WC?M33SEB-V%xjc!PKhn-
zr^@~{fDQJR9h+a%@AF0`F476obyxGBg9Lmy3lRMFL?(j8085Cn$WiVTRWt?IeiYFB
zzkv1f9Be8r4i%+W6J`U!uHr!t3%dT5wy9Q1W!O6CJ0{xNLSW1(gVoy-f)(d5%;~qx
zn(qX)!+eHFxL~+2bZNPepaKyjPgN5gYo^iYz85hV5IDH+w0g;tqq&XA+(7B?p#ivz
zSF{Q_6c_FpRIB_PGD2Z4hIzz?q51(rt_g%V`hpn$I~CC$?@P$7R_~YZlC}D-F578}
z^x~o=5pp7Q5Y&`TfM6fEpl)kPc+*ApJJz^aK9+{j(DU%genW6yk_DmiW^2SnyQf>&
z2VXr`7HGv<A@Z{M>`#dfYQcf!g>cxtu4tO0kcLTierKvt^Ij_9K@mYHVS4~Ac<9?|
z*!~$p0xTMxOD-^8d02R{aK6w@-A{iYIvffBjEJyAGnzjQ+~O&&D1-`l%M|;(xL}h}
zV4>H9WJAjU$I5mYorvxu%}mHsn%QdK$DmlLw+mj@7xYYFDtJY2KO`fT7fZd?NGVhD
z6|MFK8eN1D!-iIV2iM%#Ud8w|5<_Q%J-0ZvjJqjh>#{Ud7H;#ftR1l);UI8b03Pu6
zPHZnm1j0mki34FESb2w@W0xSJwU3CP&|c)n7j&%0yYmZPW@xT%F8N`Xc;HC3(#|qJ
zJ-%51XeFQ#7UxO(Nn|DlN2`1FykvrSMpf~@cm_Ob%IM#$aoHau=~mnG<jCzoFabi_
z?k)nnAJ1ugUZe&NB|8%a=(%{3OThG`w6@pGil-dMc>;vRMbiC1<^!u4MKEXdG46r{
z)SYY}BjH-w6O@&$95-bPNp2@5irX-^lqp2o$JKJ*y6cs&F5j*VHL|!PI#UgM=`7hz
z1A`!Ru@7+6YIi0+8a5()x5@|~l*Ea+_j=E3XnGV7IGC@cHeLD1a`Rd8=6j=&pENU%
zC9T)3e)$J#_Xoeftymt(-IoH;4dKHT6h>A94nWu?c<945Cx~w~pd_}cFK;{j&0^<E
zSa6pvL^r{?y)R*-r}{k>$W+6Bz1H-fK7y>z{Ffe$xv`^%#8c`OIgld5W^{k#|JJ0|
z2<@+3q+F7@g1d%EsHJckx)Bp>vH<2_&9qL_mO99rUZG@4M6C0$H(YJnR=g@b2P(hs
zq_4hQYy@bg<kLqG3@>&ue?zwOeirAC+^$s7(%qWq#Lcsl=#EOCc04{EL;)ouztl`H
zjXdsRRmp~&A5f*4OhWc%h#@#Fz^LIKEOAzyg9Fv7JgjW8zxdnKX~4z75S}SBJ!>g-
zIzhFFt}lr(`Dj~F5Pv<wUlBit`?V@|p`s!}5S1nc-t&G!kRG;Ln$g8bQo>aQcisiI
zYH-o8bHbyFv8|~IoA*K~$mFM2&RgaSX=Ss2wAEgs@MiHT87XaicjqpKPoyhq*##|A
zyFttwLL4BNDpa6dN9|Lecddu#0kyUT23@|sJfu0_qN}liQfcmvg59Rr$TgUH)gEHl
z2h~iY_E*JpOlztC8wPuga{wyVaSj9PXjKeEU1%0X(fH;o6-g^9`sic6m!+TlfMQ2%
z3s4J$c~F@Xr>D!*neEUvv0qz_%E?+qD@Z(P60)YOQ~xlx;ks050n4#D+x9k>522q2
zRs;U?t<)A*-!B@Uq(`$qGx#4n43UzrSn7X7#1Q;?Q$6jcWK}FnWGroV+`mpuxx_c|
z&F&)L6TA3_ftumpTH7~{Z!)Y`>wj88iD0RY|EY(?Xme(i9$tQyvH9bB`wmvS*;9x3
zek=Zsz>}r?KJvEuvMS!O>#5~0cL8Im{toW#8M(g%WBjISynm`y*HU{D=43prAU~2c
z8I0pn9a?UNMu*t{@TAi|)Dn6X-6hD{X{t|t^VpDx6dhvgC4zFMem?=tanA&mkmd#5
zeBaGh_Mu)Uuc?U8R9&bBoO)<l(=(n4Ceft|v4nmscyBceXA=`jL*gS1SvCY6YjMRb
zpACozvwoM>@pu#}KgC6~I_3H%;Q7Tqd#bBa99{3H3SYF>=w;B<(XE?}E+m)8M#}d9
z_+?4pF3>%+b6F)0kox3s+WklDd&u$sZeB$@IO8Pw1ilTxG94IQZQQg71^~$efQ5q$
z<-f06Q*kkG^mP0v*ngy(pAbB9yH4&M*DnO6=j&yB(&myaAtZ&<4nkjmn4yWy4Bt^!
z*jh{^U5)t!*zHs>ofiID-B0`+&7zl)6Oj+@DFTM{vydvBwVx`8Ef?vYp=aQuc27Ul
zK-F9&qiM~!p^n8Rdp@H~9xL!J#!`M*kXXTk+<xMZeny>YB3Ka`NPB_aGGY8jVrB<l
ztYO<#GrjH-NUw5Ery=k^yUz`U`2>W=+8mg8xVk0GK$rQ29%--|FbwBi<Xe?ipHw|9
z1wR6S%l}E`K1s`CmIzH#)&wp<@Bl^DAwvzZL;{M1AYl77iN@O;dw#Y_?Yzn<XUFdW
zH)xI~7FW2gthClflwSe-@3q{uYNjOgOykF^W(IHGe>3}g$FaRE2T4u*015FF<mQpS
zqufBhN%@-T4i{@L)ydD!Sq^&GRLu3CuC4xr?~Q9vVd`n=vj?P$mNT$Xjq~yF5aS+G
zV@(F1d1OLhx4%T}UJVLXtnQGLQ>g%>&k46E_JVx#MUFP|>17LEnEmefMA{5avFD-p
z_N{pFZ_gX2oU&(0U1YgO=VCMHl^oT&Rf691e93(t{2J^%q9>!X668oPkOKW@L2eh&
z&l6S`g>TJS59h!`R&s({axF!Jx>fm37a0L!^;+*EE3swz&8qTC!$5FV@FeHEzIvDf
zpLt5PWrYWhtL+2#ndfkbH~ox=Z^LUB0T_AbK5OBtq0p|eSzt|#$w6DNl|{pgZ4Mj1
z;XLjpGjI$c$Qqm`%~G^S?w9t0Y!S(|9a)(+M5gZT(FH4c@T}wUnY~znuc%+?9ZiUH
zS|(0A?990Y(D6S4IM=`oY#VAuilN@nkqa^PnFlnCn=b{ET9~E8HSa}yIDT6_pemhW
zRdO!M6}^WAlW&v>ol0<}-eoW5?^rt636BLE%(cLyNOP~1zleuwpAhRrDo_m~Z>wTx
zH4PgIBIh;-I~+T+t9t+ZdV0`?N}=HMH2>B2!QT;qezA&=0Ovh<u<=*o=JdXnaOMFM
zv(zrBDXA@T7a2kVd8ED^>1B2QKZa}9Si-6j75lXt+oEn|1=t<djDz1pET6`d+$cs*
z-u*boZXV2N4S|Sk00y`NL;OHDXdzSufFZd*iJ?Duo%bPDr0(7q>GsNZcMZMn*XXsf
zK^{<Ue+tP_b^><IiS_@v*8ZDrtUOtVr%xyeiyAoTffoI%N7zpJUE*VPm<!CLyEe3$
ziFd+*z^lOfP-@Qz)420q5JHYHB6%*o&n@J7*d@t#q0?-7J&LOo^8yZ9)$+A0+Ngvy
z{u9Q?@>y+?TsDf2r-bMD!z#kst>1rKN?4HJ$Py3Nra#)!pd&b&aFgO~=g{cGXP$`k
z9KcBX81HSN>U_;gV55Gy&pt04UkhU>FxCN(;3J_y!a_dAM=-)vH4D6cejRN;VWg1g
zL@)XkzI5ANwB%%K{lVDleNa;Ffi>SwPpu$^b~iJbkAW4Cwv!X;a5Kica;ff6)|BYH
zv1X>Qg@e@BOgb>Hz0g%IsCV6e#u88$GNUx89WpnAypd@1rYEidOUGMbd5+jJAO`x<
zk1gfvsykfHYM2{!_;%bAm%wVf<(aC$`UtJwJ**|Vf*7WYe=1rozN`lKJ6wY6>@;uv
zsysgxt0(S%Mq@anOGG_uit<=a)mGxZwaj*v1aeuKCG<VxHHU+{q#A_}h*J%3>T4*>
z@qk6CM2(tjUJRAvn2W*Nn2~MF0#t@}`7))t1JZx|+u%7XuZtAjdm0?4JVDb_1leJw
zQq$!T1sF(`6)a_BawIOA+cXHuahKn$7r#`q8kM#cX!{rhd`HVas`akGH_{xE__dsB
z=1#C%&`BHlwoVA^)RzxLVCaL&icmbHlHXsy=EOg`BM3UHJgPbcT*h0a_p94|{wO0y
z@~RUF&dYZ8!b#xyRV$thO+)VUv1tTXV}=`oA?C2546I?OvVC$^>>zd1*k&IT@S?DZ
z7m&ws5TVyg7)D+_KquIe{QA@r^gl=}#M#s3k0v<P@_u%^OG(h#>6+5O@=~|!Fp_dJ
znb(XXv`~hOMJICD^6@NniyhBvu>U~*=kDaUg$adJ-OPX;t(!Ac);5mI!FH=lEcM=w
zsx@CYwpsNLO3b>V$N<rlmHI-m!9=_@#-o0l&)zM*2pgqqRtd&oh+X9cChEy5epQUP
zL3dRU-cNEFaXR9;eqmEeBsX7(K_2PX87;=c7Q5$*Hd}@|m^`-XXf3{1<vcx3>mh_c
zYz(9h5ieZ<^EP~yp0lN$K<~oV<$lGd_rAVG_}wvqXg^yLrulwTN+>`2xb>vBHrwt7
zyr)USmeRb#HXqRuOqK!-l{7N=J(xb{rVvjDQ(r;Lf*Eag2B_N1bEPxjaDSq{(hv{u
zU;^GcEl0n}U2?tKsT&5V^?6)cLtM)C!@-k$(qa1!%f3he;DY*RL}Nm!6~7gS3!19`
zNsiLg>-ZdYCfT|ViB)vF>FXk)f{u!^KD`p!GAt-!1(q=7cLZJmVpq@Ja1~(e=49Kr
ze@UmQNf;YJS<2);MdgJ=Fu*%b2aSLHeqfC34fSaTyk^?P_hCA9ffomKNr(t~Ou{&y
z;=6o-+8Yid+c5cJC)0o!tT3NEfUm$a{p!Ny*R`R>Y4u<nh_~mdn~7@;JZh_XER~Em
zZ8Jew_F2{CA5_m2PR(pMWhokdT);&V(&Nl0pVy-F5GlofDKG)V6fa?osAWx~bLt}o
zZcCf%+pm;cp?BN)*33MTqGpw>oI}AmrPtqEcrYDh5N8ruOhi35v|n!mengJ38Z1v>
zuoS7bUWtNVgy}7Di#f{J;v1`l;o7L%O*#hU>gCc?pa;<<SI{HA7=R?Q2nF3`d}Fc5
zkB;A-$@%t@#D77#Xq_G&HK3YFfx_F_a#FcVfMJzM#Kp^_jzOE%YLCZ%7f*j!5-OZP
zbx12kKL7fYks)UO7U@6m3yr$Cv<ds>k$cTShVq~wGU?0<nD6dPK@KBE{Aj9~1+H1Q
zL1$Ym69$v`pu8aU5|HT_f;S0GE~G_lqVEV@c9#ej0VM~Z)nu{~a+^tpE>?r9C}uy_
z$6L?VEOSxC3CP25zM;H33%@@mAW}S#`NpE$k*&{NlEDg|`+W3IN)PN>DaUavL|6$p
zZ;KjPNp*VOPgf1PGl-s?Cqg}rtoMNDy_QF4jkFzeQCG~F{jP`_CGim81%*J&zmvA#
zLucqbcGdqk+*yVze)F%b$?PQT>JvFm^DmI0{Ea-yWP}5K8Hs`dY^pn1<p@rPtZ*v=
zj`Tsbq?n0ARwYkKt-DZv`WlfSu9B>kCK9slx4Dd9)y#wA7r`aJ@A))Dycp-qx#I(>
z=svCzyV<ky8^n`NAwM>VKpE(?C@!TAM#-U6(<`B>nH67u8b`1@XfS;i@G@uFCK{?s
z?@sw>${zRdxwnh0mrP*=+6MxqkqQ_?8#DL^2@m83=>9t0{X*@1XNLZ>jav#TOfZ%-
zi(x}9V^`%m-b7b`eGMSe?+{jT%&>IQo{HE!0IX^7A%3C96(YsA^FG3|i5QTg#vE6(
z3V$xY1H(eL*NN$7Nv3d8fC6@-9_D^P1baNzf4O)iZVS-(^{==7(T0Yq#v)r4AS;s0
zz^bm*a?BmJ^lj(gfa9vfa?UPeGO4b7K_gljyRx^_$^DIHp!^$5JBnceodn^x6%=TI
z)1Utk?r<y`ok}Jpbg80352#mfk2Gx%7+O2TN@z@G>d@dZb(GPEKgaz!Y0I-oU$=uF
z;6fdL0TWy1Fc*Wyazt%tUhL9GL__l++rV~7o87@<vxpjC3$rPEb7a&im8R`zNv}{*
z)dgrlj`N8;g$?*IwxOUC;I7Kw$iw#1)K2zHfB9hKETb-~v2ihC!w|6g0VbgAC|Z3f
z<;iy-(2*V~5KA>>lC84v=kbYip1{ZY1>7ZQBvkT3aJw4IK1Z2C?({M^{RAM(Q$l}q
z?(>kl?gn-?c5`%0(N~-?dM}Q?DSiI{Ux4X?yg?|b;CWqIVEaR%!fVeB$kZwLV`lG{
zjXbw<ujm$asP#yw5}H3mKh?%f6!C0J?oPtb1tNj;UX7OWg{s%q^*z{)S6Ts8<KUlc
z_N9eu2$86}w>~cG_|cisObR5{<vKiS$P#K}Ge-0WGp{o2Vo{sj8{ZalBZxLQe0uYp
z+->RzJ&3s})pZ8*@gjr0-fGU+{Wd?)4I+`5V%J|2cl7hBHc^>9PxLsabUB-Z!+m=-
z1L_mTn_=P}8X|S>*ijGfN$liVY_W}}>-P;v!MqwiH@Dym7<<(#&;hz=c{o`Tt|Q^v
zvp2>qt3*yzya$Do%h>nV+yVaz7U(p;gqUX>wT1n#q?KedkItHgcGgD_s%g<d78cT(
zdk?TphMXB-`weUGGec?P35ZYH*Q!f%v-fbjV$q2ALs_(NPi?Yk|CO-v51Z@n1Eq$0
z@-FLGqf)r+w0`5UPJKtWd$+!K$d}5QIr0%gq}`}Gn4x5&#WiRBz4pqIbn_fbG}Qs-
z$bSqa?M|~vJV)OQpTtHhml#LQBhG9v_!3KxlTWLId<=nLV5A-Y)dCz{PRYj<km|?z
zY0V56!Zb(TxHMk{emF84^n{zpWv7Q}uR3zNw_@GeG$qLSG*J2FFZHn7cxjZj%0?iP
zbbQ&dIY!j`I)~?+*G35*np8e~wP1XJd9?1quU1mt@5l9JUW=vC&AQ5*$Q?d<-zgk3
zciVkxT_HYKcmsO|Z}IF3%_0N_O%*M%g&Z!J12m5W<it1L9$n^Zmb?-0!YQ4)`=RN4
zc)SBIex6##vGVc(rFsbD8sLT&&c&9wwQ}u51W90h4B}!BF8`SLEjXh5C9nvI+;u$G
z-@~$~z-<T6Py{sQwGAgG+7V;i<ifV$IS0bwme|ct<w3WAM+mPJF8WRW3oJd5v2o>o
z?q0%!BINa;%^eg*R&>klThfv7=s3gTPgxf)uL-whALAHBwyb&kg_r-)f{nCxb(m0`
zEaL~LdiPTN>5on=icqVp@loYxf?XkT_A*xl8T0CRofX_uVjskrJFi3>&ElwIgCk_u
z6JXz}VB&0p<w-4B`Xn_c<~T4~Q&rjNU(2Bf+=r2p&iu7Jl}mqM{@9d_Ecf#S5#vM8
zUGuUA)yZT8$?NTR2X1%N)hD*cjakU)m;94XuhuqD(YiFZb1k>a#*KKtJK!8$2>B6N
zRn+W0Mr+GLz<J;QiEj*7{>Ey3>{y~00tn3Ism>RDQtjBBAdI|{-p#0^^`Cw$P*VAD
zD5r!4hVh4BBpInLSr(ODH~+!VaLH95`iYc7e49Po&QqXT1H1gj)gvrUSJOQvlC+!I
z(w4efi+uL3)}t08jbJ#-hxQ$t$#8w#`O{teGZ=-ekxVy>>PFlX`7Smvi2pkdi(_GC
zU($o~lcX&Av;^X4KaJFGU)=zUlvol&dc6Kq<@nB+LL8+HMwv*JLv1_y+|}<NF!J}J
zTeUjKf1(IE<P7JXOoZb<rUIa<Ew2q>bMYgT1im|><!#&$b+37$Z`pSy^bFtP85fEV
zjyz0Q$yUUK?BfK4c``8XE&|FrnwCDOOeWbA;46rmZ$~;p+wFzxVoz70J!xR>90uJK
zv*G`mkRIRCU^vzCsc9NS#_e1#nvfiGXDtrSWQe@NJE4h)Ki%z9aphtcyP;?7QqL4~
z9{VYY{(2Gky9Zs9Iv+-)-s0jeuur_!+m{%6d63|UJ*eS1_Gk~|dnT@@#?3N;jHKwA
zJEhM!RCP(92q#-J7{{O{B!}c5X$hPLW1sR?x<E6m${o+_F3;(xJ%IjKHY%swMW0$L
zwM`r-L}Ms)n>rc^N!)9A@UP2)`tlRKq-M*R;ihl!qz>J0)eZb}lQ&XmSSpFqk@b~P
zP3Tt*O8Rul_Z)9mw0@?!-P0A62dotG>%+P3Zhv-W+@BX~<#qo?+`R85dN#d+L`Fua
zH5+|X-t(s)!mTgxd7}fhHsg>jm1WU|?1kcUIFtD!@2$)I(rJ!<ZRbU$O)<iWdc{}t
zwEs;^7Nyr+m$?YaCL6k&Y$jVO>od1CXf@JuZ@<66-OtvVVY3j~r;iXY$LP9ZC%U3Y
zyYyLy60@9kjXSbtq~cG)<3;pZI0zBjM0}`(dRLjP9NAM|g3i;qoCZr_v?7g9>_Pwe
zOrAn}?F1V7ZD{*dNH87=P24MJ93cfkLu7x?MP4OHGCF`U>D0(MIUDEPUe+9OU++V)
zn;aSM-(-FBB4zm9fY*{!*mMDbuf1b7^txjEZ_ht^S45}a->fF~*wXJ^&Z&~k0{MpQ
zrF+~enMIzr&3~#`Wslf+lJp}{bs$&$n*8S}LWUp&*LFR98eK6yYwsyO&QU34cRgr7
zdU5F&#JdIc61=H3r!%0K`RDcu4gZ20jR!juD+kLRY)OBgevrOvYW;)YL(T|+wbTBE
zzKwjLkA;7bkX|YV>_%%k{sMJ}zoZ-B@G&626Ba`Ibd`j_@=le?iy<W+D=V5`Y>jrk
zX2Ivy8TCVQ#p&oi*M+fOgBbvA@iG5!FT+OH=*`PqEIDQPDOOf=u`L<6N$C#4eUga;
zMq;@iY8i=v?y1}_1ZuY2<?<&wMXtQ}>D>YZeZN5(aQ<t}Ay-xtAi3aAu5HCp#Y7I9
za{A`Sud1yGb<ZUwcU%cZc*yt|{YT9UjK=_1^{Qt>*)55~SDE1qXP?zpIl4+8FXTMY
zCWq;|^|w>xy+$+PorC0XZ!pOVluI=zNP(yMZ2KCT?z<?S?C9XKW#jYJ1LE`JVk8iQ
zPy~ggVUW}ebq?y3;!_9ca(M*KIcd0)rl#q2X8+1quf#wl^j=kT@$L6&p~d2l(UN0A
z#{CR33<lkKm2dr;m>*Coo|Hkt)7AP3OT;aj;*GE*E&&Pm*kq=E>|k=aiT3d^q`pm^
z)hqYSXs<~v+p>+Z)eooz@?=c$XVeDgM@It~jv(08s;|Eex{z;40(ba`9ce_^db+~v
zkYoIcSvE1<_g5xxno)2Q{fq2(M$|6FV}smkF&GW!CpX+D#=r%Bbd~L%Sk2hNc1XyF
zoRZDE<&5ipL3-Ac0Eb-Dgoce&2w~a0SfpE5PhT6nuD~kPP)}gQI=wY$7S?h=-<{_L
zMyXzln!^xLxutxgQafP}QhfUpu6Pc3a5Q-8EHE{D7cD}n8(fRSEZWw;E2J<gDJlf<
zEC<$ZROf+FCPvA>?1<B2CzRFt#@|4tVCE2dN{Tg1bA)W8QJH6(-Qy!5?C4tZyGqAc
zw$d_LwJojrz?wLeM(ZGYwOl`8;Ldv$*o+7{`X!=YKb#P<$CdZAidMAs<)r>hUe9$p
zDfUiA)M|ckZ)aSaj<24&ZjjIVNHVwXyYZXUnfOQLh3Mvub7y65ae`O)4d&3OKepyH
zU6@f!m&eZ%O~dA-Kh>rgP5srTLInx1jhnQ(^A=uY_MJK*L%(63-9jxpoo`LGl2&W;
zAtN4AJnf@jDxpXwq~*-3<8eUue@p;;f^y+uqiihw%WCK3Cj#f3>f(M%cft@4&kS#c
zRL;QRcmX-d@GNonLbduYXT;}BXSi;4inG5AwXZ61*9lQpjJ{uf%EoDxcLGmW;vf5z
zt^mO4*hOcxgzi0~&seHTd_6VUqZG2|i`U$x998%({qz3eYC{76G+OZU9C*VXW8So`
z(%Iqr_NqxGq#kx<Q)D3m=6R9R$E@>Q*b+(cV!GYn62uSwf@_Vt|Bhz#;(u;_p(%v|
z5pRGZX(}Kzx<K>UXxne!v*krz`#dm~s>Lh3NfQE#W(;5fHSU(A9z-&4GF9YW$a{>+
zm!2phueAsT_$V`t;<hTF{rfzH<|&@`yPA$3pWAS7yEpu|x);YakV~~9M4Q&|DWuD!
z)v;mGd?*tWQM{mG=xZ!RjR2b1Jsp<`2m_>kT(?P&&1S8yKl!O#EJ-Q(DMo8{<`aTU
z0!hK=P$ODqMG>s6a1K8zMhcK9X3SxL^|fVaTblw@@sfjvC&-%xjUUpkNn-YvQR#+%
zzELmm^L-lIrawmDv^SrRRG)0wl$_^U)VdkxqJA|!kqRLMSxQV_BIEcjQT?v(-ZNOJ
zVTEIcOfmy*x4{uiCyUXU<afZJ-1kG>MUi05_-gYh5kiPooA*ffNXS9{NAFjUbvl|<
z)`3r^szZeuW8kMaD6*o0QsRE_DaCaAv{e9I?(@g7rItKv+y`B;R5i_6rDh5b7JQix
z*GokS=||7Pu8|e+YK=E<f+GPCeJ{4`(M&;96uC`NRo-WM(Gyz7K3{B%4MQQ@{Ex9+
z^f???Px44#^fp-|GhT>XrDXa%fPTU&xA1czj#YdC*gpK@F&MEy#BNESlLBWD{UiMw
z$KQ+FfRhFlDvut8!;7B0R(_AC$O!EC-BX^pV@Q`iu~sD&{YbCZNT34O{=p+VZWz^r
zZ{Vk#^C)=k<?@+p_=SdIOu<7|6o6qR;qFv;Y?kK{uE7Xy*?Mb-%SGrKlJvQ6*mI(V
z#@|3k05^IF!6v)aWK_(c$&51>o?OcyyA?>|(jzu8dilgP*aJ{(EXCa)J6ov)<kjdW
zv_j<X=Hh%Q6xnVj7|rhovibxVtzR8TuBeot&7&OOakl_SaQ;YeSnbgeA1K6*>m$32
zYw)xTB8PpNhdshjmHlqv`MekJ^7%G-gvWEL=>M6KT{`Vgx9<2aJb|13pUcBOt=iQp
z>Fc2ECkrc%IBWI%k4fUUd|b`xzD7Z&%@1jew;s$LDPis$`(@)M-GAP`XP-8EZ&Dxg
zue~X!D^GYPoXKf+hDi^|%5O8SMwBs8IYX!M{;kvXv#0Hv6(=tcryF>uz=Y9FLbz4~
zj6tbV$XRP7nz23-#5_PJ+ar1aXy`9{{8-VBGwYLxV#qoBH_>`TKUdXnd;^`h#a6W8
z6;a*g4u+F2sNL+Ji5tFaXE^i2EG8ATUf(Wid_lonrt`DhSMUF1|IMyoLf!rh_Cfka
z8d+2diAgMFHm%3{FfD9@W5p}-=E4?bXum=5F=#CmN85Ynt)uM?0epss?0V{J&;K(l
zPV$9R5Nm=}!dzIn<`w*rx_@QeH-gr9;M+~=#g(G(p%H%`uD!hPHjSpH2^v8q3e1zd
zrKd+L-6Ukj@(9_Wlsq2>sfgt5cM5O&UU5Vv%wVz<MRV;Sg=<?aL4!tScjVrtA;$Dy
zKdi6*%!3o>n~mua95S6<99&_UDQCJ>5iwp9L&R5{g0$FQo(>h?TJGO_r-!3v%te7t
zXZ9*Ip9WrREY>T`pWD8u$!SwOOXX8Ii7P>RUdwo+F64Nk)vA%_72m#!k|L0S-d15C
zfr0vQR4d$lKRQpN;X;kY@1p|7{!bx&obQ{8Gk+FDeJS)9ba=gs!=E`uT~QwFnk!CK
zdoiPYf%R4g55Zj(zfOp-h?@lNaT#-h%f^QRVtHHpRH<oRk~QEpFd6hxR=F4wRAEc5
zoEhHq@LY<J$k3kNr}Fg*Ubl=I_bnaJo>}1ISHJhhJsuo26M5+JVGV#7eM&<1+Ow5u
z@C{ISN5WS{+;s~7bPO*5vFZ#<q^yh`_MDm65a^uQ-xLi&XEO7cqwMTco=-EV0k20f
zh@NVA#=N60fzI)N#eL^pOm>ULmfaZ>eV52?(90u(234lB28f&85B(TC^Un!w=Y1KE
zLOyOVQFLx*$1n8+;C>!$Ceq@}yuu&NW7c&eRJD#bBAjt*F#5j-3$h(>wSsmTQFCT)
zJFfe(p7(4~{kLDK*Zt>~>yGp-LSzH!;IB5ASSm76#3@5`OVL-@2y1UA#Ra!Acpo*J
zHLBM&9-G&5&}=Bx-7PQSKRaoN?g~!{(fiq{hZmzSdpy%`?hMcm+t5Dh;y-@`@q}e5
zpH_o*JF7FY-2B|el!q!c`CTx3go5I_X2a<#dhYR5f-mw4JT5NbP3T06;nKnMps;cy
zL?}{!pvji|LL_!M!?nsmle0i^{StdF7PD5a{IYcEkIcPyL$+jf4{_P^u*CUoUOy=4
zk#GN4C)ED^@erd;KgxshK&gUTC$TeKZU_Eus^>{1`D=pV)_;y8-}rTwr>O3M2-~?P
zBAdnm#eur7X8<2AIhC7UKmC|a{9#jC@>XteT2vla+UGj#d|dHAa0z~aOMtP82fT4x
zf#4YIi%Ami!B1;$<V|jUYA_3tmp>keKA|!vLHYqz6WyUVRb49k2@8SM%a2u~oI~g9
z?Di`x_7{#HvnvCX8j{fqJ~3E$ro)x1s?a>@;s}AFp*Ijkac|j*!h7i`gNI4={*oqe
zc0}ph<jl*L1%+Aa2VY2Q*Ckt)0X$f@L%Lx=o=VVYZjBBDq`dowPI*326aAf@U(g9B
zUoW+H!|Ce~U6@7%^YMSFFW`jYpzDb63hxOM$zz=&TQFFFWdJfMrE??p!B!AF%TdJ4
z+IpoWoP&gZNVyn5ns<wA+QBuaVyv)*E4_w*RraxDO~LZ#PZZ|WcCuY<f`KfodN^%_
z6~D13_}iE+6s4$5mljx=8<8*i$;R?1ir1uqIl;ar3Zx|CR7JXB8hsyK79>UE*$&3Q
zGn|f>&x?5Kb(gtX>K7SJOwMwmGiekq9CTVT9pH;R&ya6>mKmHDTxmS9fpAj0{}8&I
zdfOs76@~O;-4y=pvz=&RF7c`Xww|lEFmBD}`rmri5+t5Lm>z3CoPh38!wgWs{XyOr
zhpn|p0;u7^fmPuSp-u_4B86y$B%JFZdG`b!EOK{ZctT7b%gFranLZKpHg(6Jo(EYg
zon*^wHJ4M_cd*3UUFNkaD!$P+x(^6^e{5F-{VqLqCE5tSotc$j|AzU56@Wv*W*kL-
z%N6l{F2pZi3i@i8U^6xn+r-2a4Hy{KRhCBl;dv1R+=A45j>XaD63($F+CTAAnHTA_
zs-t5-R%g%voNh$I5XfZ#P(oov2n3X{>v?D$3kR%DMnB=}fk)uM%jY5Oc@A@+PBFKq
zs}4Tr&ZEF1>|Fj%l$<J|H<^V!tY?AFtn<~+2mg3{zZZN8P<)%u#tC<J#V;H*%G`HW
zP9P!SrpWL|Mnqn6x;(Cc@^tH_=W~(c0pA$pS9ap)X4)dJN#jQ0ka4B^jUy^;{oC4~
zuHla@ySaMjDMR}ZHVHG)T?H-Nem-K|sB>}xNipx6#+G~oL<1XsYC#G-hvQGB?p9N;
zA$mitR^}_l0EV6w>aVaWdmiUT;em0b<(wl5U^($%uDe|SwlLM-epHQ{PD^3Qvz!yh
zXZR0k-eueJ1E0_nbuWHce1tsY)!9k@5v{1-K)GA3mD!$HcxB^ngPZZ@PeqBYJ_oiI
zrZrLJd!m)@FWob(&GKI!-Vy{vOPB$JH!6gTaBptdHv6XE5JjOd1+eQg`VhEz>~3Wq
z8Y%%lzG4M;(%#7{7bRz@%lu!#BFT{U<vKM~vWIYAF?Ey>{R{N=g2B-V?{RjV0ALZ$
zr16^4eun44|Crz%jT6WhpiensYOq1x+3$Z9E76n3zuk(Qo9Y@oC99y#s%enjBL^N;
zc_fFMXo%p`wv;^Q=~lMK>dtWy5eDC?r(mW?WpK1I(t%L($p2uj@jSU2+U^Zr11!^C
zWF#s@xf?j%4Yy0ZZxt*ClUQ)Bc}U3n8VX_LeoC5*s}|IcT@ZJRS-JfK-p`H~UUGCl
zg1i;r+6@}B#5wGOXZCfhtm<NOSCYuzGy-DlGCgLzj5)2mTr=1hKAaj3{}s4$MYjmp
z-?f<LA#TMYhZL#Xv3<(uOY&!WAs?KE@0j1Ot9xweL8kYy+Xw<Kfsf-fkF7$t2mkm>
zl)X3q*%n$pTweYG1%`a9$#0jcNC(_FtGCJN<0UrSBoSrD%&Jd~tN)ah`sjMfu&2lb
zC*W1909@wsg=%68s=8Zl%7Ps{Hbuk>(Y_|ZG;4l0P@x+Lk6tvuozG#Y$-PxZ_xm=Q
z0qYjR%|pxwfpfnKMn110ewf=HvPxZGBGPfp5m;BYC+|7Xzx5R&>mo8cJ5~;gyIv4`
za?iwzNT5!pjz-i8`ftoay*ZD^CX#~Taxdq+aO86lld%AgPsAV8U@Et5EE-O$pp%;#
zxzwNaE`rv}z%6_#C90ToI?3E;40L7o+o@#fCHj^8ClH`%D{8V4K$Pfoj&*$Z3@8}L
zUI*{!;t%>_!`;@*^`ey+93td0o^v`M-FC*8s$gv0^@h9D#ny_T$yU^)G=#rBwktTi
zQ6p?8SF+}3_6Ejl4UD>o_JW_N5J!<;g6^N!Bu|}iV<D7Ic`*()8VrQFYcmNBM+gyx
z3RN83x*|d<8q}9B81bLN@a)sUOZ>jqtEfd7UWxv*?vjaqB_zJzVs>}%g^X6<Mw70%
z{Fisc_dfh!G2JTptUI*RhIP32ZyLSql0554O=i_haiZ5@)&0syRDdOu0Dp^1chv^_
zv}-0p<BszY*M2urGbtBesvJ+_T7TF_1WS8APouD(T(a!RNoB>|E7>Jp?zTZpPE&(H
zG$!$@ZfrC;2kd05{H0)3Cqv{C+B{iKjX{8vD%ia8vA;Uv+SF-;-;TPf#+?Ryd`!X9
z;T9EFePxppW7Q`*M;N04N0XcsTQGtYQ;mGYg!>zE<)^+@?|cOI{$_;2C-yao$C;!j
zhk4l<Nn_G7*0Yd}=5rSeoyK`;0-b{c-#IBXJAoS~zr^kbA9JGomUjKE2Y^zm;4+mA
zCEZpM<3Flo5cl$)dgX1p-xCdZd=9iILG~0NR4CWI9CvqKic#!M^*ig>+do@b{91Yf
zx&)OPU;pdInr@sVQ2&aW7Mbr|$adOG|8zZ|fo{i4MCH4>bV>K&uZQ?6Sb0qRA7yhD
z>uypZII5O@rkee2dHn^M5@WyVSUMdQo*}$;v4oZI@uBQ6A3;0ydw;ceiP&3G&&rYH
zEpgKY%HNLlzki<(Eu^wPtX6g&_q7kifT*@*A)ry*U_EQSKU>t_r`B@3{Tj}aT^$2X
zWbF#Ikq7}A#ebp8steM-XNa*w8gzJiUak9<qCZ=rKbPNLiV->>o7`{F`&8CjJ(DKc
zr#CdIWSSmZlNu&!;N~vE2>u?D58)e7F}!zBr2XtYR~}~jBpW>nK;>B@O=_}NT_Dw6
zAhpTvDfDI=k6cK#snJRNvy}aiYop>y1!2R#4TGbpserj3O~IOmmBYR7f|S4z4_N*D
z?~ayQfyt73EA3T-#{@X-Xp;0`>AKN6KLbVDuR)nh=ExJ1Pi+xzITWgTZ@E(jdaYnW
zOKr~*dm|)vm#I_eAbtbj#ZFWA2f6v01pL*eM}Rw%j>@w!%i$Fi07}7Kt5`j~TT{J~
z@xhX?Qp4`lx5{jc2<$6(P<(a6b5b}D3b!MtB%y(tpB5s^Hsn2G4OE2SLS*eXPMQT_
zlPFtXS!eg`)^Ebfq)iR!D5-O<cl$`Q4=2QG$W|U11-7x+Tw=GxYU_O~%W-`{4ywRt
z15YFxk&_8M2D8Qjpx-Kek>S?6ze5blfylQSNEL4Qpx?i5X4}7V+h=R&Y&+eRjjXH<
z_RJKmXkes{c*v({#51l@g6F!g*QL*WqA4W3!LYBxfCI4xU%gMvUVV3Er%j6(OV69d
zZnlEbw=3iU8*Udy3N8w#oL=T7qu{CVCHe-|F#YFQAh!LZAg|}iUk_UH*hWEli*}xw
zc-1t17sP)aNNT@;UG~4+KOh?$8~HP+=()g_BBcwg>yxA0<+kZ0{Lge>2Zx{Ifpf1O
zUom+(y@t^q8sZ%Bu~d1*<8&Xv5LbVgr>|Jot)Ir9#2hXV0y-OJn}SiHbv-z=58rsQ
zQ64BXGxk>F^4u4=TcB9C)Us{5!f#(<%?$ejTe-iKx}30WPJf?z^@#B0pQ!PTd6_Xw
zMD<2C;1Q>w7a@BZ0cSdUw*DUPdy0=Mw6^`VH8hk&lCj1Ewi9|qUt)kijnqi#isEI7
z*rbn?5>~zv<=yqVLg$XPX$?+-SwuQ@Td#b8Ww$C-EB|XQ_wBAfO<eLK?KuuS!>5#q
zj-06&pHTlH?w<dc97U2Hd_#^PUL5@b80n19X)$Zzk_3(g;XtNEN<%wjS~nL3d2=1J
zk@aYL)Cdr4G#%KJSfBYF|Hz2-2$Rc_CHxy;F1AoqvqN-Dqfz#@pNti=&d^?1)p?(I
zImCu})nlQ>o#Kivf+B>S${^0Y*1Rmzto~03><pXpdC}i<?oF!Y(Qn`@HZ(z6J?35f
zYDISlbxQ23@{{>9Q4sqlwdNN0IvTI$woiyjzFGnWnRf)II?b^~C@%DGHIKhKpNfQs
zwKk_~uqt#xGdO4SOCN{umPTKrX)qQwx4u$HBix_<wKRN07##h9<`Gk$3$BS(F)?gN
zPP`7e{bnhV6nbDusc{#DzX-=k(G66Vzh4sou3QH9{CyAh;$83j>`!K8Zm^XMxhCDo
zJ^ktSGxI;23h2{Sa&X}r)7n0MZ<?m?dr<z8o~KBZmd?w1Rl>d2**!anCTaWf4wD{~
ztR!~><+-R%KPX7ix!Isehc9{w0WUP$93e|;p0et#ubdy7hijy3Td#ky<9(uhiC<%s
z=S`XgZ;ZYJa`%wNJ@4lKQK4@1e@rPDyl0KjdgWuVL_|bDd|BQed&o;fKNbdtq*OMI
z7%rU<h(J~Kdn9oMTyFgxwLnMV;j!BpS^yvV3WANqy?$t`_&%euFY2=C!sX@p`o`UO
zS#Bih(=(kcL#(=pGIUeD6*Q^ewb$?y`r@>^m?_E~`%KEIjDZ{yB(|nzAz4s_a_Y-h
znl;$>aNtoNn*?VJ-*^y7bHP}06dJ!;2`;l1Py~ffM^O}j9(70!`XnNgB@@GDLhqw0
z;zra8;g-QVhTuhC4dhI~3AD)9R)2)+fKA+pIu~|r1+<XOLNpD&Y2C__dRILg9SNR%
z=u+(u#llR(Hs=$z;{XH)22a~<YMhMtX2JugKP`R`+H1oA<op~^c6C{XF~y-O*(VJz
zNiT2r{%Cj<nIulujg2CC7JQeWjIziN5oU!FrSJem&`W-6UqFk>hr=0?x>1jyB*2WI
zqqZW8Dw&8M;q5fJasz@+h6i#dN>H~b^jWspB49RG0eJsj)-X_8N>bYloMAiW!0Gh`
zNn_n2)uYkTMa0#ip%fRonLpnPKH=k~Nvhbp2`B*pw1ohT8*FU!4Q~JTPDd1%vJaIT
zF|HyUbf0-Z1e|2dFDJ#I&z^T)P6#v@6Ecs?0%(L{A%uK3%ZT2DbR4@me~BnH(ZhU&
zbnB-r&z`&kov(VZ3*_JA3DvK(OO850-+m_jw^Wm8NPzL?Ajo2T4e|&3DWM=<BWe`%
EKQ>D}9{>OV

literal 0
HcmV?d00001

diff --git a/ux-resources/images/google-protocol-buffer.png b/ux-resources/images/google-protocol-buffer.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ec165a7575b066c3323b148dc0a9d2bcedece73
GIT binary patch
literal 20451
zcmbq*^+Q$9^Y=jnq)X`*Boyh87EwSXrMo*6ymTrl9ZEM!DBYKoZcyTa(jjr_Zl1lq
zzn{P0;Rn%kHfCpDJM-GvIfkhy$>QTs;Xn|CFE1yf20^#LUvEKoFu|`w_px*E>$Z!u
zy!svR<9)|G6#U!BQ(gO=nu#038)qj=8+!|ecOGvn7@n%A@IcU=<fWI&g9@B|uQb`%
z`jq<z<X6-nbTiV&qza@8xiaYJ=(y;2xcRxc1#ic_kg9p2&h`_+NJ>imf|gycQ<2Ob
zI*b7+!|z#Bb52G;5CbGH^HkkEZF9!WpVs2&X3u44V5XT`Zc6bEOZH1Cxe6QUp19x_
zG8->GzAWG%8!J7(_w+uF>5t>;TO8MS+0kz2#mAK0N|D03op<utT*x85_+%*U-~wH}
zBW80uU37S$DHGvm$~&wVAZC?Mf(F+1|MAl*T8@OENgg}8*EQwUUk!t(Lp`Y@_>R8U
zKQ&JlIeIT*S*ods6kZlNC{~jGrjct)+{YF>{EAX=UxWQVb2E-bXb(BDCcd;LwhljY
zoQj5qOhwVO;$2rS=^4vu2WD}Z-#?1BHZ6XK!NS9;UMu~Xs*U{atG5QLeOr>_K%r5*
z`uTI~(Tx+dyUh(j!V|ywzjpD?T5~<3cQDO;G_U&Lha8KI@e-z~9nqev>&z5=k?nVQ
zSkMG_FVgZ@B)Rdad1-i}7w28CFqeh!BTnUab&eQp8Wa#@TJ~0RDJ!j)LiJCk`rI>S
zui%_qZ3q5~Yh#4ZP~dONHZHX+F5Tb^@}o@64G;K0znFmg&yTJM52zCl9g+$ZR8EJx
zlvJ!T^#7(fc8>^JxbEY9Ax60X=X4l&53{{YD7_5ygr_*y{2txt4wg8b*F-o#oe(<I
z3RSoG_04DKE8kc68p~;4)k@WSBHOUdVOeCGb53%$&xTd;OH7aMGgiOs^qE{LQqaHZ
z2Lz2^O^AK{?%-m{gs~D*vB4Z)7TZC;0>_;-4`^m$>W_4%JZmDXxk&FnsXwSUL>NHw
z!Dx^%wcwB~&0RM7obRv0*0@zu<rcN-w%<3GOI5ytw~2YijL{XamDc%<%qR%Kw{OXj
z;DPP&H~n<+Z1h?G0LibfDl1Kk;h=}Lbr#3>Z@rByix!EY=GPxn@v_HEApbaXnMRX|
zx)-=-q5f-k9!SW@@Rl?%&=oyp>msb|G03*qu}!KuH))O;gON+6aYItQ?zx3;3wB0h
z$@a059LU1(U^BO|vwvXnIWbbs5TAN?_ju9I&Wm7Yjey3gdO|L38PW?pjC(wJuA!kj
z^^Wh&U*k)gdXAXEJJlTvjVcyB5Q<QcKN|E=>Ca(rWLHyn%z1ZAHx_(5AYpW#{_DFB
zVSZP;EQB}hFajxc)R@-k;%^^Wwa0%ty}#MNUE-A`Oo^eaB89l{wfqs|Meo@LBb1T=
z4Q;EHoTkGylr(XaP3Qj1!3Yz`D&GjK97Y>HF%p0Gvq(t)1Ue+ggycTK_#Oy_9%mFR
zW)2L*gQq}Mc?vy=l10mo6wPm7`N#+U&8-j=W;HlCdmcGFT<$-lUVi_%_Z*D0Rj|-C
zX${tqJjegY)4C8z<G%$=9aimnocA+soNo+w75n180hlNp^Tv35&hn~4a=u(zjtLKn
zVFPfmzxrLY^s0?d!#p^2K2udr2;VcwI-u;@v}aM4-Z>q8SNXL49!Yk!&ElK=56a0u
zS(C0X5#mr#mPwg@gx{2WH6p^%X8r99`WJk3NVwYf?_^j?uFLqr-$ji^6<%qF`?*G`
zt2a3&dlj$}mn?o@@JXH5@hyg;%G}DsEW@dbaI99!al^m6RG)Tb@x$r724DmUWOxu!
z>cm$bfz8BBS}Gr6p(C_QRst6{)uej!$t%K}aTsm_CLW~nrgS(>nEBa{)kj&wWjlnf
zGw3nq-;WuR^?5g&Lmb^^Zgm2o?hXV~zJ3v$a1}?D$-*>V;syQcc%(l#HC-DbzB?KD
z${ZN*)EM&bL0PL`W;j<$qN_Qfej81W4_Hg#%|hApZ%%CtkZKzQ#ZC!-dwY_$F7#?$
zy|I{(LHGNQ+?0Or%7uUsM^`W%8alLGymb|Mzo2_aYq4^dR8lIS@G<GvgW$)8<sC4b
zJZemcqD&}-D&$<oh~=k?+~rH4%rAi&JB&l=LiT$bpGx!?(gAc@ss$qp8Cx#<iw-e}
zTP6UY3e`03*VsjFHWG(xHEqJNeqo?PhslGiI(~jj>z3yZBz|>BI><d7Q+!~bbi4R;
zXatLXdP4;37m(?&7fxwrMcVsiVD@Q=9yD)o+vFjxkI&jjlW#x5h#o!^VBQWvf2vLX
z=J7lkRS5EkLXtsi)cE%I>~@obFX+!wkz{g@@t`urt({C>;Xm;WY<I==I!*vmrEUs}
zcn&mZ_O&+j=nRo?tT-%m=o0Jx;?XE;nx*;N{n%`vaRy1M+j?TrtAw-_h~YOn&@2IH
zq<}n>$D+n+F+V1FJ97*AsW$p4<IIXsufjeEOb6^MMg8|xQ9o>|R_^`q{5wghJvDr3
zwVPGxbn>xUv7ZZYtm!sLW$`yb>KoIwspyV)Vz4&gIeyq>?B)m0H0%o^IOhp4{Yk1#
zx)NdoEd2&EP8boK(7YUlp@yNM>vmQ{qT{>tTYK%0%KP7zieeA(j<A?`dtkVb@Yf%@
zW)k@(dwr?;`BIJCP(lohk9E_gNGsHxPrnwDs?dJiSdvq*Nt1@pMoR&`Y)viQrM-EA
zduF=-r4L33F~?(`2b*smo<D!M1Aq|}f|k`&oGxxtMZQL_c&Y-Vh#{a^D|N0u{9@p!
z_j3h~frEuEMQrCl<(KmD>aNiyy8rbr2KR~Kk=|$I#k$+zJvw;r>GQXP(IUXWQi6U5
zjsg8r&~Tv%H2T(Z6HCt<TfZG(Z340J7LQU#tK`lt)%!xBINxS-H~kv_Z9hE*5en#I
zN4TQmz45A*3yytC;vaKbP^czRO-eq!gZ5>QG=iN7-~R6NEQjM|AGRJtr$zcrFwMtA
z%%WH4Tj%XsKH*%<uo?8TA5e_5L*;`Z{PuaFx}Sv5qAA(qF=ug$j`ZlNddGl(b|^+|
zcxbA@J3k}c&s=)7&JoT3S8hNvqs5Qu^Pp&nH8=()Cb|?()6t6-3?{=|05>*+q7>3f
zuCck=eex2$tQ&49Zvb8xA65S9)T^<Z9wNDqS8886y<h0F?OlR^;T+Op`X_KRIi~U)
z>)Fnp)%DXuab34OCs`#N<@%qM0x6n*yokH?4?;)3HQL@KfJyw_%*ejqKaO^&J6ULH
za15X&MWB`WI8?IkkiNrEC_h7&`o(jB{~c~VW3nW<0mpE~LzjAAJ(PADz<r1ApAW}{
zq%uPjT#`?^C%(R&<4Lnn;=de}FPK=5Z_c4IWNJ2+L-$wb#dYd){ghtu=hv5+6218r
z6G)E2&VJxK{ar)HwB%KwQU<4@{<e?1Y>oVE9^4RfPnS;Qhxci-a?O&X0De;HkIKk9
zR-d$Q`<zlDICq^WAQIETh__zuFKXjYv4A$A&=iaxFNS)49))X)&BHNf1CjmMBZ5B8
zxmHzoQzfCh509^Y+}&t{y=J9dLcK<7EkEKT5aGzn3hJN-aDuY3I!eo4Z3ov-Mq0s@
z(C{FoV#&*S<=ZBIEr|;OWFaCf;yJ$04}TM6zG+5&RtxchXlzm?uI(Poc9w`jP}=&I
zO^M%pIkmo30>>Ooirv=1wsB16x*LWC`SU&9{%Ard=9-I)Pzy$5crh`(SzY3{=S(6o
z1D5ySYtCrz_hAFDm+S}nSP37kRyPew^gK&h7UB(R0ZaQZD9Q7NPzrBiNTNX3*+MA3
zyAtfXf6rClU}v@Jrgn{~Ja%FA5Cg#gj5v8oij@fASYKs_OvG`y#j;LbqGi1^IZ$TC
zgD@&ghVn%4y>=c9i+234HSP&?w>9`l{6^dMyyJc&JMbM)+K<1P))Wv^4T{$><Tc2f
zR{+pJR%K_bbcPr-+4wFG##a({e*7hbSnyN*IOgg6LmNdbUb4s^6PV~9VEK~-4@wHW
z!DP5KF`3k>jv<6|G5SBLHMpVW-oNox6G2+o2Q<I|Ktsj{%CwDl*p!P2BO1~=Gm&t>
z>?rN83j@&@2#ZI%uVQ*6+y7~E^71uqB7|As&{c;kcgY3chM+f?seVNZ;t=|Xh}oi;
zDg4*}8WN&QNrFfwCN1wozW4U*HuREI@FvF}EsI{)N}1-{(_Jl8JOL^roxBXk#PpZ=
zjS6Y@QVN~_{3n#w`qxPP4XH7`y{(9Qe%g9EN|EL!2VB5;xVBPJ^NBCc3@k^ZJofx;
zFmfREl&kR!!}*tP!+0bC1hJN#k#pife|`#9?zy~h{`$XX0@JroA5RRXarg5#Ds*&{
zlcHrE8Xs_ZQb09;T};ousEY9MD?{zkNiZ4q>H0CP;6So^{?~Br%NZ0TItWtzdRt#Z
zPG$%4@3-fb>z3%Dmn4EWaqrRQ9dvi7Pw<Z$3G0DsLTSOn4_?shFA=-T3xRI8P%es(
zP*xR~O`ZY@wO%47b;WhAiIWM2qc+k#&{|_(a!c3D>_N}QE&FRo#kuS(u`14wSjCRk
zpl?y}?F?EBmxci2@2sNKq{~4jxIFvx0CQ^C_YXQ1WNK03gDK#TKGm!j`VYD`c`%yU
zwUY8bNgHBdXnt!Re`^hUIcv;B#X&;AviH#7#wq9y5X6JU2RqAQqNCpOT{@D$zgcCR
zhPXv)U|6nTm^-9Ym#Eos<zA_kw$YpiY4O6nht5IU)(%v!+byc^7s$%S97a{WI-~pg
zgN|h1nq*d#nKp>rnuSKtFN=f@0vltiSo-1fOI?65r~Cj89`R?U-#RX3lPaQ9_xaj4
zPJClaTO{7i)ZPamo#GBW{`H8ym4?Q6leQo`iY2z`d7k;rfIOc4_3r1m%fz24DVLh1
z2Tv_Cmf;w!w|s(v=ol(nl6Ok)JZu|pn6Am`hiQ#X(0f`Jd(@XF^eXblvy=TYKgQsi
z{zxk5=bjoz15FIk_?5?;2q0)xQXbvOyu0@~=2&9>Q=&NcX~s$^+|k(rWs!cE9cj3d
z*`8%mk6}sbM>5bkB#s&a(OsDHuEG1&E5^q~@F`L~nJzak=@UG|s>OQ<Mfra;*N|vH
z^DAN5o;^w7+Zpw{WoPYz31d)M;re`f#j@nb(I}NSU%6iQ_<fDI@|Ya*x)#SrY{z${
zbSG3heouK2Ku7B78c`<s3-+4B<RHXNRSmrrZnIRn5^+KdL{8(slR=zAt<&d7Q)51b
zgAniR2(5!n<n^YF*1tR^-m@S_C>Ht;(%0mgWBN}dN9L3C?ijd9#i|+%4<LB4{3twk
z?h`f)v115knqQ$~y{as`T<VyP=)b*lD^+q+N*)iQj!r7ms}b_n_ih=2;pSyxq}*H7
z(^(^YRx_FYR?Lg=59-7k+_*s+(N>w%^i2PR8B@@2?L!;|^!uyOtOJv5-M0U`N+~1a
z^8N(A76<J{`*bATsj{7wvhWD*I%#%L{^!FB@v^gL^!Kiy5y9NOS7!BXFs!`zqLh4B
z!thJyo{^umOP0;cf4HsG(p{~T`Hm%?F?ls?hus77gyhgcZ#L*L`)&=!?P?fy`Enm-
z+*1Zz<GS*U*@2TZN?_^6BJ%-!n_bxcdPMoTI8;R|ajbN}OaEpDZ9V&GS?58M5nqTT
zE!=vXy2Oit3Yo8*5}P|uo#C!nqK5;NfG72n0CE6y(Xp)s2Kr=CIqtvmW&5;W$>=6g
z)d?fK`{IuYX?~#<c|~_fgJT$;pdUq64h<wYki^StRqq$t!+_w7u`l{PR3zDJzTEwR
zyx7`p27ON(9Q_{g!iA6K(1FMHVCzFOo{8A=vpkLhv-Ex`N@qSE{Wx2s;O03WpjhJ7
z8aY83pEA{^pmv52yg*ET4hnsl@A5ocQ;`I65AfA>PEXV<$?+PzI;jxi^BDrs?0R!4
zXYbgqFUQgZI{p$8vlXGukF&q#=zr*y$*?C2ILK`r2jX(?Lf_tJ(Qu`JWgXFr7*B$V
zM2aaJrnqTI>hiN^GI1A#XHeCkbz_Hi^9CH9<i*hw!JUKlZLc*~1bd9PT|Pbk)cqY^
z(i>w0=M6@xq)dS|rawL(Yh<s@X=tdqeyx;r!EwrlTSLKiL$02#r~ayxr#3iZWi$*4
zj5@_~X_R<{-T~c8K(}hXuIf7=Cb>!RmTicCJzqcntT7D4Jk&)UlfQZfg$lLX+!6F+
z^UtAxcE3oTl8+zJ>{^A)v;cR)u0j(LicqHa`%HW@(wm3{gb&E`g|z+Fva3xz5S0VI
zACP2k!qFRe9z7JbI&EvIhC2o<RyzI-6o0->_`uuRKHT&m<Q546?TokOz}x<sMF}SU
z+I_L?^9rl+L5Q?Xo!c4ivwY6XE;4Tefjc<O3_y@F^-MHvQLkUt*ln!xdDAf5y6hLV
zafwezsU<sXW=zZo7b4sQ$~RSGFaW^u)O;{o`!@)I`)0%U?5W74Z9ZKfG&=~X6PUi~
znd3F#){JzFyqurBWPDI4jy~c#*<qvkg0n=F!Ivyh8H`#Ei1IjKpH-B^wX_o35BuJg
zhwiNSNZDT#<*H|(m7Ou0yztwEqto1R)-w0%rvfS<;f@`jtKIP0JlkQ#7hHyMgSM5R
zt#vxjTRI+tbvU|d-c!Qzo5J%>!kbwbPHW9~n-sCWrA@`<Gqa1U)bg_r=!Mjfp}lQU
z!C{RU>t^)3nOi*A@5!f5qUc?B_BBdgLp4@gn;(i;kT+r8J8Kd*5A3h!<u)FpjlDtS
zm!BmPfRphjtpw%Pzl1j2-U}N;CLyI_QN7J``E$T8(Yzd|^gjxr)BR>4&K1)GjvgxR
zmOs86g%qC~p^_@NQhwEn^nR{#$Ng?iPl!?_g+CYZL7KA{&+V@}l{H-KJvG}GHH^Bz
z-~#r&ef{DKW^5xRH|Jbn?YHv&;<Y0ASPAy{-BmkEVc?*X3pQ`Bq{&)b2w8(8T4)<w
zC;qE8#WdsM)+-sHb{;hsOa{_555PTAF^=CW?@QQUtGuEj6R%2W(vJ^@W2Q<n%X17t
z_DMVz=GINav8VTdIk>ey$SPhDf>U23pe|C3Rf38%65m%AU|>XcwYQjAi>ItDw&Nxo
zy4g3<_<CZ>DF6&S-<&+$IR*XX;yN<X${MU?G#kkaYri)h{1s<&$JRpo7(P2qIhMu`
z|MI09h7C!v%U>#wn*_H!Vp>t7RM`sSQt7;y_+o4y(9B&aNkHAWiVc_$w3xV7Jhq)>
zGR3>Y!dU2eVKglMS~k6Q>*+-5O|4LCEO(=`_Glm9UJ^azPaP(KPV{;2rqShqm8oyD
zA!tL%E2S~mkz6N+Rp4r{>_RgmV2~baP4BqA<KXsl-oH_j$K|Z%+N%VwaI;m>T#xr|
zjb>Lm7P@8PIG5p`{4^d0G_Pqo4BeLSc_CBd)lF}eP!#1ER3y2}Q66%|ydLp>j-bKq
zEWhjw9jZ(0;e%=dIc^=4m@IBIUwS&p2w5CYzpN+Ucw;0btpm=l%{Jp=jwmu4b3057
zoha~KQ4Ah(cxUg$JJqdq<=2+OoI!o>(JG{zN_Uo{7g8i4DQD*GZVNtBpNvwb?HgG?
z;aqjs`3Fq*aSXq)%g`Oh2e}%NkJB_A%-v)FEI`oB=elm_L+7E%=m6&#9qWlcEo`<%
zRHv5yImqzX?Xp>YBcMK?|DcDWcddReXIcEEn(ua+@On9A!###$glM91;8|3S5A=PR
z1^pm@^Os|k{?pPaQfVH-eP+50W3XYlJ_!-#zV<d(Ya;uFSKQSmKh2`+0ju+OP?(^E
z{tnCd${7`&e<)Qu!ZKnxeoLsEU1%HSv*Qj}9@P6e31}!Z*nHeeQ3mI@ckYb?3+&Q^
z-^NQP`!kz|z2`((=R@Bmz{;T-E*>lBRt_Id{TV5-M|(rzc9j)drIr_CBD)SvU<=rJ
z;5;8j0ohAnv-|NzRoC%mrTir?bf%IJr)R<4YR*=_@IcUl46IOC-EE>rdG{mvYCD@8
zw}V7B&il9X+|{`yzj9$QDo%c}==4Oe|7$3WPE_FiyAz%)UaJDk5igX}-?`uU^aI`g
zG6hQf^~Fm?|C$(At=LSS^7u+({StNGkrx$?nQa0$M=K_iXo45-u9_Z#G#E(VUoBnY
zNwxAT%T2q6s*Yb6<rd`{G7inF{%BUiEv2k6Us*w&>9TIp92+e=EWK0ugKHm3zPUf{
zd#Mxm!`<O3%9==Q=|s~P@CFFNix^FXJ_PZP3Rm`6wAW~t{@VccRvY^HAnzeAlgxgk
zK<7CI19vBQ5r6ogj{FAwo0&Hrasu5=QlCZ<L_88kH%j)$8vmB@cN5Q_GdsQFiIZZs
z(RF<3{1@GgMhmxJB@xI3^E>aoLaM)~49X;dOAobyDN28ayl7@0u%Gs29lrb?&1Cd5
z&qv-}Rfko|CIhd62K^eIf?7H9>vS7h@&sk8^TlLWNMBy4x@E47KGUW197HW(dAOGa
zYDjhMuQ;g)WnNSayo&WPwc3E2300&Wu(B;#c=}u|-g7aqf*>jWv`y0hS=KLa!JHh_
zm0`BZKEdX4rO1TIg5cDM%VE@E%zv%!j7Rf{K>kf_C-uZLSiZzFi;GWPS{UMSTmp{_
zYlcvh%CH`1wpE6&LlXl_Z%g&q#1)W*4Hma!zwQTi5flc8hj8gU8U5Gr;V~bS<E=Jr
zN2b=9pjjlo?h%)ghD=zq8R4{b|3eQ+5r6c7xO4v2As+GjokR)I-<z(kqq}GRb!V*h
zyXSwCaZR8xG$au)?4Lxs4A#jV=|$rx*}9~YVB>BE4X)_<&7)wAbAJNO|5H@BOVebS
z>i7Vn@O&~cv|sI7<0(ON-EjKwr=eVMqGNgRR{`?2Z$#Fs9%l@y3++(GF^ZSG#ti(h
zyB&N%SKo;e`mT~ay3`2?)$`@(a655?xg6p6pjU9;Y~>W}WlMo=RR7t*KZKQ;QbU(z
zJ<2yu=!xta^cN%=gWl;q3f;&9@#_AN*~&$B)IL$sF2{%Lo!{x(u_&J92^NX3Jc&zb
zh4md5x&~U@n{!SFkPag6hl~}h^G8l&geP8d_?fegXI%52HMrF&dAQ|BQZ?^76_@Y<
zQ16;jLeiY6oJ_tnb}Y&2s|Cl)tA(b{w@xNi{^aFvs39mJh$z~92nw7c>?&8{C{taD
z5GpvYBM<ABMhM)r(HZa`{=lmJXK44k-VpbF&3y@#HQ2AO_ARbOqFa>v!Eiry6?7jn
z7o7_W)G8SyFz6xYaGSJHJg!3#8|DvQg~wG^1)KhgN}^%}EzyZ!`zCyTPYAu@&mXbN
zqr7-IPVbvs6y+W%x9F!n@<<yo`ueTMCN4VU|2n7ziy>hO!zlMof>25R?`UyZHSz;3
z3>VjRM}<V!?glmps?!`nYrR(b^iu3gjNM&QzeIqDflcDkCify_v9#a4VN(c-VaA|^
z+6Y8sWcqOHUzEr8`P(Y_W^fSb$aVx7zVdqlc*Ej(Fu12YlsDl*qZnpe+Y8sW7^NzD
zvW>C$@s>D8!EZaw<Nh`p8VHIjDMR<)J$z5s(qnNvBMm#qcu>lCu5dW8Ab=m9SR8%{
zt}0@1FsLDW?D4=pQe4=j8l$LH;j!7U+L@Qo3s3zo`}DG&QV_WKc#jWd|1xpEa^eTE
z<S1LKz;ozZhpM**_nmFjK?Zh>bqn&Z;+SUfkI5(7oMb7o-^47sI;~vB@7qy*dT>fk
z%z_3<y}Y-L=kLyPb<`rg7wo1wXaj=R;b*ifUwoLNkG7XxhYk>k7lRTAbe0#4yuo1l
zgf^abdQ0P#!Jivh4Dp6IJ>B>31HnkPcg>+5oxjG!g^xSR7v?w!^%MjKxrnq59VE3h
zDj8g!2UG&{V&L#XZ<5;AZ<5T9fA9a*!U)+pReh?wl|jteZ^+?&4}zEt0=ChN@gSbK
z^a}NhJ*xuy&ETyY>CBRd{5vQGa-Tp%3s*NhX2YlztNScJ>}b9|;ZoUJTYq$+aA^VL
zm5C)pMJMiy+#HF=hl*2AsSA&nhU4)1uDgwd{-*AZOG40Teh-#^jE(nLci{CN75x9g
z(nZTP6`#=-H#P*3JUHirKt2ik{~}U_4QK4!A94HLf}oOAu#zV^ej26wr|<o`$j*bq
z02~x7F21*XRMs`f8pgQ=Nm1Qfd?1yECPz`)d_jf42Vy;n1w2@^;IUmr;yj*|X~D*M
z#o(b9f;Q$A-{bAjd88T?L%7!{PUcg+|7j8txo`Y5n1JNRaVB%yLa|uln{#@IA)9{;
zUH?1v77LV(eqWq!IWlN>0nnw}{pDZ$AmbGtRXW1`+@huoqU~!eNRE5>qcL;`8(k_V
zbY^(8upI_2;2T8+oGaX3cwzhVK+Iufvnz1m5L{bN#UFo;w1>)As^ViJLO0xFByrar
zQBs%rG^@;*kh^s?`@Il^Za;B$#z(JF)IfZqeHz_>a^SQNU(axD3*?HTGb}IP#k5Z?
zd;E3=TzUKCGF@~vS(>B!bMM?6FK6)Uk^s~DC*1k;OB71_nW0LHyKiMe;B<oy$zeyg
z`79dpRiOEY0jUDxYCg4OW;mmwuMa874(&-wECBl=iIiH|`kcNH2rYBiQ){P)2!GDJ
zr%b%UAI+X#Cpjb|!T4*U#D(_fzN@?1h=@goCtXK3%qCyIlu!d_mRTXjF|@)&2?g4y
z-~E+%RtSvvuNI&?;IgpDqp9j&gg%U}i2CT#Wc?V8ZHub&ErXx*IgMXTO&w~f*L#s}
z(JoDLn2;qMC3tsB`k?_U;9pW}bZ<+@1}UK&gB)Q3nICj81E7Gbe3^#MdP8P(f56I_
zG5BV00M&VETW+Wn{r7<sFCK(V90;z$p<g|d;V`bqzu*C;|814=?ft34I8^R$O)~q9
z_L9ZtFsCN5DUu@M*c3KX21)62e!k@YUK1}cI*6Ay;j!(YWrbK<-(@61%g+BNQ7eY|
z{YBk}J7}$hAV-ezP<#hvX3U|$UoM#bVZk!Qx6WSkfa_+6z030GZE+A<R_LA4aFm*i
z=cT`xye<B80%d{J`F&&0P8bMx%Pci$t;07&5oio(>f?QthbbrtD1?b49h4&%Nm}RG
zq#2y3Pd|(yMF4r-&)S>O&b;x025fWh1YCx$>Hfn%Yxquu=j{{7eOxtA%6H5?9c8c{
z(gUTpocDgPK;Y&BGM(5!3A#^8^2G*X02*nPrv7Je-@tb&-gYa!1MO~5oRm#2@;2xi
z9jeYhTw9?%(RTuEVhE$hKwUMx|HO4NJDbpUEE&E5egr6$`)e_3Z47=SpT|2Zl$x=)
zSG1KhT8}-zEj?JLIZFl~(gR#QsWvJS?OVvC|JS%JE)J~~s81#u)L=k8nSmx2kC4kg
zx9@YkC+LZ%M4{Q#n2DVdVmiwrT2^F3il9VKw0InCMvDhMZ)48=Z=98)LQ3cjHUl<)
z2x_`Jx24zJiDN?F++~bmWpPOdW1o>Oy#hmfK^mQ1@wcTZIw0ty|J#?C5K~*>>TToc
za5PBe?k#+?`l=|jEN$*iULN3JOg<6ImJ98u+;zG&@O%XA?3cSE6`=2JeJ>8$&j?mp
zLKn{tn2n>0{^{@9J8CuKaT*#MnPzY)?=9#q8V`<{4(l8`H>KgzRH$$2KNr=a@<;$(
z$_+?HFZglg;wOqvn8rn+`9}afyl;s|0_*l<+Soou;|6Lq#>HxI1X{QZ%QFX6IwCp1
z*hxQC{u#R^X4IL`|Mvs{hGd`qKlm|a-R&rUb&U>@g1$tRnE$m?Vg9UuB%Vf>+Crfs
z!J_UTDl(n+#0<zg!~F$i!P3;IY;ku*j6pmzo6w#ujX!~mEmKjmh2A+K_-bI_23&%#
zcGJ5wH0}ogGz)xN3;$qrzi6ET3bcL()*~rEwe{~=e1-z_(gDnME#txUPlQamJyVYs
zrE9KR`(Twp*e1Xta`jKAinKFI`n@1Fu3XeANG{+2^8Nv@$LDKs>mNo{@B0z9s{by^
zEAMDKX7Ba2>_G7sW8(yK1%11f8#;)IWL!X%25bL5vqlrHO~StoL!qjGfLaH@&T6xw
zT0+T#89Zg`)!+!cM0pb(%HMRoi$Q6Cf`UvQG<{L};w??+EpV9#gu;9gDcDu5$!`U9
z7=|wj6NSAk0ejQfIAYPON+N|1k|~vWOVg8Cv}xw10&?SE5Gea-kMkZHi|3P%OJKo)
z?Kmm_=qn~OVCcM0JlVlx{zrN8|8_nkY+(hRqF1TPn|Zks*9<4kt)e76AGT5gM30F{
z)rYaj?5Xdo6(W?{M*P0+H5p1)ptXv5N}!(0m|O2i|DHop+C$}}Y$4!(+W4SDd-d-3
zm)N8H|N6KUQPIrmd}`){`hw9I<Rb{(Q1HJpt~zeR)mhSg3?jg%jHnH5V6Notf0IXr
znfVm^f+$jYXpR~wOzxR0V-w=vEX4Wmpn1ZP7aEaUXU`{j$VA#uoBuG9r`r{sK{XJ)
zH5IGUPsT&6CpyKu_1`N+HZr6h>^?1|4J?hTT*;!o1P73I9q2IxPG1fS;`0Itrl-Dv
zd5_dnwopXh^-=r2X&Umm2t@SLjF_Hq-<;8B5;fLllJ=?EcjR*qZb{j18sj-)50+(n
zFJd?uhEcLLifa7!+(B#zf_sXp6UaNJCe-?SKDY4&(30?NCyd*W9PfQ!b`Uq4Z%bJo
z$^ja3DfWx+)EuRzGFtm`KNYThH2+S`7e22jC|JHegdgWB+h=&b8;yGa%3&bLJ~gK6
zT5zUE2t!aeAQhUntK~ia`+2X5UrTxOXW0-;bofDzsDazlirX)d`a=G8@OUn@ZFtUD
zvd3^oljSnH|LV_uhKTcm5qf0|(VvJKr91(Xm6q!ij`UX)&^+z+`BBP333Y3+4Y`xf
zQ<)_Lw*-;QB}sImD;EFts@X^G>>EqcbJM>nv3yJq#%?Ar=Q_IiXV0@aSXH4IxyVGF
z-~<AY#g-8#xxqSOqK865lWcStqi}ah5Mpp^r0}_8_m6~`t~pKO!i6E6Mp6j6wir1d
zx_Wy)C$91PuoYqZXVI{h0Ub)_<m`ECl4?l!ZEfJVeeHO5rse`EjjtTdjt!{=u+~3@
zm`ua3^8Iq8@gW%s$aG(-CP3-Ww9GIDO!Tt)6~EoD_kVx#n4?MIuuTEwO67GaHRryL
zL2I3pd8kpHPt+YO#LjaCM~WYQ;*7WXW^sP#B@^f+Aoi`*28tp1iVAo#(~U1$0PP(3
z@?G}$4Pz9(OzQWvA%{%qn^HTYjh*|6-(5YIEUZo(Od<aqfup!VQNAEh0|hZnFj0Yp
z_f%rxxNedhM^6v&JGqc@4&zgg?3_HOa?jVC#=E1k*w<E3$kbLM>d&^S19*<5ALnGb
z!dT=??)vMk5H&mPSj1cYWf!KGxBL@u22y}GSIwH<Sj2{MZV^C+7~%y*?kp;|J$rJU
z9BGvkU7Hh~i7z=xV=3cH#E<9i{DK(1h~Zk*J3?;xH(@x!(60LLjfDot!;AC#S3W_-
z+y*bV$iuqqAfwPje<+6PbxS2IiHCL>jvo4I+DEGNO(Iyq*yp>4r_W2ixCsyb5sNgu
zV|QP&CfV&*2gaZ~{v#>uK8j($v&^~6S4t)xZ$hm#by?k9YA;_&?$A6lnh^;Txi}3q
z@(YvGQEFEvU!I3ztnDuu5%{|gVn?PRl@aU_$1g?pUuxy$`f%!%c%}+g-u?LeLiZjX
z=c#VMdhqwvXiwAaBU%h2JcuOQBftZhv2A}8gxTQ84lAlUYsM|YBCU*%UL!ligXo_d
z$XwP+m#Dtd#QI<}`?uX}>M|_U`!gdY?w$-Jg*~-vzshfa-P_vn(7@qZCJ5|38R;Kw
z(xs|+CCJ(Mp($^+YMaKnmED1BEF<jOY_zuCX-G_W+y>Dr<-6^Waa?@^ICSbHo*f<)
zldiF*W2tFRKIHww%zQM_Y1Q4#4Rs7h$hVv6TeYS}oH8aN$-SYTSHs2XYOGvO<lu?z
zR3c^v{JLWe;eUvZS{hGiU3TSF{F#Kd;-U%{<*SD8w)+P?QsRmQ-HacQYNTPfhj@9p
zWseFe=O(sMA=sH8HH_J_-{b+;&i07lj2Y;VY&3C4vc)s9KM<UWWn>now%&e^$7JNW
z$~%yP8zXOT@Xo=8T0(!Hh0N|RtQiS|`nD1GWQ(MNDHv8`@0iyJ?3oz4|A;{mRY$pI
zTrmRY{P6FyHTbr;LH;E<v7fdwxesUw-F-0=9F;4>mLVHq95TSSs@&7b3+=x9{m6VM
zpEgkw<JtPypyHu5cL%Jmfp>{ZsrkGB6J#S)pzQPw5wz<;(v#?(ZeFOdKJJ>OrkdpM
zMoH6pW$K(PwV7{6X^YI|hGCyK>cU>euIstM{bxD%4cuB&)oqaTO+}gw+o2B7oiN8J
zyW+gHD!lYs3#O~@b`kNimzZ5c8C6*x5l9>;R4J;x(wi9g-o~)r?H1q1qBpvZAg|K-
z$TQ&4o8zhWx+aRTUpA@vKYgZ%OJ1LMlJ9xBEGPr!AjO~ZH+9(33cl^{hbyMk5wgG7
z0AOMN?sXcn-q~$OP9*n=+f(4XYdS9jWwcdf%ilFKRJZG@?+3RtEr2mjg;eW@Vd$y@
z=>8QmM5~@}abK;4r0;xja&*YszAe5eL}Yu|{`H}9F>r{`+1|5@MkMBGtyE!??_8fo
ziD;-P9n@zzYL@q7^lb@c;zZediE&@HnGx~du$Ro<d$P5OPG=v1$tmjEAOCi~<0S?R
za!FlzC4h~%2?KqBYh6DF39YJ?sce*k5vSYS6k##-oL&AFJ=YDx0GUK9?+h@dGT=D~
z{F}QMP?ja4v&k}>g7_-ii(bU7|H3++<$|~+V7IgM4ohR&BY|jcs8uiJ@wRYG&+eL0
zTd0nyVI=(pq~dy8T<Pg<bR8m6H^gGiuU6@+5o}vockCk9?er-k{Y@}1#Tq^K8InnD
zz)$##lJ)sUPANiS9ln%liV6a3W(Z*&AtvCQQIgKg=}~bF9&ld%0IsARrPR5B%b^J#
z#t>F;F?-YTDC}%Kv*#y7bmvN5W3co089dibNTd>&L;SmQItjJO6#JdSRY1G4oL;S`
zHixFt@6OL8&#Z_nY^7bIt363K+!r>O!|aJ0IT0bqadM)SZPN7Q8ru(yqW7EGqX&1H
z&>zG*Rm5$9cI6xF+@gS;RkHeRcTp?SoQe}!ExQwhZgHNnW5!FNlL+VZ#k(Qr2iORj
zCUB<-O-7A0huhs?cT~LlsfAVBFa&y`OLaLT3T>mm9bMS!)MWg1u+3rpkglIE+|Bf1
zZ282U17b)fXsJ7p8?H?*5uI-dlCG_DbZ50fhlanpnka5!y^jd>MO4%KyzMu)t>r~L
z31ej9>*5mL&<9&-Hxt0r$yO3z=#M5b2d00mS;ZVGIc)!v_x#uA-gnOtzR#~i=b)f#
zH`d42bVw0&=sL1rL~;vzYX^>gor-xl)>euTN5YrV(+Hqh^r{gy?{SNEQE^hd91pNB
z<|@AIh0aNZ%6Sm2y?^F(_NEwAlrW^ceJlHc!(a^#4*gfl>DR2zKA7{;YJ#BDIk>i=
z*v(Dkn-53v&tD!LPFZ5vK5&u7eiR#zjrEx$rvg!=hO?ax)8ApQ*Ec_Jqk_?n&L`jO
zkwGKuk%hu80NlRVlf8MQ(rF;5<WO@x?WE;PK3ysiHU5+EZg6b&BS;C>be=)2mFxF3
z-MD16b2Z+%UZ}&Xt=zP*3%g9VSxHNt_@<%yj`7cNuw@xFZ2NC<?{wjEndeI`H&d^o
zL&UM6*L|IEzkb1y#=+6Gb;xQ6vyZ%`?NOb_=KH@UpmynHq&fUCS?00p4BF0PX2nhN
zH>5m}`^hM+<-)_a#rYj5%^rRM<RE;JxW&8tw87<ZWA<J}B_FD9=i!e16aK1QkfNQR
z!N_jrxvzELkBoAQ4@L9mVz!vjRx+#Bqr6hSFh4gy_$Ks46Ei2Q?p2k!UMcIlK?(1_
zo)rt+?Yn8exQ>r}QV&8j2`@xMe5P|AS#(V190~AaJ^S^6Zpt^VWnPwkatW(NSa;?M
z96f7NUZ+!8$C?X4TjukZ<>XM3m<7oxRR8?ai|J-en&#qfhU(!`6gqoqT5>)cMo~bR
z+j1`J?3-vLnZGIjk*J<B8=ul)*Daas^>3W3i0!8XVd7J11v4X)*IXNB$0@Sp4z#j!
zNZ~uFet6!*nF5Uqt>2<0L4l`Kd9sK6a0bb~6DZZ7FVp|DJebL5f-W`nO1GEnTA*mD
ziB9up@>a;tt)^3dgEa5h-*^~quizVX2H>jdZupZMs}+-^rXlhomzi6lpH&qu$(=|A
zz><lP(Ye9{S55f;Tp0QM+&yx!Jy}eWS&8+c*SkUx!!3iYbV<_B*Z>{fkH+qWHyd8$
zA){#Jr=j^7Wj{vT4C=KVEz@(2)$79+J=WJD3x)iNGM68mr+ttK7=xfX82Yuj>*SWP
zfW3hECxKg;<YrV-^%fS?9Fx%F%O5k>(A&2@eawCsvhA}QY9#GWr;Hq*j&zrWT3cyc
ze|~<J&}IZeM6>ERL;M#zeYeBsi{N<9G?x!pWVK|=>YlMxN^O1E=ha<lc-~%5>a!2O
zug4m*DCu>fwGf@Tt=aU!hF<a?)ctDD9QE8y6kCqDv`C(S7`j1B;5UIV@_Tk-eXf3y
zJw~N@mlt=xm3eR&>&HFwUeCk34270HZlJ0zzxKk^{jGe;otrM0v=NIl#K5%gb6#KM
zI5S(i&KTWXUmfc^d1i?7sQl*jJSUU$?@7DpCcI}*>#=~LWwO50StOHd7LsgD6#uB&
z<U;+)MV)~kiz{Mzy=p4g?M80on~6Yrxee9Kj41EWqn`L-=ZRChs4LFF%*;u@V<?Sx
zX``m(q4=C7D95-qiJdc$Onio*_4%|W87MyNn^z>hbBR2$kR3q<SzMFia4<w@nxJFL
zxR&W1=+tTS@y2=iuq%jUYnf6S$&GXM+iTG>H)sQVHtDRMXOcISB%{Odt`QHt2WqTz
zdkO-|%S&b_23H|pSrnTAYV(qORab?)%UuBOZm@rfhjSHpPr+pUm_1Q?7-%Lhz@V;9
zlc+rNc?Tnx@G*Ggt*m5Y#CJICt_(q{qqU+f1NP*=f@mZ=t0ko85BE@RSIBW^YHK*(
z(J@EkhYI2e5s%SYfqhcb#e8biY%dJg|DhteoA(dWi)JJN1;uO6W_CUBMM2c{%S%W~
z=AHb-<Zvl|9~=l|a_1uCO#BkjB}pgR1~$p`SEI4Bd(qZXT#_HmRkDrr-5I~3`gKBO
zi)KQ_dqEeMhL9Y+<xW#dc8h?a&!rbAcI>b?f1W;PT(eWZ?H_<UCc<YZs3CN7^_l|(
zG^56yWZMQL0UJ%Uc|!TMPaCXz(0S&Tii+j*;nooSLW&>H{5LWm*c*<MuVZ+S!m445
zs*WG<+c*l^t~k;S2miTQGJk37#sS{ZmeD;g<xN~rGcQ?WYhf-4o8eIbS*p-b&!!6c
zhetcqXfYDap_x1vN2lMSFL-9}L7jOvzIKWR$caBmz(wmZ;COpcNnBhwsvU(ONnJ{J
z7zjY#7j2JdVOVJUW-Xo6NyIV~n9ZB^t?G&6qJ~&2sJ3zpunv3$LRd_+IykM#=-GZS
z!uVPWjN;DiA$z;2@iNOUniiC28)v0F-bjgAndUuS2DLjxk*%BA7hDBbK!@IWj*$EI
z2e;$%j#c38Pu-bwWsZJeBWV5LV76=9bEWR?$@dpQx1;OHh%?vJ5cp>=SGA@h+&2Zf
zIS+zZ0eIb$F<Y{K?@r&7otXgT<HlZ8T$Qh2b_l{<+qp%vm&1fJrJgPPKBrcCYHpbR
zfL=u;N$!ZCFLp0x+N3A1U;%TXz6F>aj0lInAh1Q&5vKaR<y}<x)qF<!1qLzX$ST42
zoNQe|3MMo&X4B}!`N&g0kz*HBADh1{>GUeNTEqv8pgIG3Wi+d6bcBVVRFzw0@vr57
zY&|QESD}0XJ`{396B;;loqNysIo%s60%}iwr>yEtoxeh`ST2yuFpvAyv^C&P4cVOO
zZk6i0$uL%10qbcFG+o~_@@}Ll2;}LHZQ8t9%0fm-0wgDttj}!-XN~`XCrmYm4z{?1
zSf#4*I=&Ba?Wj<M1u^A3j@_YJr$W%qM-B7l4XkbKA!trkd$s7t=iyi{doIuRo9Vxw
ztM$O!4$RY#G;ELdmM`3Vqr42<WLS>STTuw${#**u<R^h=lZN}56#p@-Tb-qQ8%uM1
zjxDnEYjk@vJ8Cn1&IoZ8?SOUU=i=r8m~6twzv>!GnNfNJbjskuy*H~Uyz^vON8;o>
z-=J3NEoEg^{rA4M1OBQ5nPnqtzq7wj)SJtbd&CkwR2cg9doP+bHPq3iHin@~QmaPg
zLfZ)#7W0SDfe{96@#_>qBQcAoE?<yzYy_mG;wF|BS<!KOLUX`S#7EojSYc78bjgW*
zgzZ0ElYSjc=$+{yXjLDgGHEhqrQ+LvB=#^sg_F)Ld_(3~E-~jtML^gB-le=5{Mmrf
zm3Y25IP<e~<qd0*{t4xN!%5hEeAAfw=aW~f2>liKecR^(5Wj(k?Q_|c&)v!9T%giU
z?8!J8>G|RYsgv$H9OGB^-UOir2JNiY<nqI2xw&EHWZ8Sv64Dl1J6y)J9X}FocsL70
z)<9;=pjM{10C<6%Jp}EEFHdtnSYv#VZjZNyhn$huTCSh(AdHat^}&0~9hTA2XX8#d
z{g2Vbqvm+RIQ|SVYfj%!(tSX0=>2pYT<hXwuc1cjvWqqVK?W?Z{?@po(W#Yw$(-Nm
zWU5fzc0eHaVi!_LIAE-~Q+g+CF~-o9yh!^*XTJhH<36a<nP=fV_-0kN&6WU42_FEi
zNrzd_D$|$_%vFI=q~{ZRgT(I#W3g*FInSU+QM_GxPe@B!bb_CG)swku#hKq%!`Hi$
zboVGbTS|RgrV%@Qxb*RFh2ZB;01t?4I1Y^VGQR;Qxx5dBHI?0x+xQ&Ugde1^lO>HF
zM0s2W>Jw$Gdd*Hsb7@WZ-q!do85_D=VEl`6ivDw&kyjBiN}A(0nt!PEWp(#7$Fffk
z7$>C2_0H%$ne(L;)|vex0EP&5+?0n6gAzkzzCT%~godh{GJFc0xANts)3RQ1Xl&K+
z`ptd5DdyO?2>j>?QMe6;xS8x<Gd>ap1%K~&@SV}T5SEk8Etegsbf8@FXHrF$hk0~x
z=ApV|?;<{I{Ko=Ak?x7jKK#Vx6ZD6e#HV59GQ|lftO`_whK4>cbeR@2YX)`ad5J}j
z$%cJ(3|iJde_rPdK+>(Xd?*!l6bU((XOb8q-!nKN`k5My<0ux;C+If<!){Dp?>Eq>
zzTmoIa%)gxugXCks=5q(F1Ip>t~oz67OYb<uHTb(Ju8a8-Va97O*W%;@W_&dl0_xo
zqQu}Fy|2}MjhYO_@25o`Bn4C0Ck85BxyUHtgbs+?;^{$;KGEfe=a{IvMqG7tGWd+y
zg&Db(qYp^HxMRSi|G`;HqdUZf(I-J}mHBV}6>ZG)n<CwdCvlr{2zD05PvkQvM;lWm
zqKj%IfPDY#uu~T9?D@E@5jC%w1&>W8JI%NW30XC~aYKlIDL}F4CYXb)dk4J<ZuD_y
zsmlyMk^PGLPfscfk=a#|FU*CuL#z_+KM{7B?`B96<4_T*>w10i8wl<o+H|t3c>S2X
z-o&1(bKcHOB#y6l<j^!D<42rQ(J(U7vP#R6jYc+GY*iMRUiAjbVl3T@yUJR*{2g~*
z<t>j7#g~YDdA#Z-z7ZP%LTM-G*gVX#J~`rgKo68{E|Mm$>I;3D>9C8Q5}Mz=qA`zR
zu4$h;6KFPFJla&$KuSEL0aZZ4*2Y}p)`MuZ20h>_j74=d)T$@#q9g-f-E4##HwJ4L
z*oMSCBL3Pi7~h~Z*mV5_p=dL5+HEE)*Of|Kro>vA{6(<NMO)z$a)`0T3smmpbho)|
zi<iQen;Bm_qelCIpt%~vyEp(m!v<%}aF<R0(WW?s`z$)eolxs*@8q(Z4e*hsxmn6a
zGHr0FCkZk3Cnw>IJ|TK}mh*1d51Ssu>`CNCyuMqVO5BZ%0GIV~2Cnmo*W!XB^_#~d
z#+>mtSt$}py{8W&*JAIvlsdW1Xs`|9rZgpn9V2<fg-LbqhYMobE{%E~7}8u0?Kz2a
zOrCI&v_}>GdO-Z!Z|_V1sb33*Mv0n-F__!VpdBQO&S;}Po^Z%QqGK`eZE~}mcQ12B
zdvx#8g}$*80W&fZ0J-9#+2R#1E%yb9q8j>mHz~P=YxAlWE(to%9oF9Q*DJq=V-sfv
zVK0AjFY<w{eI<&ZElJn}#B0obCM3$_VM{LzOUkGK)0V09&J>^Jr9Io_%j909fn_Oz
zqKR(oxVd?;;E!p2n9acZzbP*V1#UlTAN(F5{d@exTx;}=mL_E}Nfb#OCNcZEq#2Wy
zh5D38G%sxk{IPsfOq;0Q5WV^@uF!{Peov@NCAQVbuIa%cT=fqBB-643Z^hutDxE+<
z>VpRaHV?5^1KAWl_hT$t$+xFjeSMW-^*!f7^BZltIIX|L8bxmef^<8jt1SgXBQUZ1
zhs^o&l6G2^KU5r3sy8p(HC5>JiXvfEu|3ft&;||~S)!-UafX&<BOgCkZn;ZBmJGh7
zg0e~*GsFv>XRPGjGnTwo%O6v|x_R9T5`Ip;0wV)@>*4&U51ZB=64(_u&*b;)NQ}T<
z+Rl&Nw1gr3nYCfRjAn^);?c)Pz{e|6M#+e$GY$GLn?&cN1Id-QRkEshmaK-}&BWey
zrySCom_8i~$M4>u_Z&cdt_K~;YM(I&-Q$X#gK?Kz=&v%9h5NkQ^AG^vi^$>NK~9z1
z!TEF)*QeK5JO|f+;Xvol`0UsVJVGxsPKZL>;b-Z$zRcC=t6Yd9XyxB4Ku+D}PfO0t
zihkIliuJC(Bnxg(oN@Mz&+dq@s7ima>VH@?44aANufu*r{lLiOu%PwSgv_Y`^>s@C
z+n--DD@aMr{lweq0=wQfF<!&pJSSlazvl5;1s{p7e@^U(Us6Q({(%pvvFjnE4eoO>
z9sB_an0ubibb>by?Uepo6n<MgR=6ICsLx#}*a*G>tvUtjfjTBaa@79|z}mYb(F1$A
zDP5_jH&ps0C223TLva2<>z1}l`|F1r(SKSDlUPw7zfchMs;V?3goZX|T!ktuuQoG`
zXmLDCJ-9sl=!oEy4^n_cxve{bU7n2xq3#7S`+5r8b`{6O7iG;2^O0%qUysvxUCVAa
zzZrP}ng^p9W9fday-isxf~JfKN&Uvq_*Q6!IJ^6~Wm)7))~jVdy~hQ*8}R$<FPHRH
zZhw7bO*fUhpqA;bh58)o%(!2r^E_J3vVWoEb&i$y;3963vTJ%QrZD=5EI0|=z?B8N
z)&HPsMVH%!WoOz;^0v?Ch~DmrZJK9G=zjXv_RaU=jumunb2;8U#E>KUJZ}I6mF7G*
zH{jcK;<9F8FAZnChg&4~W)C<F-^|33x#MJI{=>@szjV8Cg>?M`6j>0%_<&Qs{?><O
z3pbWte7AHyhJYf^W}1f6#-f!Hy<fM{TcPju3%%n<tec3X@&Vv<p%|fF)e=`q;)fnH
zJMwe6?+1*UckBeT>WAd0@gVf7?XG<K?~=ZAFHQb!1O^<FmC?LU!%asTKi=uDsOQX0
zyZH`!l!*SiBZT&MAvWIetVs3rA=s*rDmDjw{*Xb-QxlxWU%u`6=!IxzF2U~?gKx}~
z?MnPMqRz*6rt|_8cEnR5m4sJt_5z<6;qNS^ZdJ%M2b@nC#dq57Z{Mgr-)osFkOG~I
zUI|(!MjlB2($mieC5fHFSs5lb(QxX=tc%}~X*Wb{4tIa$?tX2#%-d9oUjBU%^<<@5
zug~eEClydVh~cH7t5A{t#gp@!tr?$~Pb(hXdr0{9>gI(sb6b?@ErH)1#ZprS3F@)s
zoDYa^O$Ak!J>(vzdd>4w{(Jn3b)vKm{$AnUcfTg{NLi)HCM(-8iNfMJ99x+faI|?I
z=oZUk1e18^P0qN?A;u-`&%Z|cuWtGn`ewE)r0w7hNVND2d1S~|>~Y;w9}j3fWYtTI
zI?bQt>?A;E2zgMVt**y-6|LH))d_&z!!lu8B=HWHB|jxcz+FQlabU*PZ7@3bc>)oh
zKaJf$9<r!uZs7elbSP_#TZ1lL{*&xqwFu=H^gnUU4amJtB+U<~=R?;kcnJrdI7iy6
zaFmhlde>hRiM)F#Pr+lqWAoy~K}XkZxU9*9vK8uy4|_;9E`qozaPd~$1lwHS%#UuI
z=KN88fWrQ@q3z*`^5fzLfgLAx%QyF=GB))ZD<lJdBP)x1%7M3W9*h$z^xO2|=ijG4
zIG32Mv-7Muu4!zRPi~|17qgoc{uUgiCDs;I8i^8vurQwfOHsQJiJgU#kq||3zWr8X
z^U9{nd7BitJ8aMKSo%)2rA+6#EJ54=Y({UsmQ$O-k(7&tgE1V9NYmnTIoJ|QiYE`O
z{gDoZ{0JCt>4{2ztN7yeRpQ6pm2xkXJkxLcCY<gkHpMV|EqHnJoa+?9kK?0#0+d(3
z63k*_wsJq&?Qs+rHt}_8Kf|I9tY>j0grtVb^X+E{c!lJ83tx!j#}B-aboo?`xH){>
z#p!#1M~@~mQssH974+Jz8@R0=a<}t#b(b~4MehBGn<&Dn>I(QVsqiTwVH#TKeCzMT
z4C^Gfb!@ffsAQi1SIU+DL%HwqhdGR0$#I4xd*oP}IZ>x3a_2ag42rQYi4xZ`vW$JS
z$T%F?E@O!yTSK-<XcETKROFN;js}CNFbvtU&D^i^FWl$n=lj_|@9*<^UZ3}e0a50h
z7sReFw%8-_;weM{ogaPrZwvnLhV3W&<huf+E{HTY-EA1up&Gxvcrl{VX!e#hq=QD9
zjqg;Eo-7b14OOEi&Dq1XFF8IoGCm&T-618JSQpmLYVBq1!;c>vgw^nIw$qgnwkdI<
z;?C{BBhn)Si*D~=nIGOLh?)ttUc)Yy*Dh$Ecs(|DfK@a14a%wiD$y`mFL4qlZzv!2
zAapMe;*En{q8X6RA$!z(<K4-STk6@@4&X}iKU%nB{9oF#^-Y!I{aFL(CFN@-|J9R9
z6uvdGGrqB3<*x0$9d%GPagBi-82zV6mPNk;y`sn)k|)o*Ri1bylfDzo_%?r_yRDr1
z`Pfu*2><!6PYWb!)>SY(vJ-t{=Z5+nz0(lo>*IwC<Wy^w4~sgczoGzijDBEkR$Xu=
zs3T8CN<y7&$PpiI)Ff){BWLUVZM>rqB;kI^X`;6{C|>=JpBQBJUc9_s>m)5QqAp%7
zQgRQFkAI__%C4)i6WE!5Pyi)0otD%v6iRM?6gFErrn?e}fO;9E6ZQGD9Bgi?7@q~W
z#Uiw1y@zgl;jyyCU!5p;Rb6CWeelD4#FNe~VTf|*F*RkDGx)Tgo=3*#dkJ+zI_3lU
z>u_DE>*Q=b;1#r&OD*=z^LQG|*Dy_I3G-xROLfiZ6S1CEv(iHjOA`lO18%LqJ4k>1
z9=c+vat3BMSKv74uayN);vDo8<$V5prP>qE^*!mD$uyR*pA3xh!_)9)kJ@s@(7LlA
z5IM5A`o49}7lm4Z#08$=1q7s32HdRPWM9zO6|R#5$v{a9R7mHx!Z-Q9L`oJNRo1bx
z9-@w#I<k}HW>P_B&HS&dxn)oPN-%KWS{&2IFRy5I%B=<Z@s2nuYFE1uKt^@+sh%{<
zRss{}o_d$K3NCNC(P1<}4Zbgvng;BGda>9kgk~E%DZSaYFZlMSPVmMicdyyBOf#R1
zTRH%q-b({9<5X?-w3jPhl%k9X9V%$M#9R--lp93KK=SbV81>$`-MaJ$Qy{P{S;)>p
zo6!8H#xo*b9d%%(H)<rvz*2!1$csK5DLDrhHB$_jFOJQoPCh7v3v~)OINO@pj>#4x
zqvhuItv><3|E`c-Wr5Q(Pl|3#XJ&s2upz0-p+!s6Wa+E>?%Of_3?c%$UKc&^;%UI9
zn@v_D2)L>YZi<Ipp4>`Jnd%DJ=fGf4^+DBavftk3reicySTLyjgbv#3#-(DqH>(5q
z%1#o31Qpk@i=2QR54Nu>2p7|^o`3a?7J*yPVSI!xGSdkqw)nfSo-qsKQHT9Wz>v0$
zQCQsEu4{$Y-xJUIH@PY#I1HM+9Hx!Vy3=8T(C>OB3{|Mz98<YxN)NfnqcyszUXX&m
zKXgUT%O)Rs$tL@~0?P=(W^uBa*@nyhUUcCHOG#4<Kp{syrZ2gU;)#scbD+=gHyk1|
zFnr@xoY#0;!(tRyMdxP(g#VnYpRId5Iw4ebm)hWtI0uLL#DLL<Wh+kSejV)q-63&A
z6e?=|{3k77y_`Oj#z$uQVz?^c*YU;fO-)NyTTQ!PELTA%5XgF0dE>*QCMqF+XD~&x
z836B_d?$f$$|suNMc&SszMZlWG>tB7EsL<uTFE1E!IViF3ub5YV#f*4WsA4B?-_jR
zm3=2F3eENZXc|EOcT%oWQlWE}16L*S%4aOGBG79sYp099SzJ1Xwu>`@RKL_Q%Zaw}
z-^;T072k<La|$wh8F~ot^)jI6X4sGu=ZO=jAD|)3t{*5F*P253MjwJFFh!&wCSBa)
z;TKCJ-c4>@MuCt3bX+T2*wUrfdo8#VY-4RnU<C}w`F-qKpUdg-*~f+UwS*?k;|CTq
zhxbO+vg!q4zw;`ATLnhY)v*ec|JIt(u&ehic&hs`I-Fuh-l;uIu+Q4rq%EQ8K3it~
z-B4n+tK;B9Zf|hj)nnfosyTWgF&Le=K@xwtEnPaKXZiNGL?K9oEsL6e|9M|O-CsNy
zCB;#{IkxPqQhltNH&0(Jy$xLVGy;h93z3)W5IM)T{k5skWywc9r6*XJsfC-eWq8<J
zk>v*P#*fh9Z@@Ml`P$r(unW`JVELIsOq4rtbPI^IQ8z`%e{An)|Kba>DFx}oz0I|>
zpIt*)&)+Zx+=3q)v!QqQoY213dP(zLUli6~BIxjGBB-mf4=<>*d(%xzmX7Ce+y|H+
z1j(h8sF5Sq!!<L{6TH5My3=KoBuvkj-o!2k9IcX5IP=IR)At&vH!sh9DD`|_UyWYT
z#7cPV;QSaC;)%i_D@G13OrVN?X0Pv(A?Bq_hg+36nW}P)_1<?kpH7&y4>K+zv3|fC
z1Hb3o8!IESki<9tA!p-}XCq~EWJXrBX@SON(y(_yjJ$0M*&8ymEc`TLY>+Wvd6;;z
z0ecCPHHNiwPh0=deiES^6g5TGaNDh0T5BwXZh>twZ~BI<V{&A@E1h=9XA0CbeXf~Y
zWS<(bxB8~pR$Ah4?~fAhKPZ8Pwn2J0uSr$w<tL<FT5YWBeK<9tdNbeVaCd#;@1GfG
z1U@+a#I${bvuGmQw=B#w0mHoN1qGH)$<tM_xr)AEj6J`I)H>#o5$idET2wjp(S-S|
zLVGxn^-o6{B(lNi>xzsLYW}&Bq&-ckE>e4lv~HDIZXEej5xSn=N}dRoE4~ss5!ev<
z<z=tlt`9+|2OPnRR)*vkE2Ga>T86I#NCZn1KFeSx<2A|{Wz@U<&y({BnXhe7lg)IW
zrAs}&jT4ZBbV8I+(WB4SG370P^#lym4qN{`U>zfF(Y3Nt`FqdJdZQ(2?q<0TSNfF&
zZ)!iE=jYQRBoEu82s2B;A<e_sLql)P8!Qxpr26u-em+iOIo3Mtv(1{k$evPGh7v=m
zILju%{AMvRl_hG|57w03@4_wmeJoL~eUXMW46`^cu4G`7)>kvT%1Jm|=CqN%E`54S
ziPkPh@(k@aJi4mq%JG`~2M;Y0uK*&$A(w+TTn^v(t~RuaIq%uuM;mv(9%RH3RSQzh
zT1#DhBw~-Y(1bfPx+vkDr;a;F!Z9ZkI0K&bVw*dy5(G%LUkH)#+ZIfOqKutFqR(zG
zUVc=8^cPc5!uVU~MwFwDmSQxR?(G@rM!AR6BkqY({UVz+3)Dw)8Z~_j)N|z(wJ<sA
zALKI|<V4gYtmTC-<1tpg<Elu2#??%SCPR9isJKO=%}z4JXNFUHnqCcjy_ffgNeUz6
wq~=-kg$K^L>B_N!&Ja8r4TdZKuSY&x0Bv!DQm?Z7>J9{1{$_)zGrxN0f60xqI{*Lx

literal 0
HcmV?d00001


From 534dc00e56af8742177f854386514699e4bc5459 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 18:54:38 -0600
Subject: [PATCH 409/525] Formatting.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87e11fe..4046f4a 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ faster to serialize and deserialize than standard Clojure objects.
 
 ## Getting started
 
-Add the dependency to your project.clj
+Add the dependency to your `project.clj`:
 
 [![Clojars Project][clojars-badge]][clojars]
 

From 41ba06cb27109b9bc09aa7bf30c089e73af6bb19 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:37:21 -0600
Subject: [PATCH 410/525] Updated ignores.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6c512bb..0c1a90b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ protosrc
 .project
 .settings
 target/
+.nrepl*

From 2cca49904e9155115bc89e04a883baf58707d249 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:38:59 -0600
Subject: [PATCH 411/525] Moved example protobuf into new home.

---
 project.clj                                   | 12 +++++++++-
 .../example.proto => examples/photo.proto}    |  3 +--
 test/protobuf/example_test.clj                | 16 -------------
 test/protobuf/examples/photo_test.clj         | 23 +++++++++++++++++++
 4 files changed, 35 insertions(+), 19 deletions(-)
 rename resources/protobuf/{test/example.proto => examples/photo.proto} (91%)
 delete mode 100644 test/protobuf/example_test.clj
 create mode 100644 test/protobuf/examples/photo_test.clj

diff --git a/project.clj b/project.clj
index 2dbfcff..8f76af9 100644
--- a/project.clj
+++ b/project.clj
@@ -28,7 +28,9 @@
         [jonase/eastwood "0.2.5"]
         [lein-ancient "0.6.15"]
         [lein-shell "0.5.0"]]
-      :java-source-paths ["target/test"]}
+      :java-source-paths [
+        "target/examples"
+        "target/test"]}
     :docs {
       :dependencies [
         [clojang/codox-theme "0.2.0-SNAPSHOT"]]
@@ -60,6 +62,11 @@
        "+test"
        "shell"
        "bin/compile-test-protobufs"]
+    "protoc-examples" [
+       "with-profile"
+       "+test"
+       "shell"
+       "bin/compile-example-protobufs"]
     "check-deps" [
       "with-profile"
       "+test"
@@ -82,6 +89,7 @@
       ["clean"]
       ["protoc-extension"]
       ["protoc-test"]
+      ["protoc-examples"]
       ["repl"]]
     "docs" [
       "with-profile"
@@ -96,6 +104,7 @@
       ["clean"]
       ["protoc-extension"]
       ["protoc-test"]
+      ["protoc-examples"]
       ["test-all"]]
     "build-test" [
       "do"
@@ -105,4 +114,5 @@
       ["lint"]
       ["protoc-extension"]
       ["protoc-test"]
+      ["protoc-examples"]
       ["test-all"]]})
diff --git a/resources/protobuf/test/example.proto b/resources/protobuf/examples/photo.proto
similarity index 91%
rename from resources/protobuf/test/example.proto
rename to resources/protobuf/examples/photo.proto
index 9377c28..7b81c09 100644
--- a/resources/protobuf/test/example.proto
+++ b/resources/protobuf/examples/photo.proto
@@ -1,8 +1,7 @@
-package protobuf.test.example;
+package protobuf.examples.photo;
 
 import "protobuf/extensions.proto";
 
-option java_package = "protobuf.test";
 option java_outer_classname = "Example";
 
 message Photo {
diff --git a/test/protobuf/example_test.clj b/test/protobuf/example_test.clj
deleted file mode 100644
index 83a83c6..0000000
--- a/test/protobuf/example_test.clj
+++ /dev/null
@@ -1,16 +0,0 @@
-(ns protobuf.example-test
-  (:require
-    [clojure.test :refer :all]
-    [protobuf.core :as protobuf])
-  (:import
-    (com.google.protobuf ByteString)))
-
-(def Photo (protobuf/mapdef protobuf.test.Example$Photo))
-
-(def data {:id 7, :path "/photos/h2k3j4h9h23", :labels #{"hawaii" "family" "surfing"},
-           :attrs {"color space" "RGB", "dimensions" "1632x1224", "alpha" "no"},
-           :tags {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}
-           :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
-
-(deftest example-test
-  (is (= data (apply protobuf/create Photo (apply concat data)))))
diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
new file mode 100644
index 0000000..f23a985
--- /dev/null
+++ b/test/protobuf/examples/photo_test.clj
@@ -0,0 +1,23 @@
+(ns protobuf.examples.photo-test
+  (:require
+    [clojure.test :refer :all]
+    [protobuf.core :as protobuf])
+  (:import
+    (com.google.protobuf ByteString)
+    (protobuf.examples.photo Example$Photo)))
+
+(def Photo (protobuf/mapdef Example$Photo))
+
+(def data {:id 7
+           :path "/photos/h2k3j4h9h23"
+           :labels #{"hawaii" "family" "surfing"},
+           :attrs {"color space" "RGB" "dimensions" "1632x1224" "alpha" "no"},
+           :tags {4 {:person-id 4
+                     :x-coord 607
+                     :y-coord 813
+                     :width 25
+                     :height 27}}
+           :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
+
+(deftest example-test
+  (is (= data (apply protobuf/create Photo (apply concat data)))))

From 84aab3e854f1c347544c82e4bd20c9e2405123d6 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:38:18 -0600
Subject: [PATCH 412/525] Added another example protobuf.

---
 bin/compile-example-protobufs            | 11 +++++++++++
 resources/protobuf/examples/person.proto | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 bin/compile-example-protobufs
 create mode 100644 resources/protobuf/examples/person.proto

diff --git a/bin/compile-example-protobufs b/bin/compile-example-protobufs
new file mode 100755
index 0000000..cff18ee
--- /dev/null
+++ b/bin/compile-example-protobufs
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+OUT_DIR=target/examples
+
+mkdir -p $OUT_DIR
+protoc \
+  -I=/usr/include \
+  -I=/usr/local/include \
+  -I=resources \
+  --java_out=$OUT_DIR \
+  resources/protobuf/examples/*.proto
diff --git a/resources/protobuf/examples/person.proto b/resources/protobuf/examples/person.proto
new file mode 100644
index 0000000..4557483
--- /dev/null
+++ b/resources/protobuf/examples/person.proto
@@ -0,0 +1,10 @@
+package protobuf.examples.person;
+
+option java_outer_classname = "Example";
+
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}

From 3e13e5eed3e7abcbff459697922140c456bc173f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:39:49 -0600
Subject: [PATCH 413/525] Updated/fixed usage example.

---
 README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4046f4a..e584be7 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,10 @@ Add the dependency to your `project.clj`:
 Then, given a project with the following in `resources/proto/your/namespace/person.proto`:
 
 ```proto
+package your.namespace.person;
+
+option java_outer_classname = "Example";
+
 message Person {
   required int32  id    = 1;
   required string name  = 2;
@@ -57,14 +61,14 @@ Now you can use the protocol buffer in Clojure:
 
 ```clojure
 (require '[protobuf.core :as protobuf])
-(import Example$Person)
+(import (your.namespace.person Example$Person)
 
-(def Person (protodef Example$Person))
+(def Person (protobuf/mapdef Example$Person))
 
 (def p (protobuf/create Person :id 4 :name "Alice" :email "alice@example.com"))
 => {:id 4, :name "Alice", :email "alice@example.com"}
 
-(assoc p :name "Alice B. Carol"))
+(assoc p :name "Alice B. Carol")
 => {:id 4, :name "Alice B. Carol", :email "alice@example.com"}
 
 (assoc p :likes ["climbing" "running" "jumping"])
@@ -82,6 +86,13 @@ similar to a struct-map, except you cannot insert fields that aren't specified
 in the `.proto` file.
 
 
+## Documentation
+
+The above usage is a quick taste; for more examples as well as the current and
+previous reference documentation, visit the
+[Clojure protobuf documentation][docs].
+
+
 <!-- Named page links below: /-->
 
 [travis]: https://travis-ci.org/clojusc/protobuf
@@ -95,3 +106,4 @@ in the `.proto` file.
 [clojure-v]: https://img.shields.io/badge/clojure-1.8.0-blue.svg
 [clojars]: https://clojars.org/clojusc/protobuf
 [clojars-badge]: https://img.shields.io/clojars/v/clojusc/protobuf.svg
+[docs]: https://clojusc.github.io/protobuf

From 941fb2827e5ca4e75c6118d2d429f5da6ecf9aa1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:40:13 -0600
Subject: [PATCH 414/525] Added docs for example usage.

---
 resources/docs/1000-basic-usage.md | 87 ++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 resources/docs/1000-basic-usage.md

diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
new file mode 100644
index 0000000..cc05f49
--- /dev/null
+++ b/resources/docs/1000-basic-usage.md
@@ -0,0 +1,87 @@
+# Basic Usage
+
+
+## Creating a `.proto` File
+
+In the `resources/proto/examples` directory, the Clojure protobuf project
+provides an example "person" protobuf:
+
+```proto
+package protobuf.examples.person;
+
+option java_outer_classname = "Example";
+
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}
+```
+
+
+## Compiling `.proto` to `.java` and then to `.class`
+
+A convenience script is provided to compile this:
+`bin/compile-example-protobufs`. This will create a `.java` file which will be
+saved in `target/examples`.
+
+The `:test` profile in the `project.clj` file has added `target/examples` as
+one of its `:java-source-paths` -- as such, lein will compile the `.java` files
+in `target/examples` to `.class` so that they can be called from Clojure.
+
+If you started the project REPL with the command `lein repl`, then all of this
+has already been done for you.
+
+
+## Using the Clojure API
+
+From the dev REPL, pull in the core API and the compiled protobuf code:
+
+```clj
+[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=> (import '(protobuf.examples.person Example$Person))
+protobuf.examples.person.Example$Person
+```
+
+Now we can create the Java wrapper for our protocol (see
+`protobuf.PersistentProtocolBufferMap` for more details):
+
+```clj
+[protobuf.dev] λ=> (def Person (protobuf/mapdef Example$Person))
+#'protobuf.dev/Person
+```
+
+And with this in hand, we can finally create an instance of the protobuf:
+
+```clj
+[protobuf.dev] λ=> (def p (protobuf/create
+                            Person
+                            :id 4
+                            :name "Alice"
+                            :email "alice@example.com"))
+#'protobuf.dev/p
+[protobuf.dev] λ=> p
+{:id 4, :name "Alice", :email "alice@example.com"}
+```
+
+With our person data in place, we can now do the usual Clojure operations:
+
+```clj
+[protobuf.dev] λ=> (assoc p :name "Alice B. Carol")
+{:id 4, :name "Alice B. Carol", :email "alice@example.com"}
+[protobuf.dev] λ=> (assoc p :likes ["climbing" "running" "jumping"])
+{:id 4, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+```
+
+Additionally, converting between protobuf bytes and Clojure data is trivial:
+
+```clj
+[protobuf.dev] λ=> (def b (protobuf/->bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=> b
+#object["[B" 0x7e3a40eb "[B@7e3a40eb"]
+[protobuf.dev] λ=> (protobuf/parse Person b)
+{:id 4, :name "Alice", :email "alice@example.com"}
+```

From 66316b8bbb2f7c4ee501105789212411d6b92631 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:49:08 -0600
Subject: [PATCH 415/525] Renamed protobuf.test ns to protobuf.testing.

---
 bin/compile-test-protobufs                    |  4 +-
 project.clj                                   |  2 +-
 .../protobuf/{test => testing}/codec.proto    |  4 +-
 .../protobuf/{test => testing}/core.proto     |  4 +-
 .../protobuf/{test => testing}/maps.proto     |  4 +-
 test/protobuf/codec_test.clj                  |  8 ++--
 test/protobuf/core_test.clj                   | 47 ++++++++++---------
 7 files changed, 39 insertions(+), 34 deletions(-)
 rename resources/protobuf/{test => testing}/codec.proto (92%)
 rename resources/protobuf/{test => testing}/core.proto (97%)
 rename resources/protobuf/{test => testing}/maps.proto (91%)

diff --git a/bin/compile-test-protobufs b/bin/compile-test-protobufs
index 4952002..0576900 100755
--- a/bin/compile-test-protobufs
+++ b/bin/compile-test-protobufs
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-OUT_DIR=target/test
+OUT_DIR=target/testing
 
 mkdir -p $OUT_DIR
 protoc \
@@ -8,4 +8,4 @@ protoc \
   -I=/usr/local/include \
   -I=resources \
   --java_out=$OUT_DIR \
-  resources/protobuf/test/*.proto
+  resources/protobuf/testing/*.proto
diff --git a/project.clj b/project.clj
index 8f76af9..cc516bd 100644
--- a/project.clj
+++ b/project.clj
@@ -30,7 +30,7 @@
         [lein-shell "0.5.0"]]
       :java-source-paths [
         "target/examples"
-        "target/test"]}
+        "target/testing"]}
     :docs {
       :dependencies [
         [clojang/codox-theme "0.2.0-SNAPSHOT"]]
diff --git a/resources/protobuf/test/codec.proto b/resources/protobuf/testing/codec.proto
similarity index 92%
rename from resources/protobuf/test/codec.proto
rename to resources/protobuf/testing/codec.proto
index bef7701..014dc3e 100644
--- a/resources/protobuf/test/codec.proto
+++ b/resources/protobuf/testing/codec.proto
@@ -1,8 +1,8 @@
-package protobuf.test.codec;
+package protobuf.testing.codec;
 
 import "protobuf/extensions.proto";
 
-option java_package = "protobuf.test";
+option java_package = "protobuf.testing";
 option java_outer_classname = "Codec";
 
 message Foo {
diff --git a/resources/protobuf/test/core.proto b/resources/protobuf/testing/core.proto
similarity index 97%
rename from resources/protobuf/test/core.proto
rename to resources/protobuf/testing/core.proto
index cfcdb02..1a44b72 100644
--- a/resources/protobuf/test/core.proto
+++ b/resources/protobuf/testing/core.proto
@@ -1,8 +1,8 @@
-package protobuf.test.core;
+package protobuf.testing.core;
 
 import "protobuf/extensions.proto";
 
-option java_package = "protobuf.test";
+option java_package = "protobuf.testing";
 option java_outer_classname = "Core";
 
 message Foo {
diff --git a/resources/protobuf/test/maps.proto b/resources/protobuf/testing/maps.proto
similarity index 91%
rename from resources/protobuf/test/maps.proto
rename to resources/protobuf/testing/maps.proto
index 250bec7..a0aa7f0 100644
--- a/resources/protobuf/test/maps.proto
+++ b/resources/protobuf/testing/maps.proto
@@ -1,8 +1,8 @@
-package protobuf.test.maps;
+package protobuf.testing.maps;
 
 import "protobuf/extensions.proto";
 
-option java_package = "protobuf.test";
+option java_package = "protobuf.testing";
 option java_outer_classname = "Maps";
 
 message Element {
diff --git a/test/protobuf/codec_test.clj b/test/protobuf/codec_test.clj
index f06097c..a93ab93 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/protobuf/codec_test.clj
@@ -4,10 +4,10 @@
     [protobuf.codec :as protobuf-codec])
   (:import
     (java.nio ByteBuffer)
-    (protobuf.test.Codec$Foo)))
+    (protobuf.testing Codec$Foo)))
 
 (deftest protobuf-codec-test
-  (let [codec (protobuf-codec/create protobuf.test.Codec$Foo)]
+  (let [codec (protobuf-codec/create Codec$Foo)]
     (testing "decode an encoded data structure"
       (let [val {:foo 1 :bar 2}]
         (is (= val (protobuf-codec/decode codec (protobuf-codec/encode codec val))))))
@@ -51,8 +51,8 @@
                (protobuf-codec/decode codec (concat data1 data2 data3))))))))
 
 (deftest repeated-protobufs
-  (let [len (protobuf-codec/length-prefix protobuf.test.Codec$Foo)
-        codec (protobuf-codec/create protobuf.test.Codec$Foo :repeated true)]
+  (let [len (protobuf-codec/length-prefix Codec$Foo)
+        codec (protobuf-codec/create Codec$Foo :repeated true)]
     (testing "length-prefix"
       (doseq [i [0 10 100 1000 10000 100000 Integer/MAX_VALUE]]
         (is (= i (protobuf-codec/decode len (protobuf-codec/encode len i))))))
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index 43de862..068fd98 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -4,15 +4,20 @@
     [protobuf.core :as protobuf]
     [protobuf.util :as util])
   (:import
-    (java.io PipedInputStream PipedOutputStream)))
-
-(def Foo (protobuf/mapdef protobuf.test.Core$Foo))
-(def FooUnder (protobuf/mapdef protobuf.test.Core$Foo
+    (java.io PipedInputStream PipedOutputStream)
+    (protobuf.testing Core$Bar
+                      Core$ErrorMsg
+                      Core$Foo
+                      Core$Response
+                      Maps$Struct)))
+
+(def Foo (protobuf/mapdef Core$Foo))
+(def FooUnder (protobuf/mapdef Core$Foo
                         {:naming-strategy protobuf.PersistentProtocolBufferMap$Def/protobufNames}))
-(def Bar (protobuf/mapdef protobuf.test.Core$Bar))
-(def Response (protobuf/mapdef protobuf.test.Core$Response))
-(def ErrorMsg (protobuf/mapdef protobuf.test.Core$ErrorMsg))
-(def Maps (protobuf/mapdef protobuf.test.Maps$Struct))
+(def Bar (protobuf/mapdef Core$Bar))
+(def Response (protobuf/mapdef Core$Response))
+(def ErrorMsg (protobuf/mapdef Core$ErrorMsg))
+(def Maps (protobuf/mapdef Maps$Struct))
 
 (deftest test-conj
   (let [p (protobuf/create Foo :id 5 :tags ["little" "yellow"] :doubles [1.2 3.4 5.6] :floats [0.01 0.02 0.03])]
@@ -355,12 +360,12 @@
 (deftest test-mapdef->schema
   (let [fields
         {:type :struct
-         :name "protobuf.test.core.Foo"
+         :name "protobuf.testing.core.Foo"
          :fields {:id      {:default 43, :type :int}
                   :deleted {:default false, :type :boolean}
                   :lat     {:type :double}
                   :long    {:type :float}
-                  :parent  {:type :struct, :name "protobuf.test.core.Foo"}
+                  :parent  {:type :struct, :name "protobuf.testing.core.Foo"}
                   :floats  {:type :list, :values {:type :float}}
                   :doubles {:type :list, :values {:type :double}}
                   :label   {:type :string, :c 3, :b 2, :a 1}
@@ -368,28 +373,28 @@
                   :tag-set {:type :set,  :values {:type :string}}
                   :counts  {:type   :map
                             :keys   {:type :string}
-                            :values {:type :struct, :name "protobuf.test.core.Count"
+                            :values {:type :struct, :name "protobuf.testing.core.Count"
                                      :fields {:key {:type :string}
                                               :i {:counter true, :type :int}
                                               :d {:counter true, :type :double}}}}
                   :foo-by-id {:type :map
                               :keys   {:default 43, :type :int}
-                              :values {:type :struct, :name "protobuf.test.core.Foo"}}
+                              :values {:type :struct, :name "protobuf.testing.core.Foo"}}
                   :attr-map {:type :map
                              :keys   {:type :string}
                              :values {:type :string}}
                   :pair-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "protobuf.test.core.Pair"
+                             :values {:type :struct, :name "protobuf.testing.core.Pair"
                                       :fields {:key {:type :string}
                                                :val {:type :string}}}}
                   :groups {:type :map
                            :keys   {:type :string}
                            :values {:type :list
-                                    :values {:type :struct, :name "protobuf.test.core.Foo"}}}
+                                    :values {:type :struct, :name "protobuf.testing.core.Foo"}}}
                   :responses {:type :list
                               :values {:type :enum, :values #{:no :yes :maybe :not-sure}}}
-                  :time {:type :struct, :name "protobuf.test.core.Time", :succession true
+                  :time {:type :struct, :name "protobuf.testing.core.Time", :succession true
                          :fields {:year   {:type :int}
                                   :month  {:type :int}
                                   :day    {:type :int}
@@ -397,16 +402,16 @@
                                   :minute {:type :int}}}
                   :item-map {:type :map
                              :keys   {:type :string}
-                             :values {:type :struct, :name "protobuf.test.core.Item"
+                             :values {:type :struct, :name "protobuf.testing.core.Item"
                                       :fields {:item   {:type :string},
                                                :exists {:default true, :type :boolean}}}}
                   :things {:type :map
                            :keys {:type :string}
-                           :values {:type :struct, :name "protobuf.test.core.Thing"
+                           :values {:type :struct, :name "protobuf.testing.core.Thing"
                                     :fields {:id {:type :string}
                                              :marked {:type :boolean}}}}}}]
     (is (= fields (protobuf/mapdef->schema Foo)))
-    (is (= fields (protobuf/mapdef->schema protobuf.test.Core$Foo)))))
+    (is (= fields (protobuf/mapdef->schema Core$Foo)))))
 
 (comment deftest test-default-protobuf
   (is (= 43    (default-protobuf Foo :id)))
@@ -421,7 +426,7 @@
   (is (= {}    (default-protobuf Foo :groups)))
   (is (= {}    (default-protobuf Foo :item-map)))
   (is (= false (default-protobuf Foo :deleted)))
-  (is (= {}    (default-protobuf protobuf.test.Core$Foo :groups))))
+  (is (= {}    (default-protobuf Core$Foo :groups))))
 
 (deftest test-use-underscores
   (let [dashes      (protobuf/create Foo      {:tag_set ["odd"]
@@ -460,7 +465,7 @@
            (protobuf/read Foo in)))))
 
 (deftest test-encoding-errors
-  (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.test.core.Foo.label to 8"
+  (is (thrown-with-msg? IllegalArgumentException #"error setting string field protobuf.testing.core.Foo.label to 8"
         (protobuf/create Foo :label 8)))
-  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.test.core.Foo.tags"
+  (is (thrown-with-msg? IllegalArgumentException #"error adding 1 to string field protobuf.testing.core.Foo.tags"
         (protobuf/create Foo :tags [1 2 3]))))

From 1280111a231d1b836e0e72d343d352bea520d128 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 20:52:28 -0600
Subject: [PATCH 416/525] Commented alias sections (it's getting long now).

---
 project.clj | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/project.clj b/project.clj
index cc516bd..0f2cd3a 100644
--- a/project.clj
+++ b/project.clj
@@ -52,6 +52,25 @@
     :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
     :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
+    ;; AOT compilation, REPL, and doc-generation
+    "ubercompile" [
+      "with-profile"
+      "+ubercompile"
+      "compile"]
+    "repl" [
+      "with-profile"
+      "+test,+custom-repl"
+      "do"
+      ["clean"]
+      ["protoc-extension"]
+      ["protoc-test"]
+      ["protoc-examples"]
+      ["repl"]]
+    "docs" [
+      "with-profile"
+      "+docs"
+      "codox"]
+    ;; Protobuf compilation tasks
     "protoc-extension" [
       "with-profile"
       "+test"
@@ -67,6 +86,7 @@
        "+test"
        "shell"
        "bin/compile-example-protobufs"]
+    ;; Deps, linting, and tests
     "check-deps" [
       "with-profile"
       "+test"
@@ -78,23 +98,6 @@
       "+test"
       "eastwood"
       "{:namespaces [:source-paths] :source-paths [\"src\"]}"]
-    "ubercompile" [
-      "with-profile"
-      "+ubercompile"
-      "compile"]
-    "repl" [
-      "with-profile"
-      "+test,+custom-repl"
-      "do"
-      ["clean"]
-      ["protoc-extension"]
-      ["protoc-test"]
-      ["protoc-examples"]
-      ["repl"]]
-    "docs" [
-      "with-profile"
-      "+docs"
-      "codox"]
     "test-all" [
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"

From c8f6ff2a314af9e19c3f9effb2d956388ae355c2 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 21:09:08 -0600
Subject: [PATCH 417/525] Added docs for extensions.

This is based upon what was in the original README for the upstream project.
---
 resources/docs/1100-extensions.md | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 resources/docs/1100-extensions.md

diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
new file mode 100644
index 0000000..9ab2e83
--- /dev/null
+++ b/resources/docs/1100-extensions.md
@@ -0,0 +1,107 @@
+# Extensions
+
+The Clojure protobuf library supports extensions to protocol buffers which
+provide sets and maps using repeated fields. Furthermore, the Clojure protobuf
+extension allows you to provide metadata on protobuf fields using Clojure
+syntax.
+
+To use these, you must import the extension `.proto` file in the protobuf file
+where you want to use our extensions and then include it when compiling.
+
+For example:
+
+```proto
+import "protobuf/core/extensions.proto";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+```
+
+Then you can access the extension fields in Clojure:
+
+Start up the REPL and do the appropriate requires/imports:
+
+```clj
+[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=> (import (protobuf.examples.photo Example$Photo Example$Photo$Tag))
+protobuf.examples.photo.Example$Photo$Tag
+```
+
+Create our protobuf:
+
+```clj
+[protobuf.dev] λ=> (def Photo (protobuf/mapdef Example$Photo))
+#'protobuf.dev/Photo
+[protobuf.dev] λ=> (def Tag (protobuf/mapdef Example$Photo$Tag))
+#'protobuf.dev/Tag
+[protobuf.dev] λ=> (def p (protobuf/create
+              #_=>          Photo
+              #_=>          :id 7
+              #_=>          :path "/photos/h2k3j4h9h23"
+              #_=>          :labels #{"hawaii" "family" "surfing"}
+              #_=>          :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+              #_=>          :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+#'protobuf.dev/p
+[protobuf.dev] λ=> p
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+```
+
+Convert to and from bytes:
+
+```clj
+[protobuf.dev] λ=> (def b (protobuf/->bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=> b
+#object["[B" 0x4455bb6e "[B@4455bb6e"]
+[protobuf.dev] λ=> (protobuf/parse Photo b)
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+```
+
+Get the schema for a protobuf (or extract a part of it):
+
+```clj
+[protobuf.dev] λ=> (protobuf/mapdef->schema Tag)
+ :name "protobuf.examples.photo.Photo.Tag",
+ :fields
+ {:person-id {:type :int},
+  :x-coord {:type :int, :max 100.0, :min -100.0},
+  :y-coord {:type :int},
+  :width {:type :int},
+  :height {:type :int}}}
+[protobuf.dev] λ=> (get-in (protobuf/mapdef->schema Tag) [:fields :x-coord])
+{:type :int, :max 100.0, :min -100.0}
+```

From 5a877c712b4f0debb34852b110294a3b98463c0f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 21:11:12 -0600
Subject: [PATCH 418/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html    | 55 +++++++++++++++++
 docs/current/1100-extensions.html     | 87 +++++++++++++++++++++++++++
 docs/current/9999-other-versions.html |  2 +-
 docs/current/index.html               |  2 +-
 docs/current/protobuf.codec.html      |  2 +-
 docs/current/protobuf.core.html       |  2 +-
 docs/current/protobuf.schema.html     |  2 +-
 docs/current/protobuf.util.html       |  2 +-
 8 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 docs/current/1000-basic-usage.html
 create mode 100644 docs/current/1100-extensions.html

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
new file mode 100644
index 0000000..fd04194
--- /dev/null
+++ b/docs/current/1000-basic-usage.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
+<p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
+<pre><code class="proto">package protobuf.examples.person;
+
+option java_outer_classname = "Example";
+
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}
+</code></pre>
+<h2><a href="#compiling-to-and-then-to" name="compiling-to-and-then-to"></a>Compiling <code>.proto</code> to <code>.java</code> and then to <code>.class</code></h2>
+<p>A convenience script is provided to compile this: <code>bin/compile-example-protobufs</code>. This will create a <code>.java</code> file which will be saved in <code>target/examples</code>.</p>
+<p>The <code>:test</code> profile in the <code>project.clj</code> file has added <code>target/examples</code> as one of its <code>:java-source-paths</code> – as such, lein will compile the <code>.java</code> files in <code>target/examples</code> to <code>.class</code> so that they can be called from Clojure.</p>
+<p>If you started the project REPL with the command <code>lein repl</code>, then all of this has already been done for you.</p>
+<h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the Clojure API</h2>
+<p>From the dev REPL, pull in the core API and the compiled protobuf code:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import (protobuf.examples.person Example$Person))
+protobuf.examples.person.Example$Person
+</code></pre>
+<p>Now we can create the Java wrapper for our protocol (see <code>protobuf.PersistentProtocolBufferMap</code> for more details):</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef Example$Person))
+#'protobuf.dev/Person
+</code></pre>
+<p>And with this in hand, we can finally create an instance of the protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Person
+                            :id 4
+                            :name "Alice"
+                            :email "alice@example.com"))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 4, :name "Alice", :email "alice@example.com"}
+</code></pre>
+<p>With our person data in place, we can now do the usual Clojure operations:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (assoc p :name "Alice B. Carol")
+{:id 4, :name "Alice B. Carol", :email "alice@example.com"}
+[protobuf.dev] λ=&gt; (assoc p :likes ["climbing" "running" "jumping"])
+{:id 4, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+</code></pre>
+<p>Additionally, converting between protobuf bytes and Clojure data is trivial:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x7e3a40eb "[B@7e3a40eb"]
+[protobuf.dev] λ=&gt; (protobuf/parse Person b)
+{:id 4, :name "Alice", :email "alice@example.com"}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
new file mode 100644
index 0000000..9978fbd
--- /dev/null
+++ b/docs/current/1100-extensions.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
+<p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
+<p>For example:</p>
+<pre><code class="proto">import "protobuf/core/extensions.proto";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+</code></pre>
+<p>Then you can access the extension fields in Clojure:</p>
+<p>Start up the REPL and do the appropriate requires/imports:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import (protobuf.examples.photo Example$Photo Example$Photo$Tag))
+protobuf.examples.photo.Example$Photo$Tag
+</code></pre>
+<p>Create our protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Photo (protobuf/mapdef Example$Photo))
+#'protobuf.dev/Photo
+[protobuf.dev] λ=&gt; (def Tag (protobuf/mapdef Example$Photo$Tag))
+#'protobuf.dev/Tag
+[protobuf.dev] λ=&gt; (def p (protobuf/create
+              #_=&gt;          Photo
+              #_=&gt;          :id 7
+              #_=&gt;          :path "/photos/h2k3j4h9h23"
+              #_=&gt;          :labels #{"hawaii" "family" "surfing"}
+              #_=&gt;          :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+              #_=&gt;          :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Convert to and from bytes:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x4455bb6e "[B@4455bb6e"]
+[protobuf.dev] λ=&gt; (protobuf/parse Photo b)
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Get the schema for a protobuf (or extract a part of it):</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/mapdef-&gt;schema Tag)
+ :name "protobuf.examples.photo.Photo.Tag",
+ :fields
+ {:person-id {:type :int},
+  :x-coord {:type :int, :max 100.0, :min -100.0},
+  :y-coord {:type :int},
+  :width {:type :int},
+  :height {:type :int}}}
+[protobuf.dev] λ=&gt; (get-in (protobuf/mapdef-&gt;schema Tag) [:fields :x-coord])
+{:type :int, :max 100.0, :min -100.0}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 849472b..e5104a3 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index a4da084..a73dcf3 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index d963db9..ecd046c 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 77ee8ad..fa59d22 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index eb4acde..b01b01f 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index 2734bc3..9136f69 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From e08365a9d9ef61141157d4fe4cb7ef877c0dde27 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 10:37:17 -0600
Subject: [PATCH 419/525] Split Clojure and Java source files.

---
 bin/compile-protobuf-extension                           | 2 +-
 project.clj                                              | 5 +++--
 src/{ => clj}/protobuf/codec.clj                         | 0
 src/{ => clj}/protobuf/core.clj                          | 0
 src/{ => clj}/protobuf/schema.clj                        | 0
 src/{ => clj}/protobuf/util.clj                          | 0
 src/{ => java}/protobuf/Extensions.java                  | 0
 src/{ => java}/protobuf/PersistentProtocolBufferMap.java | 0
 8 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{ => clj}/protobuf/codec.clj (100%)
 rename src/{ => clj}/protobuf/core.clj (100%)
 rename src/{ => clj}/protobuf/schema.clj (100%)
 rename src/{ => clj}/protobuf/util.clj (100%)
 rename src/{ => java}/protobuf/Extensions.java (100%)
 rename src/{ => java}/protobuf/PersistentProtocolBufferMap.java (100%)

diff --git a/bin/compile-protobuf-extension b/bin/compile-protobuf-extension
index ebf0dc4..c0dd280 100755
--- a/bin/compile-protobuf-extension
+++ b/bin/compile-protobuf-extension
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-OUT_DIR=src
+OUT_DIR=src/java
 
 mkdir -p $OUT_DIR
 protoc \
diff --git a/project.clj b/project.clj
index 0f2cd3a..bcea5c8 100644
--- a/project.clj
+++ b/project.clj
@@ -11,7 +11,8 @@
     [gloss "0.2.6"]
     [org.clojure/clojure "1.8.0"]
     [org.flatland/io "0.3.0"]]
-  :java-source-paths ["src"]
+  :source-paths ["src/clj"]
+  :java-source-paths ["src/java"]
   :profiles {
     :ubercompile {
       :aot :all}
@@ -97,7 +98,7 @@
       "with-profile"
       "+test"
       "eastwood"
-      "{:namespaces [:source-paths] :source-paths [\"src\"]}"]
+      "{:namespaces [:source-paths] :source-paths [\"src/clj\"]}"]
     "test-all" [
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"
diff --git a/src/protobuf/codec.clj b/src/clj/protobuf/codec.clj
similarity index 100%
rename from src/protobuf/codec.clj
rename to src/clj/protobuf/codec.clj
diff --git a/src/protobuf/core.clj b/src/clj/protobuf/core.clj
similarity index 100%
rename from src/protobuf/core.clj
rename to src/clj/protobuf/core.clj
diff --git a/src/protobuf/schema.clj b/src/clj/protobuf/schema.clj
similarity index 100%
rename from src/protobuf/schema.clj
rename to src/clj/protobuf/schema.clj
diff --git a/src/protobuf/util.clj b/src/clj/protobuf/util.clj
similarity index 100%
rename from src/protobuf/util.clj
rename to src/clj/protobuf/util.clj
diff --git a/src/protobuf/Extensions.java b/src/java/protobuf/Extensions.java
similarity index 100%
rename from src/protobuf/Extensions.java
rename to src/java/protobuf/Extensions.java
diff --git a/src/protobuf/PersistentProtocolBufferMap.java b/src/java/protobuf/PersistentProtocolBufferMap.java
similarity index 100%
rename from src/protobuf/PersistentProtocolBufferMap.java
rename to src/java/protobuf/PersistentProtocolBufferMap.java

From f6e4429e6589bd1cae4a7fb461de5a929e096891 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:03:27 -0600
Subject: [PATCH 420/525] Added support for generating javadocs.

---
 bin/javadoc                    | 11 +++++++++++
 project.clj                    | 11 ++++++++++-
 resources/docs/9900-javadoc.md | 11 +++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 bin/javadoc
 create mode 100644 resources/docs/9900-javadoc.md

diff --git a/bin/javadoc b/bin/javadoc
new file mode 100755
index 0000000..760d15b
--- /dev/null
+++ b/bin/javadoc
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+OUT_DIR=docs/current/javadoc
+
+rm -rf $OUT_DIR
+
+javadoc \
+  -d $OUT_DIR \
+  -public protobuf \
+  -windowtitle "Clojure Protocol Buffer Library" \
+  src/java/protobuf/*.java
diff --git a/project.clj b/project.clj
index bcea5c8..d1953d6 100644
--- a/project.clj
+++ b/project.clj
@@ -67,10 +67,19 @@
       ["protoc-test"]
       ["protoc-examples"]
       ["repl"]]
-    "docs" [
+    "clojuredocs" [
       "with-profile"
       "+docs"
       "codox"]
+    "javadocs" [
+      "with-profile"
+      "+test"
+      "shell"
+      "bin/javadoc"]
+    "docs" [
+      "do"
+      ["clojuredocs"]
+      ["javadocs"]]
     ;; Protobuf compilation tasks
     "protoc-extension" [
       "with-profile"
diff --git a/resources/docs/9900-javadoc.md b/resources/docs/9900-javadoc.md
new file mode 100644
index 0000000..468dd91
--- /dev/null
+++ b/resources/docs/9900-javadoc.md
@@ -0,0 +1,11 @@
+# javadoc
+
+Some of the source files in the Clojure protobuf project are written in Java.
+For these, `javadoc` has been run to generate their package docs:
+
+* [The Java API Reference for Clojure protobuf][javadocs]
+
+
+<!-- Named page links below: /-->
+
+[javadocs]: javadoc/index.html

From d9f78f31c365abf76fa9f3830a322524c01c7560 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:04:02 -0600
Subject: [PATCH 421/525] Generated java docs.

---
 docs/current/9900-javadoc.html                |   8 +
 docs/current/javadoc/allclasses-frame.html    |  26 +
 docs/current/javadoc/allclasses-noframe.html  |  26 +
 docs/current/javadoc/constant-values.html     | 247 ++++++
 docs/current/javadoc/deprecated-list.html     | 120 +++
 docs/current/javadoc/help-doc.html            | 217 +++++
 docs/current/javadoc/index-all.html           | 623 ++++++++++++++
 docs/current/javadoc/index.html               |  72 ++
 docs/current/javadoc/overview-tree.html       | 147 ++++
 docs/current/javadoc/package-list             |   1 +
 docs/current/javadoc/protobuf/Extensions.html | 764 +++++++++++++++++
 ...tProtocolBufferMap.Def.NamingStrategy.html | 240 ++++++
 .../PersistentProtocolBufferMap.Def.html      | 532 ++++++++++++
 .../protobuf/PersistentProtocolBufferMap.html | 803 ++++++++++++++++++
 .../javadoc/protobuf/package-frame.html       |  26 +
 .../javadoc/protobuf/package-summary.html     | 161 ++++
 .../javadoc/protobuf/package-tree.html        | 143 ++++
 docs/current/javadoc/script.js                |  30 +
 docs/current/javadoc/serialized-form.html     | 156 ++++
 docs/current/javadoc/stylesheet.css           | 574 +++++++++++++
 20 files changed, 4916 insertions(+)
 create mode 100644 docs/current/9900-javadoc.html
 create mode 100644 docs/current/javadoc/allclasses-frame.html
 create mode 100644 docs/current/javadoc/allclasses-noframe.html
 create mode 100644 docs/current/javadoc/constant-values.html
 create mode 100644 docs/current/javadoc/deprecated-list.html
 create mode 100644 docs/current/javadoc/help-doc.html
 create mode 100644 docs/current/javadoc/index-all.html
 create mode 100644 docs/current/javadoc/index.html
 create mode 100644 docs/current/javadoc/overview-tree.html
 create mode 100644 docs/current/javadoc/package-list
 create mode 100644 docs/current/javadoc/protobuf/Extensions.html
 create mode 100644 docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
 create mode 100644 docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
 create mode 100644 docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
 create mode 100644 docs/current/javadoc/protobuf/package-frame.html
 create mode 100644 docs/current/javadoc/protobuf/package-summary.html
 create mode 100644 docs/current/javadoc/protobuf/package-tree.html
 create mode 100644 docs/current/javadoc/script.js
 create mode 100644 docs/current/javadoc/serialized-form.html
 create mode 100644 docs/current/javadoc/stylesheet.css

diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
new file mode 100644
index 0000000..710c346
--- /dev/null
+++ b/docs/current/9900-javadoc.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
+<ul>
+  <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
new file mode 100644
index 0000000..738c78a
--- /dev/null
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
new file mode 100644
index 0000000..42e7e04
--- /dev/null
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
new file mode 100644
index 0000000..749a52b
--- /dev/null
+++ b/docs/current/javadoc/constant-values.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Constant Field Values (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#protobuf">protobuf.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="protobuf">
+<!--   -->
+</a>
+<h2 title="protobuf">protobuf.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.COUNTER_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52004</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52003</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52006</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52007</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52002</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.META_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52010</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52025</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52026</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52024</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52022</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52023</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52021</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52020</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.SET_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52001</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52005</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
new file mode 100644
index 0000000..598fead
--- /dev/null
+++ b/docs/current/javadoc/deprecated-list.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Deprecated List (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Deprecated List (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
new file mode 100644
index 0000000..122ad63
--- /dev/null
+++ b/docs/current/javadoc/help-doc.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>API Help (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="API Help (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
new file mode 100644
index 0000000..eef4da0
--- /dev/null
+++ b/docs/current/javadoc/index-all.html
@@ -0,0 +1,623 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Index (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Index (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
+<!--   -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:B">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:C">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:D">
+<!--   -->
+</a>
+<h2 class="title">D</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:E">
+<!--   -->
+</a>
+<h2 class="title">E</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:F">
+<!--   -->
+</a>
+<h2 class="title">F</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:G">
+<!--   -->
+</a>
+<h2 class="title">G</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:I">
+<!--   -->
+</a>
+<h2 class="title">I</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:M">
+<!--   -->
+</a>
+<h2 class="title">M</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:N">
+<!--   -->
+</a>
+<h2 class="title">N</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+</dl>
+<a name="I:P">
+<!--   -->
+</a>
+<h2 class="title">P</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/package-summary.html">protobuf</a> - package protobuf</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+</dl>
+<a name="I:R">
+<!--   -->
+</a>
+<h2 class="title">R</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:S">
+<!--   -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:T">
+<!--   -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:W">
+<!--   -->
+</a>
+<h2 class="title">W</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
new file mode 100644
index 0000000..628eee6
--- /dev/null
+++ b/docs/current/javadoc/index.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Clojure Protocol Buffer Library</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="protobuf/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="protobuf/package-summary.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
new file mode 100644
index 0000000..ec28e40
--- /dev/null
+++ b/docs/current/javadoc/overview-tree.html
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="protobuf/package-tree.html">protobuf</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/package-list b/docs/current/javadoc/package-list
new file mode 100644
index 0000000..b0c79cc
--- /dev/null
+++ b/docs/current/javadoc/package-list
@@ -0,0 +1 @@
+protobuf
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
new file mode 100644
index 0000000..1d27a24
--- /dev/null
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -0,0 +1,764 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Extensions (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Extensions (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class Extensions" class="title">Class Extensions</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.Extensions</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">Extensions</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#counter">counter</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#map">map</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapBy">mapBy</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapDeleted">mapDeleted</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapExists">mapExists</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#meta">meta</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullable">nullable</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullDouble">nullDouble</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullEnum">nullEnum</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullFloat">nullFloat</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullInt">nullInt</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullLong">nullLong</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullString">nullString</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#set">set</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#succession">succession</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static com.google.protobuf.Descriptors.FileDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#getDescriptor--">getDescriptor</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions</a></span>(com.google.protobuf.ExtensionRegistry&nbsp;registry)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="SET_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SET_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SET_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SET_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="set">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>set</h4>
+<pre>public static final&nbsp;&lt;any&gt; set</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="map">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>map</h4>
+<pre>public static final&nbsp;&lt;any&gt; map</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_BY_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_BY_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_BY_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapBy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapBy</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapBy</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="COUNTER_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COUNTER_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int COUNTER_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.COUNTER_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="counter">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>counter</h4>
+<pre>public static final&nbsp;&lt;any&gt; counter</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SUCCESSION_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SUCCESSION_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SUCCESSION_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="succession">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>succession</h4>
+<pre>public static final&nbsp;&lt;any&gt; succession</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_DELETED_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_DELETED_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapDeleted">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapDeleted</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapDeleted</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_EXISTS_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_EXISTS_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapExists">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapExists</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapExists</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="META_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>META_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int META_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.META_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="meta">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public static final&nbsp;&lt;any&gt; meta</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULLABLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULLABLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULLABLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullable">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullable</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullable</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_STRING_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_STRING_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_STRING_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullString">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullString</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullString</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_INT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_INT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_INT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullInt">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullInt</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullInt</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_LONG_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_LONG_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_LONG_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullLong">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullLong</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullLong</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_FLOAT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_FLOAT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullFloat">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullFloat</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullFloat</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_DOUBLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_DOUBLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullDouble">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullDouble</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullDouble</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_ENUM_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_ENUM_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullEnum">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>nullEnum</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullEnum</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="registerAllExtensions-com.google.protobuf.ExtensionRegistry-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerAllExtensions</h4>
+<pre>public static&nbsp;void&nbsp;registerAllExtensions(com.google.protobuf.ExtensionRegistry&nbsp;registry)</pre>
+</li>
+</ul>
+<a name="getDescriptor--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDescriptor</h4>
+<pre>public static&nbsp;com.google.protobuf.Descriptors.FileDescriptor&nbsp;getDescriptor()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
new file mode 100644
index 0000000..7b01e97
--- /dev/null
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Interface PersistentProtocolBufferMap.Def.NamingStrategy" class="title">Interface PersistentProtocolBufferMap.Def.NamingStrategy</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static interface <span class="typeNameLabel">PersistentProtocolBufferMap.Def.NamingStrategy</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName</a></span>(java.lang.String&nbsp;protoName)</code>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName</a></span>(java.lang.Object&nbsp;clojureName)</code>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="protoName-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protoName</h4>
+<pre>java.lang.String&nbsp;protoName(java.lang.Object&nbsp;clojureName)</pre>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</li>
+</ul>
+<a name="clojureName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureName</h4>
+<pre>java.lang.Object&nbsp;clojureName(java.lang.String&nbsp;protoName)</pre>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
new file mode 100644
index 0000000..a88e13b
--- /dev/null
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -0,0 +1,532 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap.Def" class="title">Class PersistentProtocolBufferMap.Def</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap.Def</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">PersistentProtocolBufferMap.Def</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static clojure.lang.Var</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue</a></span>(Descriptors.EnumValueDescriptor&nbsp;enum_value)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create</a></span>(Descriptors.Descriptor&nbsp;type,
+      <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+      int&nbsp;sizeLimit)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>Descriptors.FieldDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr</a></span>(java.lang.Object&nbsp;named)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom</a></span>(java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom</a></span>(byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom</a></span>(CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="NAME_VAR">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NAME_VAR</h4>
+<pre>public static final&nbsp;clojure.lang.Var NAME_VAR</pre>
+</li>
+</ul>
+<a name="protobufNames">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protobufNames</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> protobufNames</pre>
+</li>
+</ul>
+<a name="convertUnderscores">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertUnderscores</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> convertUnderscores</pre>
+</li>
+</ul>
+<a name="type">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>type</h4>
+<pre>public final&nbsp;Descriptors.Descriptor type</pre>
+</li>
+</ul>
+<a name="namingStrategy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>namingStrategy</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> namingStrategy</pre>
+</li>
+</ul>
+<a name="sizeLimit">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sizeLimit</h4>
+<pre>public final&nbsp;int sizeLimit</pre>
+</li>
+</ul>
+<a name="NULL">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NULL</h4>
+<pre>public static final&nbsp;java.lang.Object NULL</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="nameStr-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nameStr</h4>
+<pre>public static final&nbsp;java.lang.String&nbsp;nameStr(java.lang.Object&nbsp;named)</pre>
+</li>
+</ul>
+<a name="create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;create(Descriptors.Descriptor&nbsp;type,
+                                                     <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+                                                     int&nbsp;sizeLimit)</pre>
+</li>
+</ul>
+<a name="parseFrom-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(byte[]&nbsp;bytes)
+                         throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(CodedInputStream&nbsp;input)
+                         throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;parseDelimitedFrom(java.io.InputStream&nbsp;input)
+                                          throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newBuilder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>newBuilder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;newBuilder()</pre>
+</li>
+</ul>
+<a name="fieldDescriptor-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fieldDescriptor</h4>
+<pre>public&nbsp;Descriptors.FieldDescriptor&nbsp;fieldDescriptor(java.lang.Object&nbsp;key)</pre>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+</li>
+</ul>
+<a name="getFullName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFullName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getFullName()</pre>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="intern-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>intern</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;intern(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="clojureEnumValue-Descriptors.EnumValueDescriptor-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureEnumValue</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;clojureEnumValue(Descriptors.EnumValueDescriptor&nbsp;enum_value)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
new file mode 100644
index 0000000..79d2a77
--- /dev/null
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -0,0 +1,803 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":9,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap" class="title">Class PersistentProtocolBufferMap</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.AFn</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.APersistentMap</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>clojure.lang.Associative, clojure.lang.Counted, clojure.lang.IFn, clojure.lang.IHashEq, clojure.lang.ILookup, clojure.lang.IMeta, clojure.lang.IObj, clojure.lang.IPersistentCollection, clojure.lang.IPersistentMap, clojure.lang.MapEquivalence, clojure.lang.Seqable, java.io.Serializable, java.lang.Iterable, java.lang.Runnable, java.util.concurrent.Callable, java.util.Map</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PersistentProtocolBufferMap</span>
+extends clojure.lang.APersistentMap
+implements clojure.lang.IObj</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#protobuf.PersistentProtocolBufferMap">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clojure.lang.APersistentMap.KeySeq, clojure.lang.APersistentMap.ValSeq</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;java.util.Map</h3>
+<code>java.util.Map.Entry&lt;K,V&gt;</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.IFn">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;clojure.lang.IFn</h3>
+<code>clojure.lang.IFn.D, clojure.lang.IFn.DD, clojure.lang.IFn.DDD, clojure.lang.IFn.DDDD, clojure.lang.IFn.DDDDD, clojure.lang.IFn.DDDDL, clojure.lang.IFn.DDDDO, clojure.lang.IFn.DDDL, clojure.lang.IFn.DDDLD, clojure.lang.IFn.DDDLL, clojure.lang.IFn.DDDLO, clojure.lang.IFn.DDDO, clojure.lang.IFn.DDDOD, clojure.lang.IFn.DDDOL, clojure.lang.IFn.DDDOO, clojure.lang.IFn.DDL, clojure.lang.IFn.DDLD, clojure.lang.IFn.DDLDD, clojure.lang.IFn.DDLDL, clojure.lang.IFn.DDLDO, clojure.lang.IFn.DDLL, clojure.lang.IFn.DDLLD, clojure.lang.IFn.DDLLL, clojure.lang.IFn.DDLLO, clojure.lang.IFn.DDLO, clojure.lang.IFn.DDLOD, clojure.lang.IFn.DDLOL, clojure.lang.IFn.DDLOO, clojure.lang.IFn.DDO, clojure.lang.IFn.DDOD, clojure.lang.IFn.DDODD, clojure.lang.IFn.DDODL, clojure.lang.IFn.DDODO, clojure.lang.IFn.DDOL, clojure.lang.IFn.DDOLD, clojure.lang.IFn.DDOLL, clojure.lang.IFn.DDOLO, clojure.lang.IFn.DDOO, clojure.lang.IFn.DDOOD, clojure.lang.IFn.DDOOL, clojure.lang.IFn.DDOOO, clojure.lang.IFn.DL, clojure.lang.IFn.DLD, clojure.lang.IFn.DLDD, clojure.lang.IFn.DLDDD, clojure.lang.IFn.DLDDL, clojure.lang.IFn.DLDDO, clojure.lang.IFn.DLDL, clojure.lang.IFn.DLDLD, clojure.lang.IFn.DLDLL, clojure.lang.IFn.DLDLO, clojure.lang.IFn.DLDO, clojure.lang.IFn.DLDOD, clojure.lang.IFn.DLDOL, clojure.lang.IFn.DLDOO, clojure.lang.IFn.DLL, clojure.lang.IFn.DLLD, clojure.lang.IFn.DLLDD, clojure.lang.IFn.DLLDL, clojure.lang.IFn.DLLDO, clojure.lang.IFn.DLLL, clojure.lang.IFn.DLLLD, clojure.lang.IFn.DLLLL, clojure.lang.IFn.DLLLO, clojure.lang.IFn.DLLO, clojure.lang.IFn.DLLOD, clojure.lang.IFn.DLLOL, clojure.lang.IFn.DLLOO, clojure.lang.IFn.DLO, clojure.lang.IFn.DLOD, clojure.lang.IFn.DLODD, clojure.lang.IFn.DLODL, clojure.lang.IFn.DLODO, clojure.lang.IFn.DLOL, clojure.lang.IFn.DLOLD, clojure.lang.IFn.DLOLL, clojure.lang.IFn.DLOLO, clojure.lang.IFn.DLOO, clojure.lang.IFn.DLOOD, clojure.lang.IFn.DLOOL, clojure.lang.IFn.DLOOO, clojure.lang.IFn.DO, clojure.lang.IFn.DOD, clojure.lang.IFn.DODD, clojure.lang.IFn.DODDD, clojure.lang.IFn.DODDL, clojure.lang.IFn.DODDO, clojure.lang.IFn.DODL, clojure.lang.IFn.DODLD, clojure.lang.IFn.DODLL, clojure.lang.IFn.DODLO, clojure.lang.IFn.DODO, clojure.lang.IFn.DODOD, clojure.lang.IFn.DODOL, clojure.lang.IFn.DODOO, clojure.lang.IFn.DOL, clojure.lang.IFn.DOLD, clojure.lang.IFn.DOLDD, clojure.lang.IFn.DOLDL, clojure.lang.IFn.DOLDO, clojure.lang.IFn.DOLL, clojure.lang.IFn.DOLLD, clojure.lang.IFn.DOLLL, clojure.lang.IFn.DOLLO, clojure.lang.IFn.DOLO, clojure.lang.IFn.DOLOD, clojure.lang.IFn.DOLOL, clojure.lang.IFn.DOLOO, clojure.lang.IFn.DOO, clojure.lang.IFn.DOOD, clojure.lang.IFn.DOODD, clojure.lang.IFn.DOODL, clojure.lang.IFn.DOODO, clojure.lang.IFn.DOOL, clojure.lang.IFn.DOOLD, clojure.lang.IFn.DOOLL, clojure.lang.IFn.DOOLO, clojure.lang.IFn.DOOO, clojure.lang.IFn.DOOOD, clojure.lang.IFn.DOOOL, clojure.lang.IFn.DOOOO, clojure.lang.IFn.L, clojure.lang.IFn.LD, clojure.lang.IFn.LDD, clojure.lang.IFn.LDDD, clojure.lang.IFn.LDDDD, clojure.lang.IFn.LDDDL, clojure.lang.IFn.LDDDO, clojure.lang.IFn.LDDL, clojure.lang.IFn.LDDLD, clojure.lang.IFn.LDDLL, clojure.lang.IFn.LDDLO, clojure.lang.IFn.LDDO, clojure.lang.IFn.LDDOD, clojure.lang.IFn.LDDOL, clojure.lang.IFn.LDDOO, clojure.lang.IFn.LDL, clojure.lang.IFn.LDLD, clojure.lang.IFn.LDLDD, clojure.lang.IFn.LDLDL, clojure.lang.IFn.LDLDO, clojure.lang.IFn.LDLL, clojure.lang.IFn.LDLLD, clojure.lang.IFn.LDLLL, clojure.lang.IFn.LDLLO, clojure.lang.IFn.LDLO, clojure.lang.IFn.LDLOD, clojure.lang.IFn.LDLOL, clojure.lang.IFn.LDLOO, clojure.lang.IFn.LDO, clojure.lang.IFn.LDOD, clojure.lang.IFn.LDODD, clojure.lang.IFn.LDODL, clojure.lang.IFn.LDODO, clojure.lang.IFn.LDOL, clojure.lang.IFn.LDOLD, clojure.lang.IFn.LDOLL, clojure.lang.IFn.LDOLO, clojure.lang.IFn.LDOO, clojure.lang.IFn.LDOOD, clojure.lang.IFn.LDOOL, clojure.lang.IFn.LDOOO, clojure.lang.IFn.LL, clojure.lang.IFn.LLD, clojure.lang.IFn.LLDD, clojure.lang.IFn.LLDDD, clojure.lang.IFn.LLDDL, clojure.lang.IFn.LLDDO, clojure.lang.IFn.LLDL, clojure.lang.IFn.LLDLD, clojure.lang.IFn.LLDLL, clojure.lang.IFn.LLDLO, clojure.lang.IFn.LLDO, clojure.lang.IFn.LLDOD, clojure.lang.IFn.LLDOL, clojure.lang.IFn.LLDOO, clojure.lang.IFn.LLL, clojure.lang.IFn.LLLD, clojure.lang.IFn.LLLDD, clojure.lang.IFn.LLLDL, clojure.lang.IFn.LLLDO, clojure.lang.IFn.LLLL, clojure.lang.IFn.LLLLD, clojure.lang.IFn.LLLLL, clojure.lang.IFn.LLLLO, clojure.lang.IFn.LLLO, clojure.lang.IFn.LLLOD, clojure.lang.IFn.LLLOL, clojure.lang.IFn.LLLOO, clojure.lang.IFn.LLO, clojure.lang.IFn.LLOD, clojure.lang.IFn.LLODD, clojure.lang.IFn.LLODL, clojure.lang.IFn.LLODO, clojure.lang.IFn.LLOL, clojure.lang.IFn.LLOLD, clojure.lang.IFn.LLOLL, clojure.lang.IFn.LLOLO, clojure.lang.IFn.LLOO, clojure.lang.IFn.LLOOD, clojure.lang.IFn.LLOOL, clojure.lang.IFn.LLOOO, clojure.lang.IFn.LO, clojure.lang.IFn.LOD, clojure.lang.IFn.LODD, clojure.lang.IFn.LODDD, clojure.lang.IFn.LODDL, clojure.lang.IFn.LODDO, clojure.lang.IFn.LODL, clojure.lang.IFn.LODLD, clojure.lang.IFn.LODLL, clojure.lang.IFn.LODLO, clojure.lang.IFn.LODO, clojure.lang.IFn.LODOD, clojure.lang.IFn.LODOL, clojure.lang.IFn.LODOO, clojure.lang.IFn.LOL, clojure.lang.IFn.LOLD, clojure.lang.IFn.LOLDD, clojure.lang.IFn.LOLDL, clojure.lang.IFn.LOLDO, clojure.lang.IFn.LOLL, clojure.lang.IFn.LOLLD, clojure.lang.IFn.LOLLL, clojure.lang.IFn.LOLLO, clojure.lang.IFn.LOLO, clojure.lang.IFn.LOLOD, clojure.lang.IFn.LOLOL, clojure.lang.IFn.LOLOO, clojure.lang.IFn.LOO, clojure.lang.IFn.LOOD, clojure.lang.IFn.LOODD, clojure.lang.IFn.LOODL, clojure.lang.IFn.LOODO, clojure.lang.IFn.LOOL, clojure.lang.IFn.LOOLD, clojure.lang.IFn.LOOLL, clojure.lang.IFn.LOOLO, clojure.lang.IFn.LOOO, clojure.lang.IFn.LOOOD, clojure.lang.IFn.LOOOL, clojure.lang.IFn.LOOOO, clojure.lang.IFn.OD, clojure.lang.IFn.ODD, clojure.lang.IFn.ODDD, clojure.lang.IFn.ODDDD, clojure.lang.IFn.ODDDL, clojure.lang.IFn.ODDDO, clojure.lang.IFn.ODDL, clojure.lang.IFn.ODDLD, clojure.lang.IFn.ODDLL, clojure.lang.IFn.ODDLO, clojure.lang.IFn.ODDO, clojure.lang.IFn.ODDOD, clojure.lang.IFn.ODDOL, clojure.lang.IFn.ODDOO, clojure.lang.IFn.ODL, clojure.lang.IFn.ODLD, clojure.lang.IFn.ODLDD, clojure.lang.IFn.ODLDL, clojure.lang.IFn.ODLDO, clojure.lang.IFn.ODLL, clojure.lang.IFn.ODLLD, clojure.lang.IFn.ODLLL, clojure.lang.IFn.ODLLO, clojure.lang.IFn.ODLO, clojure.lang.IFn.ODLOD, clojure.lang.IFn.ODLOL, clojure.lang.IFn.ODLOO, clojure.lang.IFn.ODO, clojure.lang.IFn.ODOD, clojure.lang.IFn.ODODD, clojure.lang.IFn.ODODL, clojure.lang.IFn.ODODO, clojure.lang.IFn.ODOL, clojure.lang.IFn.ODOLD, clojure.lang.IFn.ODOLL, clojure.lang.IFn.ODOLO, clojure.lang.IFn.ODOO, clojure.lang.IFn.ODOOD, clojure.lang.IFn.ODOOL, clojure.lang.IFn.ODOOO, clojure.lang.IFn.OL, clojure.lang.IFn.OLD, clojure.lang.IFn.OLDD, clojure.lang.IFn.OLDDD, clojure.lang.IFn.OLDDL, clojure.lang.IFn.OLDDO, clojure.lang.IFn.OLDL, clojure.lang.IFn.OLDLD, clojure.lang.IFn.OLDLL, clojure.lang.IFn.OLDLO, clojure.lang.IFn.OLDO, clojure.lang.IFn.OLDOD, clojure.lang.IFn.OLDOL, clojure.lang.IFn.OLDOO, clojure.lang.IFn.OLL, clojure.lang.IFn.OLLD, clojure.lang.IFn.OLLDD, clojure.lang.IFn.OLLDL, clojure.lang.IFn.OLLDO, clojure.lang.IFn.OLLL, clojure.lang.IFn.OLLLD, clojure.lang.IFn.OLLLL, clojure.lang.IFn.OLLLO, clojure.lang.IFn.OLLO, clojure.lang.IFn.OLLOD, clojure.lang.IFn.OLLOL, clojure.lang.IFn.OLLOO, clojure.lang.IFn.OLO, clojure.lang.IFn.OLOD, clojure.lang.IFn.OLODD, clojure.lang.IFn.OLODL, clojure.lang.IFn.OLODO, clojure.lang.IFn.OLOL, clojure.lang.IFn.OLOLD, clojure.lang.IFn.OLOLL, clojure.lang.IFn.OLOLO, clojure.lang.IFn.OLOO, clojure.lang.IFn.OLOOD, clojure.lang.IFn.OLOOL, clojure.lang.IFn.OLOOO, clojure.lang.IFn.OOD, clojure.lang.IFn.OODD, clojure.lang.IFn.OODDD, clojure.lang.IFn.OODDL, clojure.lang.IFn.OODDO, clojure.lang.IFn.OODL, clojure.lang.IFn.OODLD, clojure.lang.IFn.OODLL, clojure.lang.IFn.OODLO, clojure.lang.IFn.OODO, clojure.lang.IFn.OODOD, clojure.lang.IFn.OODOL, clojure.lang.IFn.OODOO, clojure.lang.IFn.OOL, clojure.lang.IFn.OOLD, clojure.lang.IFn.OOLDD, clojure.lang.IFn.OOLDL, clojure.lang.IFn.OOLDO, clojure.lang.IFn.OOLL, clojure.lang.IFn.OOLLD, clojure.lang.IFn.OOLLL, clojure.lang.IFn.OOLLO, clojure.lang.IFn.OOLO, clojure.lang.IFn.OOLOD, clojure.lang.IFn.OOLOL, clojure.lang.IFn.OOLOO, clojure.lang.IFn.OOOD, clojure.lang.IFn.OOODD, clojure.lang.IFn.OOODL, clojure.lang.IFn.OOODO, clojure.lang.IFn.OOOL, clojure.lang.IFn.OOOLD, clojure.lang.IFn.OOOLL, clojure.lang.IFn.OOOLO, clojure.lang.IFn.OOOOD, clojure.lang.IFn.OOOOL</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#def">def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append</a></span>(clojure.lang.IPersistentMap&nbsp;map)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx</a></span>(java.lang.Object&nbsp;key,
+       java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons</a></span>(java.lang.Object&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         java.lang.Object&nbsp;keyvals)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#count--">count</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+      byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>clojure.lang.IPersistentCollection</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#empty--">empty</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>clojure.lang.IMapEntry</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        java.lang.Object&nbsp;notFound,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>java.util.Iterator&lt;?&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#message--">message</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#meta--">meta</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                  java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>clojure.lang.ISeq</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#seq--">seq</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;notFound)</code>&nbsp;</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta</a></span>(clojure.lang.IPersistentMap&nbsp;meta)</code>&nbsp;</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo</a></span>(java.io.OutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo</a></span>(CodedOutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clear, containsValue, entrySet, equals, equiv, get, hashCode, hasheq, invoke, invoke, isEmpty, keySet, mapEquals, mapHash, mapHasheq, put, putAll, remove, size, toString, values</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.AFn">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.AFn</h3>
+<code>applyTo, applyToHelper, call, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, run, throwArity</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.util.Map</h3>
+<code>compute, computeIfAbsent, computeIfPresent, forEach, getOrDefault, merge, putIfAbsent, remove, replace, replace, replaceAll</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="def">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>def</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;create(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                 byte[]&nbsp;bytes)
+                                          throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    CodedInputStream&nbsp;input)
+                                             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseDelimitedFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                             java.io.InputStream&nbsp;input)
+                                                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>construct</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;construct(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    java.lang.Object&nbsp;keyvals)</pre>
+</li>
+</ul>
+<a name="toByteArray--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toByteArray</h4>
+<pre>public&nbsp;byte[]&nbsp;toByteArray()</pre>
+</li>
+</ul>
+<a name="writeTo-CodedOutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeTo</h4>
+<pre>public&nbsp;void&nbsp;writeTo(CodedOutputStream&nbsp;output)
+             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="writeDelimitedTo-java.io.OutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeDelimitedTo</h4>
+<pre>public&nbsp;void&nbsp;writeDelimitedTo(java.io.OutputStream&nbsp;output)
+                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="message--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>message</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;message()</pre>
+</li>
+</ul>
+<a name="builder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>builder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;builder()</pre>
+</li>
+</ul>
+<a name="withMeta-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>withMeta</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;withMeta(clojure.lang.IPersistentMap&nbsp;meta)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>withMeta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IObj</code></dd>
+</dl>
+</li>
+</ul>
+<a name="meta--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;meta()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>meta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IMeta</code></dd>
+</dl>
+</li>
+</ul>
+<a name="containsKey-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>containsKey</h4>
+<pre>public&nbsp;boolean&nbsp;containsKey(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>java.util.Map</code></dd>
+</dl>
+</li>
+</ul>
+<a name="entryAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>entryAt</h4>
+<pre>public&nbsp;clojure.lang.IMapEntry&nbsp;entryAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>entryAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key,
+                              java.lang.Object&nbsp;notFound)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 java.lang.Object&nbsp;notFound,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="assoc-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assoc</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assoc(java.lang.Object&nbsp;key,
+                                         java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="assocEx-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assocEx</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assocEx(java.lang.Object&nbsp;key,
+                                           java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assocEx</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="cons-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cons</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;cons(java.lang.Object&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>cons</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>cons</code>&nbsp;in class&nbsp;<code>clojure.lang.APersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="append-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;append(clojure.lang.IPersistentMap&nbsp;map)</pre>
+</li>
+</ul>
+<a name="without-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>without</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;without(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>without</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="iterator--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>iterator</h4>
+<pre>public&nbsp;java.util.Iterator&lt;?&gt;&nbsp;iterator()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>iterator</code>&nbsp;in interface&nbsp;<code>java.lang.Iterable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="count--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>count</h4>
+<pre>public&nbsp;int&nbsp;count()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.Counted</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+<a name="seq--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>seq</h4>
+<pre>public&nbsp;clojure.lang.ISeq&nbsp;seq()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>seq</code>&nbsp;in interface&nbsp;<code>clojure.lang.Seqable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="empty--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>empty</h4>
+<pre>public&nbsp;clojure.lang.IPersistentCollection&nbsp;empty()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>empty</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
new file mode 100644
index 0000000..b589f60
--- /dev/null
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../protobuf/package-summary.html" target="classFrame">protobuf</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
new file mode 100644
index 0000000..7e1e39a
--- /dev/null
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;protobuf</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/Extensions.html" title="class in protobuf">Extensions</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
new file mode 100644
index 0000000..aff5c3b
--- /dev/null
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package protobuf</h1>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/script.js b/docs/current/javadoc/script.js
new file mode 100644
index 0000000..b346356
--- /dev/null
+++ b/docs/current/javadoc/script.js
@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
new file mode 100644
index 0000000..910ae60
--- /dev/null
+++ b/docs/current/javadoc/serialized-form.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<title>Serialized Form (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Serialized Form (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Serialized Form" class="title">Serialized Form</h1>
+</div>
+<div class="serializedFormContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2 title="Package">Package&nbsp;protobuf</h2>
+<ul class="blockList">
+<li class="blockList"><a name="protobuf.PersistentProtocolBufferMap">
+<!--   -->
+</a>
+<h3>Class <a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">protobuf.PersistentProtocolBufferMap</a> extends clojure.lang.APersistentMap implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialized Fields</h3>
+<ul class="blockList">
+<li class="blockList">
+<h4>def</h4>
+<pre><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+<li class="blockList">
+<h4>message</h4>
+<pre>DynamicMessage message</pre>
+</li>
+<li class="blockList">
+<h4>_meta</h4>
+<pre>clojure.lang.IPersistentMap _meta</pre>
+</li>
+<li class="blockListLast">
+<h4>ext</h4>
+<pre>clojure.lang.IPersistentMap ext</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/current/javadoc/stylesheet.css b/docs/current/javadoc/stylesheet.css
new file mode 100644
index 0000000..98055b2
--- /dev/null
+++ b/docs/current/javadoc/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}

From c09439e8f00e0fcb8aa448495853df70f387ca3f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:23:02 -0600
Subject: [PATCH 422/525] Re-added Marginalia docs support.

---
 project.clj                       |  6 +++++-
 resources/docs/9800-marginalia.md | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 resources/docs/9800-marginalia.md

diff --git a/project.clj b/project.clj
index d1953d6..b207ad3 100644
--- a/project.clj
+++ b/project.clj
@@ -36,7 +36,8 @@
       :dependencies [
         [clojang/codox-theme "0.2.0-SNAPSHOT"]]
       :plugins [
-        [lein-codox "0.10.3"]]
+        [lein-codox "0.10.3"]
+        [lein-marginalia "0.9.1"]]
       :codox {
         :project {
           :name "protobuf"
@@ -79,6 +80,9 @@
     "docs" [
       "do"
       ["clojuredocs"]
+      ["marg" "--dir" "docs/current"
+        "--file" "marginalia.html"
+        "--name" "Clojure Protocol Buffer Library"]
       ["javadocs"]]
     ;; Protobuf compilation tasks
     "protoc-extension" [
diff --git a/resources/docs/9800-marginalia.md b/resources/docs/9800-marginalia.md
new file mode 100644
index 0000000..4236440
--- /dev/null
+++ b/resources/docs/9800-marginalia.md
@@ -0,0 +1,10 @@
+# Marginalia
+
+In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:
+
+* [Marginalia docs][marg]
+
+<!-- Named page links below: /-->
+
+[marg]: marginalia.html
+

From 1fe8a73b957755923289a68e16431a4cfe5196aa Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:35:27 -0600
Subject: [PATCH 423/525] Added combine function alias to core API.

---
 src/clj/protobuf/core.clj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 5b083fe..4cd5023 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -113,6 +113,9 @@
   (combine-onto [^PersistentProtocolBufferMap this other]
     (.append this other)))
 
+(def ^{:doc "A convenience alias for `util/combine`"}
+  combine #'util/combine)
+
 ;; TODO make this nil-safe? Or just delete it?
 (defn get-raw
   "Get value at key ignoring extension fields."

From 864317d044fc9493e9d7be31b58a50c491ab7959 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 22:06:49 -0600
Subject: [PATCH 424/525] Added a Clojure port of the official Google Java
 tutorial.

---
 resources/docs/1200-tutorial.md            | 348 +++++++++++++++++++++
 resources/protobuf/examples/tutorial.proto |  29 ++
 2 files changed, 377 insertions(+)
 create mode 100644 resources/docs/1200-tutorial.md
 create mode 100644 resources/protobuf/examples/tutorial.proto

diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
new file mode 100644
index 0000000..1dccdd8
--- /dev/null
+++ b/resources/docs/1200-tutorial.md
@@ -0,0 +1,348 @@
+# Tutorial: Protocol Buffer Basics
+
+*Note: The content for this tutorial was taken from the
+[official Google protobuf Java tutorial][java-tut].*
+
+
+## Introduction
+
+This tutorial provides a basic Clojure programmer's introduction to working with
+protocol buffers. By walking through creating a simple example application, it
+shows you how to:
+
+* Define message formats in a `.proto` file.
+* Use the protocol buffer compiler.
+* Use the Clojure protocol buffer API to write and read messages.
+
+This isn't a comprehensive guide to using protocol buffers in Clojure. For more
+detailed reference information, see:
+
+* the [Protocol Buffer Language Guide][protobuf-guide]
+* the [Clojure API Reference][clojure-api-ref]
+* the [Encoding Reference][enc-ref]
+
+Additionally, you may find these useful:
+
+* the [Java API Reference][java-api-ref]
+* the [Java Generated Code Guide][java-generated]
+
+
+## Why Use Protocol Buffers?
+
+Protocol buffers solve the problem of efficiently serializing and
+deserializing structured data in a language-agnostic manner, accessible a vast
+array of applications (as long as the applications are written in a language
+that has a protobuf library). We'll illustrate this with an example.
+
+The example we're going to use is a very simple "address book" application
+that can read and write people's contact details to and from a file. Each
+person in the address book has a name, an ID, an email address, and a contact
+phone number.
+
+So, how might one serialize and retrieve structured data like this if protobuf
+wasn't around? There are a few ways to solve this problem:
+
+* Use Java Serialization. This is the default approach since it's built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn't work very well if you need to share data with applications written in C++ or Python.
+* You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as "12:3:-23:67". This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.
+* Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.
+
+To avoid the problems mentioned in each of the above (as well as many others),
+protocol buffers was created. They are the flexible, efficient, automated
+solution.
+
+With protocol buffers, you write a `.proto` description of the data structure
+you wish to store. From that, the protocol buffer compiler creates compilable
+source code that implements automatic encoding and parsing of the protocol
+buffer data with an efficient binary format. The generated code provides
+getters and setters for the fields that make up a protocol buffer and takes
+care of the details of reading and writing the protocol buffer as a unit.
+Importantly, the protocol buffer format supports the idea of extending the
+format over time in such a way that the code can still read data encoded with
+the old format.
+
+
+## Defining Your Protocol Format
+
+To create your address book application, you'll need to start with a `.proto`
+file. The definitions in a `.proto` file are simple: you add a message for each
+data structure you want to serialize, then specify a name and a type for each
+field in the message. Here is the `.proto` file that defines your messages,
+`addressbook.proto`:
+
+```proto
+syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+```
+
+(Additionally, this file has been made available for you in the
+`resources/proto/examples` directory of the Clojure protobuf project.)
+
+As you can see, the syntax is similar to C++ or Java. Let's go through each
+part of the file and see what it does.
+
+The `.proto` file starts with a package declaration, which helps to prevent
+naming conflicts between different projects. In Java, the package name is used
+as the Java package unless you have explicitly specified a `java_package`, as
+we have here. Even if you do provide a `java_package`, you should still define
+a normal package as well to avoid name collisions in the Protocol Buffers name
+space as well as in non-Java languages.
+
+<blockquote>
+After the package declaration, you can see two options that are Java-specific.
+Thanks to Clojure's Java inter-op, we can take advantage of this directly,
+without writing our own Clojure protobuf compiler or waiting for Google to
+support Clojure.
+</blockquote>
+
+`java_package` specifies in what Java package name your generated classes
+should live. If you don't specify this explicitly, it simply matches the
+package name given by the package declaration, but these names usually aren't
+appropriate Java package names (since they usually don't start with a domain
+name).
+
+The `java_outer_classname` option defines the class name which should contain
+all of the classes in this file. If you don't give a `java_outer_classname`
+explicitly, it will be generated by converting the file name to camel case.
+For example, `my_proto.proto` would, by default, use `MyProto` as the outer
+class name.
+
+Next, you have your message definitions. A message is just an aggregate
+containing a set of typed fields. Many standard simple data types are
+available as field types, including `bool`, `int32`, `float`, `double`, and
+`string.` You can also add further structure to your messages by using other
+message types as field types – in the above example the `Person` message
+contains `PhoneNumber` messages, while the `AddressBook` message contains
+`Person` messages. You can even define message types nested inside other
+messages – as you can see, the `PhoneNumber` type is defined inside `Person`. You
+can also define `enum` types if you want one of your fields to have one of a
+predefined list of values – here you want to specify that a phone number can
+be one of `MOBILE`, `HOME`, or `WORK`.
+
+The " = 1", " = 2" markers on each element identify the unique "tag" that
+field uses in the binary encoding. Tag numbers 1-15 require one less byte to
+encode than higher numbers, so as an optimization you can decide to use those
+tags for the commonly used or repeated elements, leaving tags 16 and higher
+for less-commonly used optional elements. Each element in a repeated field
+requires re-encoding the tag number, so repeated fields are particularly good
+candidates for this optimization.
+
+Each field must be annotated with one of the following modifiers:
+
+* `required`: a value for the field must be provided, otherwise the message will be considered "uninitialized". Trying to build an uninitialized message will throw a `RuntimeException`. Parsing an uninitialized message will throw an `IOException`. Other than this, a required field behaves exactly like an optional field.
+* `optional`: the field may or may not be set. If an optional field value isn't set, a default value is used. For simple types, you can specify your own default value, as we've done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, `false` for bools. For embedded messages, the default value is always the "default instance" or "prototype" of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field's default value.
+* `repeated`: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.
+
+<blockquote>
+**Required Is Forever**
+
+You should be very careful about marking fields as required. If at some point
+you wish to stop writing or sending a required field, it will be problematic
+to change the field to an optional field – old readers will consider messages
+without this field to be incomplete and may reject or drop them
+unintentionally. You should consider writing application-specific custom
+validation routines for your buffers instead. Some engineers at Google have
+come to the conclusion that using required does more harm than good; they
+prefer to use only optional and repeated. However, this view is not universal.
+</blockquote>
+
+You'll find a complete guide to writing `.proto` files – including all the
+possible field types – in the
+[Protocol Buffer Language Guide][protobuf-guide]. Don't go looking for
+facilities similar to class inheritance, though – protocol buffers don't do
+that.
+
+
+## Compiling Your Protocol Buffers
+
+Now that you have a `.proto`, the next thing you need to do is generate the
+classes you'll need to read and write `AddressBook` (and hence `Person` and
+`PhoneNumber`) messages. To do this, you need to run the protocol buffer
+compiler `protoc` on your `.proto`:
+
+1. If you haven't installed this yet, now is the time. Your operating system's
+   package manager very likely already provides a version for you -- search
+   there first. If not, you can [download it][download] from Google.
+1. Now run the compiler, specifying:
+   * the source directory (where your application's source code lives – the
+     current directory is used if you don't provide a value)
+   * the destination directory (where you want the generated code to go; often
+     the same as $SRC_DIR), and
+   * the path to your `.proto.`
+
+In this case:
+
+```bash
+$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+```
+
+This gives us:
+
+```bash
+$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+```
+
+To have `lein` compile protobuf `.java` source files to `.class` that can be
+used from Clojure, we need to make sure that `lein` knows about our Java
+sources -- with do this with the `:java-source-paths` key in the `project.clj`
+file, either at the top-level or in an appropriate profile.
+
+For example, this is what the Clojure protobuf project has set, using the
+`:test` profile:
+
+```clj
+:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+```
+
+<blockquote>
+Fore convenience, the Clojure protobuf project always compiles the examples
+and the tests before starting up the REPL, so they are always freshly available
+to developers.
+</blockquote>
+
+
+## The Protocol Buffer API
+
+Let's fire up the REPL and see how to use the compiled code from Clojure:
+
+```bash
+$ lein repl
+```
+
+### Setup
+
+First we'll pull in the Clojure API:
+
+```clj
+[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
+nil
+```
+
+Then we'll import the generated Java classes we want to use:
+
+```clj
+[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
+              #_=>                                      AddressBookProtos$Person$PhoneNumber
+              #_=>                                      AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+```
+
+Note that for nested inner classes, we simply keep using the inner class
+separator `$` of Clojure's Java inter-op.
+
+Next we'll use a Java wrapper that let's us treat these like maps:
+
+```clj
+[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+```
+
+We can view the full, nested data schema in Clojure data:
+
+```clj
+[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+```
+
+<blockquote>
+There's currently a bug/missing feature where the default value of an `enum` is
+not converted to Clojure data. For current status on this issue, see:
+<a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
+</blockquote>
+
+## Message Functions
+
+TBD
+
+## Parsing and Serialization
+
+* `protobuf/parse` - Given an array or stream of bytes, we can parse these
+  to a Clojure protobuf data structure
+* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
+  an array of raw bytes
+
+## Writing a Message
+
+TBD
+
+## Reading a Message
+
+TBD
+
+## Extending a Protocol
+
+TBD
+
+## Advanced Usage
+
+TBD
+
+
+<!-- Named page links below: /-->
+
+[java-tut]: https://developers.google.com/protocol-buffers/docs/javatutorial
+[protobuf-guide]: https://developers.google.com/protocol-buffers/docs/proto
+[clojure-api-ref]: https://clojusc.github.io/protobuf
+[java-api-ref]: https://developers.google.com/protocol-buffers/docs/reference/java/index.html
+[java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
+[enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
+[download]: https://developers.google.com/protocol-buffers/docs/downloads.html
diff --git a/resources/protobuf/examples/tutorial.proto b/resources/protobuf/examples/tutorial.proto
new file mode 100644
index 0000000..9927720
--- /dev/null
+++ b/resources/protobuf/examples/tutorial.proto
@@ -0,0 +1,29 @@
+syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}

From d22e429054480f49f23c22aed3a252cdb3ef9796 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:04:45 -0600
Subject: [PATCH 425/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html            |    4 +-
 docs/current/1100-extensions.html             |    2 +-
 docs/current/1200-tutorial.html               |  178 +
 docs/current/9800-marginalia.html             |    8 +
 docs/current/9900-javadoc.html                |    2 +-
 docs/current/9999-other-versions.html         |    2 +-
 docs/current/index.html                       |    2 +-
 docs/current/javadoc/allclasses-frame.html    |    2 +-
 docs/current/javadoc/allclasses-noframe.html  |    2 +-
 docs/current/javadoc/constant-values.html     |    2 +-
 docs/current/javadoc/deprecated-list.html     |    2 +-
 docs/current/javadoc/help-doc.html            |    2 +-
 docs/current/javadoc/index-all.html           |    2 +-
 docs/current/javadoc/index.html               |    2 +-
 docs/current/javadoc/overview-tree.html       |    2 +-
 docs/current/javadoc/protobuf/Extensions.html |    2 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |    2 +-
 .../PersistentProtocolBufferMap.Def.html      |    2 +-
 .../protobuf/PersistentProtocolBufferMap.html |    2 +-
 .../javadoc/protobuf/package-frame.html       |    2 +-
 .../javadoc/protobuf/package-summary.html     |    2 +-
 .../javadoc/protobuf/package-tree.html        |    2 +-
 docs/current/javadoc/serialized-form.html     |    2 +-
 docs/current/marginalia.html                  | 3395 +++++++++++++++++
 docs/current/protobuf.codec.html              |    2 +-
 docs/current/protobuf.core.html               |    2 +-
 docs/current/protobuf.schema.html             |    2 +-
 docs/current/protobuf.util.html               |    2 +-
 28 files changed, 3607 insertions(+), 26 deletions(-)
 create mode 100644 docs/current/1200-tutorial.html
 create mode 100644 docs/current/9800-marginalia.html
 create mode 100644 docs/current/marginalia.html

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index fd04194..b16c394 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
@@ -22,7 +22,7 @@ <h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the
 <p>From the dev REPL, pull in the core API and the compiled protobuf code:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
 nil
-[protobuf.dev] λ=&gt; (import (protobuf.examples.person Example$Person))
+[protobuf.dev] λ=&gt; (import '(protobuf.examples.person Example$Person))
 protobuf.examples.person.Example$Person
 </code></pre>
 <p>Now we can create the Java wrapper for our protocol (see <code>protobuf.PersistentProtocolBufferMap</code> for more details):</p>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index 9978fbd..4314672 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
diff --git a/docs/current/1200-tutorial.html b/docs/current/1200-tutorial.html
new file mode 100644
index 0000000..71cedc6
--- /dev/null
+++ b/docs/current/1200-tutorial.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<p><em>Note: The content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>.</em></p>
+<h2><a href="#introduction" name="introduction"></a>Introduction</h2>
+<p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
+<ul>
+  <li>Define message formats in a <code>.proto</code> file.</li>
+  <li>Use the protocol buffer compiler.</li>
+  <li>Use the Clojure protocol buffer API to write and read messages.</li>
+</ul>
+<p>This isn’t a comprehensive guide to using protocol buffers in Clojure. For more detailed reference information, see:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a></li>
+  <li>the <a href="https://clojusc.github.io/protobuf">Clojure API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/encoding">Encoding Reference</a></li>
+</ul>
+<p>Additionally, you may find these useful:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
+</ul>
+<h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
+<p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
+<ul>
+  <li>Use Java Serialization. This is the default approach since it’s built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn’t work very well if you need to share data with applications written in C++ or Python.</li>
+  <li>You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as “12:3:-23:67”. This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.</li>
+  <li>Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.</li>
+</ul>
+<p>To avoid the problems mentioned in each of the above (as well as many others), protocol buffers was created. They are the flexible, efficient, automated solution.</p>
+<p>With protocol buffers, you write a <code>.proto</code> description of the data structure you wish to store. From that, the protocol buffer compiler creates compilable source code that implements automatic encoding and parsing of the protocol buffer data with an efficient binary format. The generated code provides getters and setters for the fields that make up a protocol buffer and takes care of the details of reading and writing the protocol buffer as a unit. Importantly, the protocol buffer format supports the idea of extending the format over time in such a way that the code can still read data encoded with the old format.</p>
+<h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format"></a>Defining Your Protocol Format</h2>
+<p>To create your address book application, you’ll need to start with a <code>.proto</code> file. The definitions in a <code>.proto</code> file are simple: you add a message for each data structure you want to serialize, then specify a name and a type for each field in the message. Here is the <code>.proto</code> file that defines your messages, <code>addressbook.proto</code>:</p>
+<pre><code class="proto">syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+</code></pre>
+<p>(Additionally, this file has been made available for you in the <code>resources/proto/examples</code> directory of the Clojure protobuf project.)</p>
+<p>As you can see, the syntax is similar to C++ or Java. Let’s go through each part of the file and see what it does.</p>
+<p>The <code>.proto</code> file starts with a package declaration, which helps to prevent naming conflicts between different projects. In Java, the package name is used as the Java package unless you have explicitly specified a <code>java_package</code>, as we have here. Even if you do provide a <code>java_package</code>, you should still define a normal package as well to avoid name collisions in the Protocol Buffers name space as well as in non-Java languages.</p>
+<p></p><blockquote> After the package declaration, you can see two options that are Java-specific. Thanks to Clojure’s Java inter-op, we can take advantage of this directly, without writing our own Clojure protobuf compiler or waiting for Google to support Clojure. </blockquote><p></p>
+<p><code>java_package</code> specifies in what Java package name your generated classes should live. If you don’t specify this explicitly, it simply matches the package name given by the package declaration, but these names usually aren’t appropriate Java package names (since they usually don’t start with a domain name).</p>
+<p>The <code>java_outer_classname</code> option defines the class name which should contain all of the classes in this file. If you don’t give a <code>java_outer_classname</code> explicitly, it will be generated by converting the file name to camel case. For example, <code>my_proto.proto</code> would, by default, use <code>MyProto</code> as the outer class name.</p>
+<p>Next, you have your message definitions. A message is just an aggregate containing a set of typed fields. Many standard simple data types are available as field types, including <code>bool</code>, <code>int32</code>, <code>float</code>, <code>double</code>, and <code>string.</code> You can also add further structure to your messages by using other message types as field types – in the above example the <code>Person</code> message contains <code>PhoneNumber</code> messages, while the <code>AddressBook</code> message contains <code>Person</code> messages. You can even define message types nested inside other messages – as you can see, the <code>PhoneNumber</code> type is defined inside <code>Person</code>. You can also define <code>enum</code> types if you want one of your fields to have one of a predefined list of values – here you want to specify that a phone number can be one of <code>MOBILE</code>, <code>HOME</code>, or <code>WORK</code>.</p>
+<p>The “ = 1”, “ = 2” markers on each element identify the unique “tag” that field uses in the binary encoding. Tag numbers 1-15 require one less byte to encode than higher numbers, so as an optimization you can decide to use those tags for the commonly used or repeated elements, leaving tags 16 and higher for less-commonly used optional elements. Each element in a repeated field requires re-encoding the tag number, so repeated fields are particularly good candidates for this optimization.</p>
+<p>Each field must be annotated with one of the following modifiers:</p>
+<ul>
+  <li><code>required</code>: a value for the field must be provided, otherwise the message will be considered “uninitialized”. Trying to build an uninitialized message will throw a <code>RuntimeException</code>. Parsing an uninitialized message will throw an <code>IOException</code>. Other than this, a required field behaves exactly like an optional field.</li>
+  <li><code>optional</code>: the field may or may not be set. If an optional field value isn’t set, a default value is used. For simple types, you can specify your own default value, as we’ve done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, <code>false</code> for bools. For embedded messages, the default value is always the “default instance” or “prototype” of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field’s default value.</li>
+  <li><code>repeated</code>: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.</li>
+</ul>
+<p></p><blockquote> <strong>Required Is Forever</strong><p></p>
+<p>You should be very careful about marking fields as required. If at some point you wish to stop writing or sending a required field, it will be problematic to change the field to an optional field – old readers will consider messages without this field to be incomplete and may reject or drop them unintentionally. You should consider writing application-specific custom validation routines for your buffers instead. Some engineers at Google have come to the conclusion that using required does more harm than good; they prefer to use only optional and repeated. However, this view is not universal. </p></blockquote><p></p>
+<p>You’ll find a complete guide to writing <code>.proto</code> files – including all the possible field types – in the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a>. Don’t go looking for facilities similar to class inheritance, though – protocol buffers don’t do that.</p>
+<h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buffers"></a>Compiling Your Protocol Buffers</h2>
+<p>Now that you have a <code>.proto</code>, the next thing you need to do is generate the classes you’ll need to read and write <code>AddressBook</code> (and hence <code>Person</code> and <code>PhoneNumber</code>) messages. To do this, you need to run the protocol buffer compiler <code>protoc</code> on your <code>.proto</code>:</p>
+<ol>
+  <li>If you haven’t installed this yet, now is the time. Your operating system’s  package manager very likely already provides a version for you – search  there first. If not, you can <a href="https://developers.google.com/protocol-buffers/docs/downloads.html">download it</a> from Google.</li>
+  <li>Now run the compiler, specifying:</li>
+</ol>
+<ul>
+  <li>the source directory (where your application’s source code lives – the  current directory is used if you don’t provide a value)</li>
+  <li>the destination directory (where you want the generated code to go; often  the same as $SRC_DIR), and</li>
+  <li>the path to your <code>.proto.</code></li>
+</ul>
+<p>In this case:</p>
+<pre><code class="bash">$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+</code></pre>
+<p>This gives us:</p>
+<pre><code class="bash">$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+</code></pre>
+<p>To have <code>lein</code> compile protobuf <code>.java</code> source files to <code>.class</code> that can be used from Clojure, we need to make sure that <code>lein</code> knows about our Java sources – with do this with the <code>:java-source-paths</code> key in the <code>project.clj</code> file, either at the top-level or in an appropriate profile.</p>
+<p>For example, this is what the Clojure protobuf project has set, using the <code>:test</code> profile:</p>
+<pre><code class="clj">:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+</code></pre>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
+<p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
+<pre><code class="bash">$ lein repl
+</code></pre>
+<h3><a href="#setup" name="setup"></a>Setup</h3>
+<p>First we’ll pull in the Clojure API:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+</code></pre>
+<p>Then we’ll import the generated Java classes we want to use:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial AddressBookProtos$Person
+              #_=&gt;                                      AddressBookProtos$Person$PhoneNumber
+              #_=&gt;                                      AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+</code></pre>
+<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Next we’ll use a Java wrapper that let’s us treat these like maps:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=&gt; (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=&gt; (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+</code></pre>
+<p>We can view the full, nested data schema in Clojure data:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/mapdef-&gt;schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+</code></pre>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
+<h2><a href="#message-functions" name="message-functions"></a>Message Functions</h2>
+<p>TBD</p>
+<h2><a href="#parsing-and-serialization" name="parsing-and-serialization"></a>Parsing and Serialization</h2>
+<ul>
+  <li><code>protobuf/parse</code> - Given an array or stream of bytes, we can parse these  to a Clojure protobuf data structure</li>
+  <li><code>protobuf/-&gt;bytes</code> - Given a Java protobuf wrapper, we can convert this to  an array of raw bytes</li>
+</ul>
+<h2><a href="#writing-a-message" name="writing-a-message"></a>Writing a Message</h2>
+<p>TBD</p>
+<h2><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h2>
+<p>TBD</p>
+<h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
+<p>TBD</p>
+<h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
+<p>TBD</p>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
new file mode 100644
index 0000000..9fe9f12
--- /dev/null
+++ b/docs/current/9800-marginalia.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
+<ul>
+  <li><a href="marginalia.html">Marginalia docs</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 710c346..2a37152 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index e5104a3..dc18dd9 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index a73dcf3..bf9d341 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 738c78a..b311274 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index 42e7e04..dc9a084 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 749a52b..3ba0ca2 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 598fead..8bf928f 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 122ad63..bc386b2 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index eef4da0..a4904f1 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 628eee6..b269c73 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index ec28e40..ae607fb 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 1d27a24..fcdf89c 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 7b01e97..bad77cb 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index a88e13b..bbb4ea5 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 79d2a77..19db1f6 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index b589f60..e8390c5 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 7e1e39a..4fe858e 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index aff5c3b..5a88b29 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 910ae60..c7e8f64 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:02:18 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
new file mode 100644
index 0000000..ceccbd8
--- /dev/null
+++ b/docs/current/marginalia.html
@@ -0,0 +1,3395 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8" content="text/html" http-equiv="Content-Type" /><meta content="A Clojure interface to Google's protocol buffers" name="description" /><style type="text/css">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  -moz-border-radius: 0 0 0 0 !important;
+  -webkit-border-radius: 0 0 0 0 !important;
+  background: none !important;
+  border: 0 !important;
+  bottom: auto !important;
+  float: none !important;
+  height: auto !important;
+  left: auto !important;
+  line-height: 1.1em !important;
+/*  margin: 0 !important; */
+  outline: 0 !important;
+  overflow: visible !important;
+  padding: 0 !important;
+  position: static !important;
+  right: auto !important;
+  text-align: left !important;
+  top: auto !important;
+  vertical-align: baseline !important;
+  width: auto !important;
+  box-sizing: content-box !important;
+  font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+  font-weight: normal !important;
+  font-style: normal !important;
+  min-height: inherit !important;
+  min-height: auto !important;
+}
+
+.syntaxhighlighter {
+/*  width: 100% !important; */
+  margin: 1em 0 1em 0 !important;
+  position: relative !important;
+  overflow: auto !important;
+}
+.syntaxhighlighter.source {
+  overflow: hidden !important;
+}
+.syntaxhighlighter .bold {
+  font-weight: bold !important;
+}
+.syntaxhighlighter .italic {
+  font-style: italic !important;
+}
+.syntaxhighlighter .line {
+  white-space: pre !important;
+}
+.syntaxhighlighter table {
+/*    width: 100% !important;*/
+}
+.syntaxhighlighter table caption {
+  text-align: left !important;
+  padding: .5em 0 0.5em 1em !important;
+}
+.syntaxhighlighter table td.code {
+  width: 100% !important;
+}
+.syntaxhighlighter table td.code .container {
+  position: relative !important;
+}
+.syntaxhighlighter table td.code .container textarea {
+  box-sizing: border-box !important;
+  position: absolute !important;
+  left: 0 !important;
+  top: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  border: none !important;
+  background: white !important;
+  padding-left: 1em !important;
+  overflow: hidden !important;
+  white-space: pre !important;
+}
+.syntaxhighlighter table td.gutter .line {
+  text-align: right !important;
+  padding: 0 0.5em 0 1em !important;
+}
+.syntaxhighlighter table td.code .line {
+  padding: 0 1em !important;
+}
+.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
+  padding-left: 0em !important;
+}
+.syntaxhighlighter.show {
+  display: block !important;
+}
+.syntaxhighlighter.collapsed table {
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+    display: none;
+/*  padding: 0.1em 0.8em 0em 0.8em !important;
+  font-size: 1em !important;
+  position: static !important;
+  width: auto !important;
+  height: auto !important;*/
+}
+.syntaxhighlighter.collapsed .toolbar span {
+  display: inline !important;
+  margin-right: 1em !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a {
+  padding: 0 !important;
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar {
+    display: none;
+/*  position: absolute !important;
+  right: 1px !important;
+  top: 1px !important;
+  width: 11px !important;
+  height: 11px !important;
+  font-size: 10px !important;
+  z-index: 10 !important;*/
+}
+.syntaxhighlighter .toolbar span.title {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar a {
+  display: block !important;
+  text-align: center !important;
+  text-decoration: none !important;
+  padding-top: 1px !important;
+}
+.syntaxhighlighter .toolbar a.expandSource {
+  display: none !important;
+}
+.syntaxhighlighter.ie {
+  font-size: .9em !important;
+  padding: 1px 0 1px 0 !important;
+}
+.syntaxhighlighter.ie .toolbar {
+  line-height: 8px !important;
+}
+.syntaxhighlighter.ie .toolbar a {
+  padding-top: 0px !important;
+}
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content {
+  background: none !important;
+}
+.syntaxhighlighter.printing .line .number {
+  color: #bbbbbb !important;
+}
+.syntaxhighlighter.printing .line .content {
+  color: black !important;
+}
+.syntaxhighlighter.printing .toolbar {
+  display: none !important;
+}
+.syntaxhighlighter.printing a {
+  text-decoration: none !important;
+}
+.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
+  color: black !important;
+}
+.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
+  color: blue !important;
+}
+.syntaxhighlighter.printing .keyword {
+  color: #006699 !important;
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter.printing .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter.printing .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter.printing .script {
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
+  color: red !important;
+}
+.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
+  color: black !important;
+}
+</style><style type="text/css">.syntaxhighlighter{overflow:hidden !important;}</style><style type="text/css">/**
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
+  background-color: #c3defe !important;
+}
+.syntaxhighlighter .line.highlighted.number {
+  color: white !important;
+}
+.syntaxhighlighter table caption {
+  color: black !important;
+}
+.syntaxhighlighter .gutter {
+  color: #787878 !important;
+}
+.syntaxhighlighter .gutter .line {
+  border-right: 3px solid #d4d0c8 !important;
+}
+.syntaxhighlighter .gutter .line.highlighted {
+  background-color: #d4d0c8 !important;
+  color: white !important;
+}
+.syntaxhighlighter.printing .line .content {
+  border: none !important;
+}
+.syntaxhighlighter.collapsed {
+  overflow: visible !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  color: #3f5fbf !important;
+  background: white !important;
+  border: 1px solid #d4d0c8 !important;
+}
+.syntaxhighlighter.collapsed .toolbar a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter.collapsed .toolbar a:hover {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .toolbar {
+  color: #a0a0a0 !important;
+  background: #d4d0c8 !important;
+  border: none !important;
+}
+.syntaxhighlighter .toolbar a {
+  color: #a0a0a0 !important;
+}
+.syntaxhighlighter .toolbar a:hover {
+  color: red !important;
+}
+.syntaxhighlighter .plain, .syntaxhighlighter .plain a {
+  color: black !important;
+}
+.syntaxhighlighter .comments, .syntaxhighlighter .comments a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter .string, .syntaxhighlighter .string a {
+  color: #2a00ff !important;
+}
+.syntaxhighlighter .keyword {
+  color: #7f0055 !important;
+}
+.syntaxhighlighter .preprocessor {
+  color: #646464 !important;
+}
+.syntaxhighlighter .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter .script {
+  font-weight: bold !important;
+  color: #7f0055 !important;
+  background-color: none !important;
+}
+.syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
+  color: red !important;
+}
+
+.syntaxhighlighter .xml .keyword {
+  color: #3f7f7f !important;
+  font-weight: normal !important;
+}
+.syntaxhighlighter .xml .color1, .syntaxhighlighter .xml .color1 a {
+  color: #7f007f !important;
+}
+.syntaxhighlighter .xml .string {
+  font-style: italic !important;
+  color: #2a00ff !important;
+}
+
+.clojure.syntaxhighlighter .invalid { 
+   background-color: #FAA !important;
+}
+
+.clojure.syntaxhighlighter .quoted {      
+    font-style: italic !important;
+}
+
+.syntaxhighlighter .clojure.variable,
+.syntaxhighlighter .clojure.symbol,
+.syntaxhighlighter .clojure.value
+{
+    color: #006060 !important;
+}
+
+.syntaxhighlighter .clojure.string {
+    color: #55B !important;
+}
+
+.syntaxhighlighter .clojure.functions {
+    color: black !important;
+}
+
+.syntaxhighlighter .clojure.color1 {
+    color: #666 !important;
+}
+
+.syntaxhighlighter .clojure.color3 {
+    color: #900 !important;
+}
+
+.syntaxhighlighter .clojure.constants {
+    color: #1A734D !important;
+}
+
+</style><style type="text/css">html{margin:0;padding:0;}h1{margin:0;padding:0;}h2{margin:0;padding:0;}h3{margin:0;padding:0;}h4{margin:0;padding:0;}a{color:#261A3B;}a:visited{color:#261A3B;}</style><style type="text/css">.header{margin-top:30px;}h1.project-name{font-size:34px;display:inline;}h2.project-version{font-size:18px;margin-top:0;display:inline;margin-left:10px;}.toc-link{font-size:12px;margin-left:10px;color:#252519;text-decoration:none;}.toc-link:hover{color:#5050A6;}.toc h1{font-size:34px;margin:0;}.docs-header{border-bottom:dotted #aaa 1px;padding-bottom:10px;margin-bottom:25px;}.toc h1{font-size:24px;}.toc{border-bottom:solid #bbb 1px;margin-bottom:40px;}.toc ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.toc li{list-style-type:none;padding-left:0;}.dependencies{}.dependencies table{font-size:16px;width:99.99%;border:none;margin-left:20px;}.dependencies td{padding-right:20px;;white-space:nowrap;}.dependencies .dotted{width:99%;}.dependencies .dotted hr{border-right:none;color:transparent;background-color:transparent;noshade:noshade;border-left:none;border-top:none;margin-bottom:-6px;height:0;border-bottom:dotted #bbb 1px;}.dependencies .dep-version{text-align:right;}.plugins ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.plugins li{list-style-type:none;padding-left:0;}.header p{margin-left:20px;}</style><style type="text/css">#floating-toc{position:fixed;top:10px;right:20px;height:20px;overflow:hidden;text-align:right;}#floating-toc li{list-style-type:none;margin:0;padding:0;}</style><style type="text/css">body{margin:0;padding:0;font-family:'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;;font-size:16px;color:#252519;background-color:#F5F5FF;}h1{font-size:20px;margin-top:0;}h2{font-size:18px;}h3{font-size:16px;}a.anchor{text-decoration:none;color:#252519;}a.anchor:hover{color:#5050A6;}table{border-spacing:0;border-bottom:solid #ddd 1px;;margin-bottom:10px;}code{display:inline;}p{margin-top:8px;}tr{margin:0px;padding:0px;}td.docs{width:410px;max-width:410px;vertical-align:top;margin:0px;padding-left:55px;padding-right:20px;border:none;background-color:#FFF;}td.docs pre{font-size:12px;overflow:hidden;}td.codes{vertical-align:top;font-size:10pt;overflow:hidden;background-color:#F5F5FF;width:55%;border-left:solid #E5E5EE 1px;padding-left:20px;border:none;margin:0px;}td.spacer{padding-bottom:40px;}pre code{display:block;padding:4px;}code{background-color:ghostWhite;border:solid #DEDEDE 1px;padding-left:3px;padding-right:3px;font-size:14px;}.syntaxhighlighter code{font-size:13px;}.footer{text-align:center;}</style><script type="text/javascript">/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
+</script><script type="text/javascript">//XRegExp 1.5.0 <xregexp.com> MIT License
+var XRegExp;if(XRegExp){throw Error("can't load XRegExp twice in the same frame")}(function(){XRegExp=function(w,r){var q=[],u=XRegExp.OUTSIDE_CLASS,x=0,p,s,v,t,y;if(XRegExp.isRegExp(w)){if(r!==undefined){throw TypeError("can't supply flags when constructing one RegExp from another")}return j(w)}if(g){throw Error("can't call the XRegExp constructor within token definition functions")}r=r||"";p={hasNamedCapture:false,captureNames:[],hasFlag:function(z){return r.indexOf(z)>-1},setFlag:function(z){r+=z}};while(x<w.length){s=o(w,x,u,p);if(s){q.push(s.output);x+=(s.match[0].length||1)}else{if(v=m.exec.call(i[u],w.slice(x))){q.push(v[0]);x+=v[0].length}else{t=w.charAt(x);if(t==="["){u=XRegExp.INSIDE_CLASS}else{if(t==="]"){u=XRegExp.OUTSIDE_CLASS}}q.push(t);x++}}}y=RegExp(q.join(""),m.replace.call(r,h,""));y._xregexp={source:w,captureNames:p.hasNamedCapture?p.captureNames:null};return y};XRegExp.version="1.5.0";XRegExp.INSIDE_CLASS=1;XRegExp.OUTSIDE_CLASS=2;var c=/\$(?:(\d\d?|[$&`'])|{([$\w]+)})/g,h=/[^gimy]+|([\s\S])(?=[\s\S]*\1)/g,n=/^(?:[?*+]|{\d+(?:,\d*)?})\??/,g=false,k=[],m={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},a=m.exec.call(/()??/,"")[1]===undefined,e=function(){var p=/^/g;m.test.call(p,"");return !p.lastIndex}(),f=function(){var p=/x/g;m.replace.call("x",p,"");return !p.lastIndex}(),b=RegExp.prototype.sticky!==undefined,i={};i[XRegExp.INSIDE_CLASS]=/^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/;i[XRegExp.OUTSIDE_CLASS]=/^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/;XRegExp.addToken=function(s,r,q,p){k.push({pattern:j(s,"g"+(b?"y":"")),handler:r,scope:q||XRegExp.OUTSIDE_CLASS,trigger:p||null})};XRegExp.cache=function(r,p){var q=r+"/"+(p||"");return XRegExp.cache[q]||(XRegExp.cache[q]=XRegExp(r,p))};XRegExp.copyAsGlobal=function(p){return j(p,"g")};XRegExp.escape=function(p){return p.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")};XRegExp.execAt=function(s,r,t,q){r=j(r,"g"+((q&&b)?"y":""));r.lastIndex=t=t||0;var p=r.exec(s);if(q){return(p&&p.index===t)?p:null}else{return p}};XRegExp.freezeTokens=function(){XRegExp.addToken=function(){throw Error("can't run addToken after freezeTokens")}};XRegExp.isRegExp=function(p){return Object.prototype.toString.call(p)==="[object RegExp]"};XRegExp.iterate=function(u,p,v,s){var t=j(p,"g"),r=-1,q;while(q=t.exec(u)){v.call(s,q,++r,u,t);if(t.lastIndex===q.index){t.lastIndex++}}if(p.global){p.lastIndex=0}};XRegExp.matchChain=function(q,p){return function r(s,x){var v=p[x].regex?p[x]:{regex:p[x]},u=j(v.regex,"g"),w=[],t;for(t=0;t<s.length;t++){XRegExp.iterate(s[t],u,function(y){w.push(v.backref?(y[v.backref]||""):y[0])})}return((x===p.length-1)||!w.length)?w:r(w,x+1)}([q],0)};RegExp.prototype.apply=function(q,p){return this.exec(p[0])};RegExp.prototype.call=function(p,q){return this.exec(q)};RegExp.prototype.exec=function(t){var r=m.exec.apply(this,arguments),q,p;if(r){if(!a&&r.length>1&&l(r,"")>-1){p=RegExp(this.source,m.replace.call(d(this),"g",""));m.replace.call(t.slice(r.index),p,function(){for(var u=1;u<arguments.length-2;u++){if(arguments[u]===undefined){r[u]=undefined}}})}if(this._xregexp&&this._xregexp.captureNames){for(var s=1;s<r.length;s++){q=this._xregexp.captureNames[s-1];if(q){r[q]=r[s]}}}if(!e&&this.global&&!r[0].length&&(this.lastIndex>r.index)){this.lastIndex--}}return r};if(!e){RegExp.prototype.test=function(q){var p=m.exec.call(this,q);if(p&&this.global&&!p[0].length&&(this.lastIndex>p.index)){this.lastIndex--}return !!p}}String.prototype.match=function(q){if(!XRegExp.isRegExp(q)){q=RegExp(q)}if(q.global){var p=m.match.apply(this,arguments);q.lastIndex=0;return p}return q.exec(this)};String.prototype.replace=function(r,s){var t=XRegExp.isRegExp(r),q,p,u;if(t&&typeof s.valueOf()==="string"&&s.indexOf("${")===-1&&f){return m.replace.apply(this,arguments)}if(!t){r=r+""}else{if(r._xregexp){q=r._xregexp.captureNames}}if(typeof s==="function"){p=m.replace.call(this,r,function(){if(q){arguments[0]=new String(arguments[0]);for(var v=0;v<q.length;v++){if(q[v]){arguments[0][q[v]]=arguments[v+1]}}}if(t&&r.global){r.lastIndex=arguments[arguments.length-2]+arguments[0].length}return s.apply(null,arguments)})}else{u=this+"";p=m.replace.call(u,r,function(){var v=arguments;return m.replace.call(s,c,function(x,w,A){if(w){switch(w){case"$":return"$";case"&":return v[0];case"`":return v[v.length-1].slice(0,v[v.length-2]);case"'":return v[v.length-1].slice(v[v.length-2]+v[0].length);default:var y="";w=+w;if(!w){return x}while(w>v.length-3){y=String.prototype.slice.call(w,-1)+y;w=Math.floor(w/10)}return(w?v[w]||"":"$")+y}}else{var z=+A;if(z<=v.length-3){return v[z]}z=q?l(q,A):-1;return z>-1?v[z+1]:x}})})}if(t&&r.global){r.lastIndex=0}return p};String.prototype.split=function(u,p){if(!XRegExp.isRegExp(u)){return m.split.apply(this,arguments)}var w=this+"",r=[],v=0,t,q;if(p===undefined||+p<0){p=Infinity}else{p=Math.floor(+p);if(!p){return[]}}u=XRegExp.copyAsGlobal(u);while(t=u.exec(w)){if(u.lastIndex>v){r.push(w.slice(v,t.index));if(t.length>1&&t.index<w.length){Array.prototype.push.apply(r,t.slice(1))}q=t[0].length;v=u.lastIndex;if(r.length>=p){break}}if(u.lastIndex===t.index){u.lastIndex++}}if(v===w.length){if(!m.test.call(u,"")||q){r.push("")}}else{r.push(w.slice(v))}return r.length>p?r.slice(0,p):r};function j(r,q){if(!XRegExp.isRegExp(r)){throw TypeError("type RegExp expected")}var p=r._xregexp;r=XRegExp(r.source,d(r)+(q||""));if(p){r._xregexp={source:p.source,captureNames:p.captureNames?p.captureNames.slice(0):null}}return r}function d(p){return(p.global?"g":"")+(p.ignoreCase?"i":"")+(p.multiline?"m":"")+(p.extended?"x":"")+(p.sticky?"y":"")}function o(v,u,w,p){var r=k.length,y,s,x;g=true;try{while(r--){x=k[r];if((w&x.scope)&&(!x.trigger||x.trigger.call(p))){x.pattern.lastIndex=u;s=x.pattern.exec(v);if(s&&s.index===u){y={output:x.handler.call(p,s,w),match:s};break}}}}catch(q){throw q}finally{g=false}return y}function l(s,q,r){if(Array.prototype.indexOf){return s.indexOf(q,r)}for(var p=r||0;p<s.length;p++){if(s[p]===q){return p}}return -1}XRegExp.addToken(/\(\?#[^)]*\)/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"});XRegExp.addToken(/\((?!\?)/,function(){this.captureNames.push(null);return"("});XRegExp.addToken(/\(\?<([$\w]+)>/,function(p){this.captureNames.push(p[1]);this.hasNamedCapture=true;return"("});XRegExp.addToken(/\\k<([\w$]+)>/,function(q){var p=l(this.captureNames,q[1]);return p>-1?"\\"+(p+1)+(isNaN(q.input.charAt(q.index+q[0].length))?"":"(?:)"):q[0]});XRegExp.addToken(/\[\^?]/,function(p){return p[0]==="[]"?"\\b\\B":"[\\s\\S]"});XRegExp.addToken(/^\(\?([imsx]+)\)/,function(p){this.setFlag(p[1]);return""});XRegExp.addToken(/(?:\s+|#.*)+/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("x")});XRegExp.addToken(/\./,function(){return"[\\s\\S]"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("s")})})();
+</script><script type="text/javascript">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+//
+// Begin anonymous function. This is used to contain local scope variables without polutting global scope.
+//
+var SyntaxHighlighter = function() { 
+
+// CommonJS
+if (typeof(require) != 'undefined' && typeof(XRegExp) == 'undefined')
+{
+	XRegExp = require('XRegExp').XRegExp;
+}
+
+// Shortcut object which will be assigned to the SyntaxHighlighter variable.
+// This is a shorthand for local reference in order to avoid long namespace 
+// references to SyntaxHighlighter.whatever...
+var sh = {
+	defaults : {
+		/** Additional CSS class names to be added to highlighter elements. */
+		'class-name' : '',
+		
+		/** First line number. */
+		'first-line' : 1,
+		
+		/**
+		 * Pads line numbers. Possible values are:
+		 *
+		 *   false - don't pad line numbers.
+		 *   true  - automaticaly pad numbers with minimum required number of leading zeroes.
+		 *   [int] - length up to which pad line numbers.
+		 */
+		'pad-line-numbers' : false,
+		
+		/** Lines to highlight. */
+		'highlight' : null,
+		
+		/** Title to be displayed above the code block. */
+		'title' : null,
+		
+		/** Enables or disables smart tabs. */
+		'smart-tabs' : true,
+		
+		/** Gets or sets tab size. */
+		'tab-size' : 4,
+		
+		/** Enables or disables gutter. */
+		'gutter' : true,
+		
+		/** Enables or disables toolbar. */
+		'toolbar' : true,
+		
+		/** Enables quick code copy and paste from double click. */
+		'quick-code' : true,
+		
+		/** Forces code view to be collapsed. */
+		'collapse' : false,
+		
+		/** Enables or disables automatic links. */
+		'auto-links' : true,
+		
+		/** Gets or sets light mode. Equavalent to turning off gutter and toolbar. */
+		'light' : false,
+		
+		'html-script' : false
+	},
+	
+	config : {
+		space : '&nbsp;',
+		
+		/** Enables use of <SCRIPT type="syntaxhighlighter" /> tags. */
+		useScriptTags : true,
+		
+		/** Blogger mode flag. */
+		bloggerMode : false,
+		
+		stripBrs : false,
+		
+		/** Name of the tag that SyntaxHighlighter will automatically look for. */
+		tagName : 'pre',
+		
+		strings : {
+			expandSource : 'expand source',
+			help : '?',
+			alert: 'SyntaxHighlighter\n\n',
+			noBrush : 'Can\'t find brush for: ',
+			brushNotHtmlScript : 'Brush wasn\'t configured for html-script option: ',
+			
+			// this is populated by the build script
+			aboutDialog : '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>About SyntaxHighlighter</title></head><body style="font-family:Geneva,Arial,Helvetica,sans-serif;background-color:#fff;color:#000;font-size:1em;text-align:center;"><div style="text-align:center;margin-top:1.5em;"><div style="font-size:xx-large;">SyntaxHighlighter</div><div style="font-size:.75em;margin-bottom:3em;"><div>version 3.0.83 (July 02 2010)</div><div><a href="http://alexgorbatchev.com/SyntaxHighlighter" target="_blank" style="color:#005896">http://alexgorbatchev.com/SyntaxHighlighter</a></div><div>JavaScript code syntax highlighter.</div><div>Copyright 2004-2010 Alex Gorbatchev.</div></div><div>If you like this script, please <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2930402" style="color:#005896">donate</a> to <br/>keep development active!</div></div></body></html>'
+		}
+	},
+	
+	/** Internal 'global' variables. */
+	vars : {
+		discoveredBrushes : null,
+		highlighters : {}
+	},
+	
+	/** This object is populated by user included external brush files. */
+	brushes : {},
+
+	/** Common regular expressions. */
+	regexLib : {
+		multiLineCComments			: /\/\*[\s\S]*?\*\//gm,
+		singleLineCComments			: /\/\/.*$/gm,
+		singleLinePerlComments		: /#.*$/gm,
+		doubleQuotedString			: /"([^\\"\n]|\\.)*"/g,
+		singleQuotedString			: /'([^\\'\n]|\\.)*'/g,
+		multiLineDoubleQuotedString	: new XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
+		multiLineSingleQuotedString	: new XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
+		xmlComments					: /(&lt;|<)!--[\s\S]*?--(&gt;|>)/gm,
+		url							: /\w+:\/\/[\w-.\/?%&=:@;]*/g,
+		
+		/** <?= ?> tags. */
+		phpScriptTags 				: { left: /(&lt;|<)\?=?/g, right: /\?(&gt;|>)/g },
+		
+		/** <%= %> tags. */
+		aspScriptTags				: { left: /(&lt;|<)%=?/g, right: /%(&gt;|>)/g },
+		
+		scriptScriptTags			: { left: /(&lt;|<)\s*script.*?(&gt;|>)/gi, right: /(&lt;|<)\/\s*script\s*(&gt;|>)/gi }
+	},
+
+	toolbar: {
+		/**
+		 * Generates HTML markup for the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @return {String} Returns HTML markup.
+		 */
+		getHtml: function(highlighter)
+		{
+			var html = '<div class="toolbar">',
+				items = sh.toolbar.items,
+				list = items.list
+				;
+			
+			function defaultGetHtml(highlighter, name)
+			{
+				return sh.toolbar.getButtonHtml(highlighter, name, sh.config.strings[name]);
+			};
+			
+			for (var i = 0; i < list.length; i++)
+				html += (items[list[i]].getHtml || defaultGetHtml)(highlighter, list[i]);
+			
+			html += '</div>';
+			
+			return html;
+		},
+		
+		/**
+		 * Generates HTML markup for a regular button in the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @param {String} commandName		Command name that would be executed.
+		 * @param {String} label			Label text to display.
+		 * @return {String}					Returns HTML markup.
+		 */
+		getButtonHtml: function(highlighter, commandName, label)
+		{
+			return '<span><a href="#" class="toolbar_item'
+				+ ' command_' + commandName
+				+ ' ' + commandName
+				+ '">' + label + '</a></span>'
+				;
+		},
+		
+		/**
+		 * Event handler for a toolbar anchor.
+		 */
+		handler: function(e)
+		{
+			var target = e.target,
+				className = target.className || ''
+				;
+
+			function getValue(name)
+			{
+				var r = new RegExp(name + '_(\\w+)'),
+					match = r.exec(className)
+					;
+
+				return match ? match[1] : null;
+			};
+			
+			var highlighter = getHighlighterById(findParentElement(target, '.syntaxhighlighter').id),
+				commandName = getValue('command')
+				;
+			
+			// execute the toolbar command
+			if (highlighter && commandName)
+				sh.toolbar.items[commandName].execute(highlighter);
+
+			// disable default A click behaviour
+			e.preventDefault();
+		},
+		
+		/** Collection of toolbar items. */
+		items : {
+			// Ordered lis of items in the toolbar. Can't expect `for (var n in items)` to be consistent.
+			list: ['expandSource', 'help'],
+
+			expandSource: {
+				getHtml: function(highlighter)
+				{
+					if (highlighter.getParam('collapse') != true)
+						return '';
+						
+					var title = highlighter.getParam('title');
+					return sh.toolbar.getButtonHtml(highlighter, 'expandSource', title ? title : sh.config.strings.expandSource);
+				},
+			
+				execute: function(highlighter)
+				{
+					var div = getHighlighterDivById(highlighter.id);
+					removeClass(div, 'collapsed');
+				}
+			},
+
+			/** Command to display the about dialog window. */
+			help: {
+				execute: function(highlighter)
+				{	
+					var wnd = popup('', '_blank', 500, 250, 'scrollbars=0'),
+						doc = wnd.document
+						;
+					
+					doc.write(sh.config.strings.aboutDialog);
+					doc.close();
+					wnd.focus();
+				}
+			}
+		}
+	},
+
+	/**
+	 * Finds all elements on the page which should be processes by SyntaxHighlighter.
+	 *
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are returned which qualify.
+	 *
+	 * @return {Array}	Returns list of <code>{ target: DOMElement, params: Object }</code> objects.
+	 */
+	findElements: function(globalParams, element)
+	{
+		var elements = element ? [element] : toArray(document.getElementsByTagName(sh.config.tagName)), 
+			conf = sh.config,
+			result = []
+			;
+
+		// support for <SCRIPT TYPE="syntaxhighlighter" /> feature
+		if (conf.useScriptTags)
+			elements = elements.concat(getSyntaxHighlighterScriptTags());
+
+		if (elements.length === 0) 
+			return result;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var item = {
+				target: elements[i], 
+				// local params take precedence over globals
+				params: merge(globalParams, parseParams(elements[i].className))
+			};
+
+			if (item.params['brush'] == null)
+				continue;
+				
+			result.push(item);
+		}
+		
+		return result;
+	},
+
+	/**
+	 * Shorthand to highlight all elements on the page that are marked as 
+	 * SyntaxHighlighter source code.
+	 * 
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are highlighted.
+	 */ 
+	highlight: function(globalParams, element)
+	{
+		var elements = this.findElements(globalParams, element),
+			propertyName = 'innerHTML', 
+			highlighter = null,
+			conf = sh.config
+			;
+
+		if (elements.length === 0) 
+			return;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var element = elements[i],
+				target = element.target,
+				params = element.params,
+				brushName = params.brush,
+				code
+				;
+
+			if (brushName == null)
+				continue;
+
+			// Instantiate a brush
+			if (params['html-script'] == 'true' || sh.defaults['html-script'] == true) 
+			{
+				highlighter = new sh.HtmlScript(brushName);
+				brushName = 'htmlscript';
+			}
+			else
+			{
+				var brush = findBrush(brushName);
+				
+				if (brush)
+					highlighter = new brush();
+				else
+					continue;
+			}
+			
+			code = target[propertyName];
+			
+			// remove CDATA from <SCRIPT/> tags if it's present
+			if (conf.useScriptTags)
+				code = stripCData(code);
+				
+			// Inject title if the attribute is present
+			if ((target.title || '') != '')
+				params.title = target.title;
+				
+			params['brush'] = brushName;
+			highlighter.init(params);
+			element = highlighter.getDiv(code);
+			
+			// carry over ID
+			if ((target.id || '') != '')
+				element.id = target.id;
+			
+			target.parentNode.replaceChild(element, target);
+		}
+	},
+
+	/**
+	 * Main entry point for the SyntaxHighlighter.
+	 * @param {Object} params Optional params to apply to all highlighted elements.
+	 */
+	all: function(params)
+	{
+		attachEvent(
+			window,
+			'load',
+			function() { sh.highlight(params); }
+		);
+	}
+}; // end of sh
+
+sh['all']			= sh.all;
+sh['highlight']		= sh.highlight;
+
+/**
+ * Checks if target DOM elements has specified CSS class.
+ * @param {DOMElement} target Target DOM element to check.
+ * @param {String} className Name of the CSS class to check for.
+ * @return {Boolean} Returns true if class name is present, false otherwise.
+ */
+function hasClass(target, className)
+{
+	return target.className.indexOf(className) != -1;
+};
+
+/**
+ * Adds CSS class name to the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className New CSS class to add.
+ */
+function addClass(target, className)
+{
+	if (!hasClass(target, className))
+		target.className += ' ' + className;
+};
+
+/**
+ * Removes CSS class name from the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className CSS class to remove.
+ */
+function removeClass(target, className)
+{
+	target.className = target.className.replace(className, '');
+};
+
+/**
+ * Converts the source to array object. Mostly used for function arguments and 
+ * lists returned by getElementsByTagName() which aren't Array objects.
+ * @param {List} source Source list.
+ * @return {Array} Returns array.
+ */
+function toArray(source)
+{
+	var result = [];
+	
+	for (var i = 0; i < source.length; i++) 
+		result.push(source[i]);
+		
+	return result;
+};
+
+/**
+ * Splits block of text into lines.
+ * @param {String} block Block of text.
+ * @return {Array} Returns array of lines.
+ */
+function splitLines(block)
+{
+	return block.split('\n');
+}
+
+/**
+ * Generates HTML ID for the highlighter.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {String} Returns HTML ID.
+ */
+function getHighlighterId(id)
+{
+	var prefix = 'highlighter_';
+	return id.indexOf(prefix) == 0 ? id : prefix + id;
+};
+
+/**
+ * Finds Highlighter instance by ID.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Highlighter} Returns instance of the highlighter.
+ */
+function getHighlighterById(id)
+{
+	return sh.vars.highlighters[getHighlighterId(id)];
+};
+
+/**
+ * Finds highlighter's DIV container.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Element} Returns highlighter's DIV element.
+ */
+function getHighlighterDivById(id)
+{
+	return document.getElementById(getHighlighterId(id));
+};
+
+/**
+ * Stores highlighter so that getHighlighterById() can do its thing. Each
+ * highlighter must call this method to preserve itself.
+ * @param {Highilghter} highlighter Highlighter instance.
+ */
+function storeHighlighter(highlighter)
+{
+	sh.vars.highlighters[getHighlighterId(highlighter.id)] = highlighter;
+};
+
+/**
+ * Looks for a child or parent node which has specified classname.
+ * Equivalent to jQuery's $(container).find(".className")
+ * @param {Element} target Target element.
+ * @param {String} search Class name or node name to look for.
+ * @param {Boolean} reverse If set to true, will go up the node tree instead of down.
+ * @return {Element} Returns found child or parent element on null.
+ */
+function findElement(target, search, reverse /* optional */)
+{
+	if (target == null)
+		return null;
+		
+	var nodes			= reverse != true ? target.childNodes : [ target.parentNode ],
+		propertyToFind	= { '#' : 'id', '.' : 'className' }[search.substr(0, 1)] || 'nodeName',
+		expectedValue,
+		found
+		;
+
+	expectedValue = propertyToFind != 'nodeName'
+		? search.substr(1)
+		: search.toUpperCase()
+		;
+		
+	// main return of the found node
+	if ((target[propertyToFind] || '').indexOf(expectedValue) != -1)
+		return target;
+	
+	for (var i = 0; nodes && i < nodes.length && found == null; i++)
+		found = findElement(nodes[i], search, reverse);
+	
+	return found;
+};
+
+/**
+ * Looks for a parent node which has specified classname.
+ * This is an alias to <code>findElement(container, className, true)</code>.
+ * @param {Element} target Target element.
+ * @param {String} className Class name to look for.
+ * @return {Element} Returns found parent element on null.
+ */
+function findParentElement(target, className)
+{
+	return findElement(target, className, true);
+};
+
+/**
+ * Finds an index of element in the array.
+ * @ignore
+ * @param {Object} searchElement
+ * @param {Number} fromIndex
+ * @return {Number} Returns index of element if found; -1 otherwise.
+ */
+function indexOf(array, searchElement, fromIndex)
+{
+	fromIndex = Math.max(fromIndex || 0, 0);
+
+	for (var i = fromIndex; i < array.length; i++)
+		if(array[i] == searchElement)
+			return i;
+	
+	return -1;
+};
+
+/**
+ * Generates a unique element ID.
+ */
+function guid(prefix)
+{
+	return (prefix || '') + Math.round(Math.random() * 1000000).toString();
+};
+
+/**
+ * Merges two objects. Values from obj2 override values in obj1.
+ * Function is NOT recursive and works only for one dimensional objects.
+ * @param {Object} obj1 First object.
+ * @param {Object} obj2 Second object.
+ * @return {Object} Returns combination of both objects.
+ */
+function merge(obj1, obj2)
+{
+	var result = {}, name;
+
+	for (name in obj1) 
+		result[name] = obj1[name];
+	
+	for (name in obj2) 
+		result[name] = obj2[name];
+		
+	return result;
+};
+
+/**
+ * Attempts to convert string to boolean.
+ * @param {String} value Input string.
+ * @return {Boolean} Returns true if input was "true", false if input was "false" and value otherwise.
+ */
+function toBoolean(value)
+{
+	var result = { "true" : true, "false" : false }[value];
+	return result == null ? value : result;
+};
+
+/**
+ * Opens up a centered popup window.
+ * @param {String} url		URL to open in the window.
+ * @param {String} name		Popup name.
+ * @param {int} width		Popup width.
+ * @param {int} height		Popup height.
+ * @param {String} options	window.open() options.
+ * @return {Window}			Returns window instance.
+ */
+function popup(url, name, width, height, options)
+{
+	var x = (screen.width - width) / 2,
+		y = (screen.height - height) / 2
+		;
+		
+	options +=	', left=' + x + 
+				', top=' + y +
+				', width=' + width +
+				', height=' + height
+		;
+	options = options.replace(/^,/, '');
+
+	var win = window.open(url, name, options);
+	win.focus();
+	return win;
+};
+
+/**
+ * Adds event handler to the target object.
+ * @param {Object} obj		Target object.
+ * @param {String} type		Name of the event.
+ * @param {Function} func	Handling function.
+ */
+function attachEvent(obj, type, func, scope)
+{
+	function handler(e)
+	{
+		e = e || window.event;
+		
+		if (!e.target)
+		{
+			e.target = e.srcElement;
+			e.preventDefault = function()
+			{
+				this.returnValue = false;
+			};
+		}
+			
+		func.call(scope || window, e);
+	};
+	
+	if (obj.attachEvent) 
+	{
+		obj.attachEvent('on' + type, handler);
+	}
+	else 
+	{
+		obj.addEventListener(type, handler, false);
+	}
+};
+
+/**
+ * Displays an alert.
+ * @param {String} str String to display.
+ */
+function alert(str)
+{
+	window.alert(sh.config.strings.alert + str);
+};
+
+/**
+ * Finds a brush by its alias.
+ *
+ * @param {String} alias		Brush alias.
+ * @param {Boolean} showAlert	Suppresses the alert if false.
+ * @return {Brush}				Returns bursh constructor if found, null otherwise.
+ */
+function findBrush(alias, showAlert)
+{
+	var brushes = sh.vars.discoveredBrushes,
+		result = null
+		;
+	
+	if (brushes == null) 
+	{
+		brushes = {};
+		
+		// Find all brushes
+		for (var brush in sh.brushes) 
+		{
+			var info = sh.brushes[brush],
+				aliases = info.aliases
+				;
+			
+			if (aliases == null) 
+				continue;
+			
+			// keep the brush name
+			info.brushName = brush.toLowerCase();
+			
+			for (var i = 0; i < aliases.length; i++) 
+				brushes[aliases[i]] = brush;
+		}
+		
+		sh.vars.discoveredBrushes = brushes;
+	}
+	
+	result = sh.brushes[brushes[alias]];
+
+	if (result == null && showAlert != false)
+		alert(sh.config.strings.noBrush + alias);
+	
+	return result;
+};
+
+/**
+ * Executes a callback on each line and replaces each line with result from the callback.
+ * @param {Object} str			Input string.
+ * @param {Object} callback		Callback function taking one string argument and returning a string.
+ */
+function eachLine(str, callback)
+{
+	var lines = splitLines(str);
+	
+	for (var i = 0; i < lines.length; i++)
+		lines[i] = callback(lines[i], i);
+		
+	return lines.join('\n');
+};
+
+/**
+ * This is a special trim which only removes first and last empty lines
+ * and doesn't affect valid leading space on the first line.
+ * 
+ * @param {String} str   Input string
+ * @return {String}      Returns string without empty first and last lines.
+ */
+function trimFirstAndLastLines(str)
+{
+	return str.replace(/^[ ]*[\n]+|[\n]*[ ]*$/g, '');
+};
+
+/**
+ * Parses key/value pairs into hash object.
+ * 
+ * Understands the following formats:
+ * - name: word;
+ * - name: [word, word];
+ * - name: "string";
+ * - name: 'string';
+ * 
+ * For example:
+ *   name1: value; name2: [value, value]; name3: 'value'
+ *   
+ * @param {String} str    Input string.
+ * @return {Object}       Returns deserialized object.
+ */
+function parseParams(str)
+{
+	var match, 
+		result = {},
+		arrayRegex = new XRegExp("^\\[(?<values>(.*?))\\]$"),
+		regex = new XRegExp(
+			"(?<name>[\\w-]+)" +
+			"\\s*:\\s*" +
+			"(?<value>" +
+				"[\\w-%#]+|" +		// word
+				"\\[.*?\\]|" +		// [] array
+				'".*?"|' +			// "" string
+				"'.*?'" +			// '' string
+			")\\s*;?",
+			"g"
+		)
+		;
+
+	while ((match = regex.exec(str)) != null) 
+	{
+		var value = match.value
+			.replace(/^['"]|['"]$/g, '') // strip quotes from end of strings
+			;
+		
+		// try to parse array value
+		if (value != null && arrayRegex.test(value))
+		{
+			var m = arrayRegex.exec(value);
+			value = m.values.length > 0 ? m.values.split(/\s*,\s*/) : [];
+		}
+		
+		result[match.name] = value;
+	}
+	
+	return result;
+};
+
+/**
+ * Wraps each line of the string into <code/> tag with given style applied to it.
+ * 
+ * @param {String} str   Input string.
+ * @param {String} css   Style name to apply to the string.
+ * @return {String}      Returns input string with each line surrounded by <span/> tag.
+ */
+function wrapLinesWithCode(str, css)
+{
+	if (str == null || str.length == 0 || str == '\n') 
+		return str;
+
+	str = str.replace(/</g, '&lt;');
+
+	// Replace two or more sequential spaces with &nbsp; leaving last space untouched.
+	str = str.replace(/ {2,}/g, function(m)
+	{
+		var spaces = '';
+		
+		for (var i = 0; i < m.length - 1; i++)
+			spaces += sh.config.space;
+		
+		return spaces + ' ';
+	});
+
+	// Split each line and apply <span class="...">...</span> to them so that
+	// leading spaces aren't included.
+	if (css != null) 
+		str = eachLine(str, function(line)
+		{
+			if (line.length == 0) 
+				return '';
+			
+			var spaces = '';
+			
+			line = line.replace(/^(&nbsp;| )+/, function(s)
+			{
+				spaces = s;
+				return '';
+			});
+			
+			if (line.length == 0) 
+				return spaces;
+			
+			return spaces + '<code class="' + css + '">' + line + '</code>';
+		});
+
+	return str;
+};
+
+/**
+ * Pads number with zeros until it's length is the same as given length.
+ * 
+ * @param {Number} number	Number to pad.
+ * @param {Number} length	Max string length with.
+ * @return {String}			Returns a string padded with proper amount of '0'.
+ */
+function padNumber(number, length)
+{
+	var result = number.toString();
+	
+	while (result.length < length)
+		result = '0' + result;
+	
+	return result;
+};
+
+/**
+ * Replaces tabs with spaces.
+ * 
+ * @param {String} code		Source code.
+ * @param {Number} tabSize	Size of the tab.
+ * @return {String}			Returns code with all tabs replaces by spaces.
+ */
+function processTabs(code, tabSize)
+{
+	var tab = '';
+	
+	for (var i = 0; i < tabSize; i++)
+		tab += ' ';
+
+	return code.replace(/\t/g, tab);
+};
+
+/**
+ * Replaces tabs with smart spaces.
+ * 
+ * @param {String} code    Code to fix the tabs in.
+ * @param {Number} tabSize Number of spaces in a column.
+ * @return {String}        Returns code with all tabs replaces with roper amount of spaces.
+ */
+function processSmartTabs(code, tabSize)
+{
+	var lines = splitLines(code),
+		tab = '\t',
+		spaces = ''
+		;
+	
+	// Create a string with 1000 spaces to copy spaces from... 
+	// It's assumed that there would be no indentation longer than that.
+	for (var i = 0; i < 50; i++) 
+		spaces += '                    '; // 20 spaces * 50
+			
+	// This function inserts specified amount of spaces in the string
+	// where a tab is while removing that given tab.
+	function insertSpaces(line, pos, count)
+	{
+		return line.substr(0, pos)
+			+ spaces.substr(0, count)
+			+ line.substr(pos + 1, line.length) // pos + 1 will get rid of the tab
+			;
+	};
+
+	// Go through all the lines and do the 'smart tabs' magic.
+	code = eachLine(code, function(line)
+	{
+		if (line.indexOf(tab) == -1) 
+			return line;
+		
+		var pos = 0;
+		
+		while ((pos = line.indexOf(tab)) != -1) 
+		{
+			// This is pretty much all there is to the 'smart tabs' logic.
+			// Based on the position within the line and size of a tab,
+			// calculate the amount of spaces we need to insert.
+			var spaces = tabSize - pos % tabSize;
+			line = insertSpaces(line, pos, spaces);
+		}
+		
+		return line;
+	});
+	
+	return code;
+};
+
+/**
+ * Performs various string fixes based on configuration.
+ */
+function fixInputString(str)
+{
+	var br = /<br\s*\/?>|&lt;br\s*\/?&gt;/gi;
+	
+	if (sh.config.bloggerMode == true)
+		str = str.replace(br, '\n');
+
+	if (sh.config.stripBrs == true)
+		str = str.replace(br, '');
+		
+	return str;
+};
+
+/**
+ * Removes all white space at the begining and end of a string.
+ * 
+ * @param {String} str   String to trim.
+ * @return {String}      Returns string without leading and following white space characters.
+ */
+function trim(str)
+{
+	return str.replace(/^\s+|\s+$/g, '');
+};
+
+/**
+ * Unindents a block of text by the lowest common indent amount.
+ * @param {String} str   Text to unindent.
+ * @return {String}      Returns unindented text block.
+ */
+function unindent(str)
+{
+	var lines = splitLines(fixInputString(str)),
+		indents = new Array(),
+		regex = /^\s*/,
+		min = 1000
+		;
+	
+	// go through every line and check for common number of indents
+	for (var i = 0; i < lines.length && min > 0; i++) 
+	{
+		var line = lines[i];
+		
+		if (trim(line).length == 0) 
+			continue;
+		
+		var matches = regex.exec(line);
+		
+		// In the event that just one line doesn't have leading white space
+		// we can't unindent anything, so bail completely.
+		if (matches == null) 
+			return str;
+			
+		min = Math.min(matches[0].length, min);
+	}
+	
+	// trim minimum common number of white space from the begining of every line
+	if (min > 0) 
+		for (var i = 0; i < lines.length; i++) 
+			lines[i] = lines[i].substr(min);
+	
+	return lines.join('\n');
+};
+
+/**
+ * Callback method for Array.sort() which sorts matches by
+ * index position and then by length.
+ * 
+ * @param {Match} m1	Left object.
+ * @param {Match} m2    Right object.
+ * @return {Number}     Returns -1, 0 or -1 as a comparison result.
+ */
+function matchesSortCallback(m1, m2)
+{
+	// sort matches by index first
+	if(m1.index < m2.index)
+		return -1;
+	else if(m1.index > m2.index)
+		return 1;
+	else
+	{
+		// if index is the same, sort by length
+		if(m1.length < m2.length)
+			return -1;
+		else if(m1.length > m2.length)
+			return 1;
+	}
+	
+	return 0;
+};
+
+/**
+ * Executes given regular expression on provided code and returns all
+ * matches that are found.
+ * 
+ * @param {String} code    Code to execute regular expression on.
+ * @param {Object} regex   Regular expression item info from <code>regexList</code> collection.
+ * @return {Array}         Returns a list of Match objects.
+ */ 
+function getMatches(code, regexInfo)
+{
+	function defaultAdd(match, regexInfo)
+	{
+		return match[0];
+	};
+	
+	var index = 0,
+		match = null,
+		matches = [],
+		func = regexInfo.func ? regexInfo.func : defaultAdd
+		;
+	
+	while((match = regexInfo.regex.exec(code)) != null)
+	{
+		var resultMatch = func(match, regexInfo);
+		
+		if (typeof(resultMatch) == 'string')
+			resultMatch = [new sh.Match(resultMatch, match.index, regexInfo.css)];
+
+		matches = matches.concat(resultMatch);
+	}
+	
+	return matches;
+};
+
+/**
+ * Turns all URLs in the code into <a/> tags.
+ * @param {String} code Input code.
+ * @return {String} Returns code with </a> tags.
+ */
+function processUrls(code)
+{
+	var gt = /(.*)((&gt;|&lt;).*)/;
+	
+	return code.replace(sh.regexLib.url, function(m)
+	{
+		var suffix = '',
+			match = null
+			;
+		
+		// We include &lt; and &gt; in the URL for the common cases like <http://google.com>
+		// The problem is that they get transformed into &lt;http://google.com&gt;
+		// Where as &gt; easily looks like part of the URL string.
+	
+		if (match = gt.exec(m))
+		{
+			m = match[1];
+			suffix = match[2];
+		}
+		
+		return '<a href="' + m + '">' + m + '</a>' + suffix;
+	});
+};
+
+/**
+ * Finds all <SCRIPT TYPE="syntaxhighlighter" /> elementss.
+ * @return {Array} Returns array of all found SyntaxHighlighter tags.
+ */
+function getSyntaxHighlighterScriptTags()
+{
+	var tags = document.getElementsByTagName('script'),
+		result = []
+		;
+	
+	for (var i = 0; i < tags.length; i++)
+		if (tags[i].type == 'syntaxhighlighter')
+			result.push(tags[i]);
+			
+	return result;
+};
+
+/**
+ * Strips <![CDATA[]]> from <SCRIPT /> content because it should be used
+ * there in most cases for XHTML compliance.
+ * @param {String} original	Input code.
+ * @return {String} Returns code without leading <![CDATA[]]> tags.
+ */
+function stripCData(original)
+{
+	var left = '<![CDATA[',
+		right = ']]>',
+		// for some reason IE inserts some leading blanks here
+		copy = trim(original),
+		changed = false,
+		leftLength = left.length,
+		rightLength = right.length
+		;
+	
+	if (copy.indexOf(left) == 0)
+	{
+		copy = copy.substring(leftLength);
+		changed = true;
+	}
+	
+	var copyLength = copy.length;
+	
+	if (copy.indexOf(right) == copyLength - rightLength)
+	{
+		copy = copy.substring(0, copyLength - rightLength);
+		changed = true;
+	}
+	
+	return changed ? copy : original;
+};
+
+
+/**
+ * Quick code mouse double click handler.
+ */
+function quickCodeHandler(e)
+{
+	var target = e.target,
+		highlighterDiv = findParentElement(target, '.syntaxhighlighter'),
+		container = findParentElement(target, '.container'),
+		textarea = document.createElement('textarea'),
+		highlighter
+		;
+
+	if (!container || !highlighterDiv || findElement(container, 'textarea'))
+		return;
+
+	highlighter = getHighlighterById(highlighterDiv.id);
+	
+	// add source class name
+	addClass(highlighterDiv, 'source');
+
+	// Have to go over each line and grab it's text, can't just do it on the
+	// container because Firefox loses all \n where as Webkit doesn't.
+	var lines = container.childNodes,
+		code = []
+		;
+	
+	for (var i = 0; i < lines.length; i++)
+		code.push(lines[i].innerText || lines[i].textContent);
+	
+	// using \r instead of \r or \r\n makes this work equally well on IE, FF and Webkit
+	code = code.join('\r');
+	
+	// inject <textarea/> tag
+	textarea.appendChild(document.createTextNode(code));
+	container.appendChild(textarea);
+	
+	// preselect all text
+	textarea.focus();
+	textarea.select();
+	
+	// set up handler for lost focus
+	attachEvent(textarea, 'blur', function(e)
+	{
+		textarea.parentNode.removeChild(textarea);
+		removeClass(highlighterDiv, 'source');
+	});
+};
+
+/**
+ * Match object.
+ */
+sh.Match = function(value, index, css)
+{
+	this.value = value;
+	this.index = index;
+	this.length = value.length;
+	this.css = css;
+	this.brushName = null;
+};
+
+sh.Match.prototype.toString = function()
+{
+	return this.value;
+};
+
+/**
+ * Simulates HTML code with a scripting language embedded.
+ * 
+ * @param {String} scriptBrushName Brush name of the scripting language.
+ */
+sh.HtmlScript = function(scriptBrushName)
+{
+	var brushClass = findBrush(scriptBrushName),
+		scriptBrush,
+		xmlBrush = new sh.brushes.Xml(),
+		bracketsRegex = null,
+		ref = this,
+		methodsToExpose = 'getDiv getHtml init'.split(' ')
+		;
+
+	if (brushClass == null)
+		return;
+	
+	scriptBrush = new brushClass();
+	
+	for(var i = 0; i < methodsToExpose.length; i++)
+		// make a closure so we don't lose the name after i changes
+		(function() {
+			var name = methodsToExpose[i];
+			
+			ref[name] = function()
+			{
+				return xmlBrush[name].apply(xmlBrush, arguments);
+			};
+		})();
+	
+	if (scriptBrush.htmlScript == null)
+	{
+		alert(sh.config.strings.brushNotHtmlScript + scriptBrushName);
+		return;
+	}
+	
+	xmlBrush.regexList.push(
+		{ regex: scriptBrush.htmlScript.code, func: process }
+	);
+	
+	function offsetMatches(matches, offset)
+	{
+		for (var j = 0; j < matches.length; j++) 
+			matches[j].index += offset;
+	}
+	
+	function process(match, info)
+	{
+		var code = match.code,
+			matches = [],
+			regexList = scriptBrush.regexList,
+			offset = match.index + match.left.length,
+			htmlScript = scriptBrush.htmlScript,
+			result
+			;
+
+		// add all matches from the code
+		for (var i = 0; i < regexList.length; i++)
+		{
+			result = getMatches(code, regexList[i]);
+			offsetMatches(result, offset);
+			matches = matches.concat(result);
+		}
+		
+		// add left script bracket
+		if (htmlScript.left != null && match.left != null)
+		{
+			result = getMatches(match.left, htmlScript.left);
+			offsetMatches(result, match.index);
+			matches = matches.concat(result);
+		}
+		
+		// add right script bracket
+		if (htmlScript.right != null && match.right != null)
+		{
+			result = getMatches(match.right, htmlScript.right);
+			offsetMatches(result, match.index + match[0].lastIndexOf(match.right));
+			matches = matches.concat(result);
+		}
+		
+		for (var j = 0; j < matches.length; j++)
+			matches[j].brushName = brushClass.brushName;
+			
+		return matches;
+	}
+};
+
+/**
+ * Main Highlither class.
+ * @constructor
+ */
+sh.Highlighter = function()
+{
+	// not putting any code in here because of the prototype inheritance
+};
+
+sh.Highlighter.prototype = {
+	/**
+	 * Returns value of the parameter passed to the highlighter.
+	 * @param {String} name				Name of the parameter.
+	 * @param {Object} defaultValue		Default value.
+	 * @return {Object}					Returns found value or default value otherwise.
+	 */
+	getParam: function(name, defaultValue)
+	{
+		var result = this.params[name];
+		return toBoolean(result == null ? defaultValue : result);
+	},
+	
+	/**
+	 * Shortcut to document.createElement().
+	 * @param {String} name		Name of the element to create (DIV, A, etc).
+	 * @return {HTMLElement}	Returns new HTML element.
+	 */
+	create: function(name)
+	{
+		return document.createElement(name);
+	},
+	
+	/**
+	 * Applies all regular expression to the code and stores all found
+	 * matches in the `this.matches` array.
+	 * @param {Array} regexList		List of regular expressions.
+	 * @param {String} code			Source code.
+	 * @return {Array}				Returns list of matches.
+	 */
+	findMatches: function(regexList, code)
+	{
+		var result = [];
+		
+		if (regexList != null)
+			for (var i = 0; i < regexList.length; i++) 
+				// BUG: length returns len+1 for array if methods added to prototype chain (oising@gmail.com)
+				if (typeof (regexList[i]) == "object")
+					result = result.concat(getMatches(code, regexList[i]));
+		
+		// sort and remove nested the matches
+		return this.removeNestedMatches(result.sort(matchesSortCallback));
+	},
+	
+	/**
+	 * Checks to see if any of the matches are inside of other matches. 
+	 * This process would get rid of highligted strings inside comments, 
+	 * keywords inside strings and so on.
+	 */
+	removeNestedMatches: function(matches)
+	{
+		// Optimized by Jose Prado (http://joseprado.com)
+		for (var i = 0; i < matches.length; i++) 
+		{ 
+			if (matches[i] === null)
+				continue;
+			
+			var itemI = matches[i],
+				itemIEndPos = itemI.index + itemI.length
+				;
+			
+			for (var j = i + 1; j < matches.length && matches[i] !== null; j++) 
+			{
+				var itemJ = matches[j];
+				
+				if (itemJ === null) 
+					continue;
+				else if (itemJ.index > itemIEndPos) 
+					break;
+				else if (itemJ.index == itemI.index && itemJ.length > itemI.length)
+					matches[i] = null;
+				else if (itemJ.index >= itemI.index && itemJ.index < itemIEndPos) 
+					matches[j] = null;
+			}
+		}
+		
+		return matches;
+	},
+	
+	/**
+	 * Creates an array containing integer line numbers starting from the 'first-line' param.
+	 * @return {Array} Returns array of integers.
+	 */
+	figureOutLineNumbers: function(code)
+	{
+		var lines = [],
+			firstLine = parseInt(this.getParam('first-line'))
+			;
+		
+		eachLine(code, function(line, index)
+		{
+			lines.push(index + firstLine);
+		});
+		
+		return lines;
+	},
+	
+	/**
+	 * Determines if specified line number is in the highlighted list.
+	 */
+	isLineHighlighted: function(lineNumber)
+	{
+		var list = this.getParam('highlight', []);
+		
+		if (typeof(list) != 'object' && list.push == null) 
+			list = [ list ];
+		
+		return indexOf(list, lineNumber.toString()) != -1;
+	},
+	
+	/**
+	 * Generates HTML markup for a single line of code while determining alternating line style.
+	 * @param {Integer} lineNumber	Line number.
+	 * @param {String} code Line	HTML markup.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineHtml: function(lineIndex, lineNumber, code)
+	{
+		var classes = [
+			'line',
+			'number' + lineNumber,
+			'index' + lineIndex,
+			'alt' + (lineNumber % 2 == 0 ? 1 : 2).toString()
+		];
+		
+		if (this.isLineHighlighted(lineNumber))
+		 	classes.push('highlighted');
+		
+		if (lineNumber == 0)
+			classes.push('break');
+			
+		return '<div class="' + classes.join(' ') + '">' + code + '</div>';
+	},
+	
+	/**
+	 * Generates HTML markup for line number column.
+	 * @param {String} code			Complete code HTML markup.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineNumbersHtml: function(code, lineNumbers)
+	{
+		var html = '',
+			count = splitLines(code).length,
+			firstLine = parseInt(this.getParam('first-line')),
+			pad = this.getParam('pad-line-numbers')
+			;
+		
+		if (pad == true)
+			pad = (firstLine + count - 1).toString().length;
+		else if (isNaN(pad) == true)
+			pad = 0;
+			
+		for (var i = 0; i < count; i++)
+		{
+			var lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i,
+				code = lineNumber == 0 ? sh.config.space : padNumber(lineNumber, pad)
+				;
+				
+			html += this.getLineHtml(i, lineNumber, code);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Splits block of text into individual DIV lines.
+	 * @param {String} code			Code to highlight.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns highlighted code in HTML form.
+	 */
+	getCodeLinesHtml: function(html, lineNumbers)
+	{
+		html = trim(html);
+		
+		var lines = splitLines(html),
+			padLength = this.getParam('pad-line-numbers'),
+			firstLine = parseInt(this.getParam('first-line')),
+			html = '',
+			brushName = this.getParam('brush')
+			;
+
+		for (var i = 0; i < lines.length; i++)
+		{
+			var line = lines[i],
+				indent = /^(&nbsp;|\s)+/.exec(line),
+				spaces = null,
+				lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i;
+				;
+
+			if (indent != null)
+			{
+				spaces = indent[0].toString();
+				line = line.substr(spaces.length);
+				spaces = spaces.replace(' ', sh.config.space);
+			}
+
+			line = trim(line);
+			
+			if (line.length == 0)
+				line = sh.config.space;
+			
+			html += this.getLineHtml(
+				i,
+				lineNumber, 
+				(spaces != null ? '<code class="' + brushName + ' spaces">' + spaces + '</code>' : '') + line
+			);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Returns HTML for the table title or empty string if title is null.
+	 */
+	getTitleHtml: function(title)
+	{
+		return title ? '<caption>' + title + '</caption>' : '';
+	},
+	
+	/**
+	 * Finds all matches in the source code.
+	 * @param {String} code		Source code to process matches in.
+	 * @param {Array} matches	Discovered regex matches.
+	 * @return {String} Returns formatted HTML with processed mathes.
+	 */
+	getMatchesHtml: function(code, matches)
+	{
+		var pos = 0, 
+			result = '',
+			brushName = this.getParam('brush', '')
+			;
+		
+		function getBrushNameCss(match)
+		{
+			var result = match ? (match.brushName || brushName) : brushName;
+			return result ? result + ' ' : '';
+		};
+		
+		// Finally, go through the final list of matches and pull the all
+		// together adding everything in between that isn't a match.
+		for (var i = 0; i < matches.length; i++) 
+		{
+			var match = matches[i],
+				matchBrushName
+				;
+			
+			if (match === null || match.length === 0) 
+				continue;
+			
+			matchBrushName = getBrushNameCss(match);
+			
+			result += wrapLinesWithCode(code.substr(pos, match.index - pos), matchBrushName + 'plain')
+					+ wrapLinesWithCode(match.value, matchBrushName + match.css)
+					;
+
+			pos = match.index + match.length + (match.offset || 0);
+		}
+
+		// don't forget to add whatever's remaining in the string
+		result += wrapLinesWithCode(code.substr(pos), getBrushNameCss() + 'plain');
+
+		return result;
+	},
+	
+	/**
+	 * Generates HTML markup for the whole syntax highlighter.
+	 * @param {String} code Source code.
+	 * @return {String} Returns HTML markup.
+	 */
+	getHtml: function(code)
+	{
+		var html = '',
+			classes = [ 'syntaxhighlighter' ],
+			tabSize,
+			matches,
+			lineNumbers
+			;
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+
+		className = 'syntaxhighlighter';
+
+		if (this.getParam('collapse') == true)
+			classes.push('collapsed');
+		
+		if ((gutter = this.getParam('gutter')) == false)
+			classes.push('nogutter');
+
+		// add custom user style name
+		classes.push(this.getParam('class-name'));
+
+		// add brush alias to the class name for custom CSS
+		classes.push(this.getParam('brush'));
+
+		code = trimFirstAndLastLines(code)
+			.replace(/\r/g, ' ') // IE lets these buggers through
+			;
+
+		tabSize = this.getParam('tab-size');
+
+		// replace tabs with spaces
+		code = this.getParam('smart-tabs') == true
+			? processSmartTabs(code, tabSize)
+			: processTabs(code, tabSize)
+			;
+
+		// unindent code by the common indentation
+		code = unindent(code);
+
+		if (gutter)
+			lineNumbers = this.figureOutLineNumbers(code);
+		
+		// find matches in the code using brushes regex list
+		matches = this.findMatches(this.regexList, code);
+		// processes found matches into the html
+		html = this.getMatchesHtml(code, matches);
+		// finally, split all lines so that they wrap well
+		html = this.getCodeLinesHtml(html, lineNumbers);
+
+		// finally, process the links
+		if (this.getParam('auto-links'))
+			html = processUrls(html);
+		
+		if (typeof(navigator) != 'undefined' && navigator.userAgent && navigator.userAgent.match(/MSIE/))
+			classes.push('ie');
+		
+		html = 
+			'<div id="' + getHighlighterId(this.id) + '" class="' + classes.join(' ') + '">'
+				+ (this.getParam('toolbar') ? sh.toolbar.getHtml(this) : '')
+				+ '<table border="0" cellpadding="0" cellspacing="0">'
+					+ this.getTitleHtml(this.getParam('title'))
+					+ '<tbody>'
+						+ '<tr>'
+							+ (gutter ? '<td class="gutter">' + this.getLineNumbersHtml(code) + '</td>' : '')
+							+ '<td class="code">'
+								+ '<div class="container">'
+									+ html
+								+ '</div>'
+							+ '</td>'
+						+ '</tr>'
+					+ '</tbody>'
+				+ '</table>'
+			+ '</div>'
+			;
+			
+		return html;
+	},
+	
+	/**
+	 * Highlights the code and returns complete HTML.
+	 * @param {String} code     Code to highlight.
+	 * @return {Element}        Returns container DIV element with all markup.
+	 */
+	getDiv: function(code)
+	{
+		if (code === null) 
+			code = '';
+		
+		this.code = code;
+
+		var div = this.create('div');
+
+		// create main HTML
+		div.innerHTML = this.getHtml(code);
+		
+		// set up click handlers
+		if (this.getParam('toolbar'))
+			attachEvent(findElement(div, '.toolbar'), 'click', sh.toolbar.handler);
+		
+		if (this.getParam('quick-code'))
+			attachEvent(findElement(div, '.code'), 'dblclick', quickCodeHandler);
+		
+		return div;
+	},
+	
+	/**
+	 * Initializes the highlighter/brush.
+	 *
+	 * Constructor isn't used for initialization so that nothing executes during necessary
+	 * `new SyntaxHighlighter.Highlighter()` call when setting up brush inheritence.
+	 *
+	 * @param {Hash} params Highlighter parameters.
+	 */
+	init: function(params)
+	{
+		this.id = guid();
+		
+		// register this instance in the highlighters list
+		storeHighlighter(this);
+		
+		// local params take precedence over defaults
+		this.params = merge(sh.defaults, params || {})
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+	},
+	
+	/**
+	 * Converts space separated list of keywords into a regular expression string.
+	 * @param {String} str    Space separated keywords.
+	 * @return {String}       Returns regular expression string.
+	 */
+	getKeywords: function(str)
+	{
+		str = str
+			.replace(/^\s+|\s+$/g, '')
+			.replace(/\s+/g, '|')
+			;
+		
+		return '\\b(?:' + str + ')\\b';
+	},
+	
+	/**
+	 * Makes a brush compatible with the `html-script` functionality.
+	 * @param {Object} regexGroup Object containing `left` and `right` regular expressions.
+	 */
+	forHtmlScript: function(regexGroup)
+	{
+		this.htmlScript = {
+			left : { regex: regexGroup.left, css: 'script' },
+			right : { regex: regexGroup.right, css: 'script' },
+			code : new XRegExp(
+				"(?<left>" + regexGroup.left.source + ")" +
+				"(?<code>.*?)" +
+				"(?<right>" + regexGroup.right.source + ")",
+				"sgi"
+				)
+		};
+	}
+}; // end of Highlighter
+
+return sh;
+}(); // end of anonymous function
+
+// CommonJS
+typeof(exports) != 'undefined' ? exports['SyntaxHighlighter'] = SyntaxHighlighter : null;
+</script><script type="text/javascript">// (inc clojure-brush) ;; an improved SyntaxHighlighter brush for clojure
+//
+// Copyright (C) 2011 Andrew Brehaut
+//
+// Distributed under the Eclipse Public License, the same as Clojure.
+//
+// https://github.com/brehaut/inc-clojure-brush
+//
+// Written by Andrew Brehaut
+// V0.9.1, November 2011
+
+if (typeof net == "undefined") net = {};
+if (!(net.brehaut)) net.brehaut = {};
+
+net.brehaut.ClojureTools = (function (SH) {
+  "use strict";
+  // utiliies
+  if (!Object.create) Object.create = function object(o) {
+    function F() {};
+    F.prototype = o;  
+    return new F();
+  };
+        
+  // data
+  
+  function Token(value, index, tag, length) {
+    this.value = value;
+    this.index = index;
+    this.length = length || value.length;
+    this.tag = tag;
+    this.secondary_tags = {};
+  }
+  
+  // null_token exists so that LispNodes that have not had a closing tag attached
+  // can have a dummy token to simplify annotation
+  var null_token = new Token("", -1, "null", -1);
+  
+  /* LispNodes are aggregate nodes for sexpressions. 
+   *
+   */
+  function LispNode(tag, children, opening) {
+    this.tag = tag;            // current metadata for syntax inference
+    this.parent = null;        // the parent expression
+    this.list = children;      // all the child forms in order
+    this.opening = opening;    // the token that opens this form.
+    this.closing = null_token; // the token that closes this form.
+    this.meta = null;          // metadata nodes will be attached here if they are found
+  }
+
+  var null_lispnode = new LispNode("null", [], null_token);
+
+  
+  function PrefixNode(tag, token, attached_node) {
+    this.tag = tag;
+    this.token = token;
+    this.attached_node = attached_node;
+    this.parent = null;
+  }
+
+  
+  
+  // tokenize
+
+  function tokenize(code) {
+    var tokens = [];
+    var tn = 0;
+    
+    var zero = "0".charCodeAt(0);
+    var nine = "9".charCodeAt(0); 
+    var lower_a = "a".charCodeAt(0);
+    var lower_f = "f".charCodeAt(0);    
+    var upper_a = "A".charCodeAt(0);
+    var upper_f = "F".charCodeAt(0);
+    
+    var dispatch = false; // have we just seen a # character?
+    
+    // i tracks the start of the current window
+    // extent is the window for slicing
+    
+    for (var i = 0, 
+             extent = i, 
+             j = code.length; 
+             i < j && extent <= j;) {          
+                
+      var c = code[i];
+      
+      // we care about capturing the whole token when dispatch is used, so back up the
+      // starting index by 1
+      if (dispatch) i--; 
+      
+      switch (c) {
+        // dispatch alters the value of the next thing read
+        case "#":
+          dispatch = true;
+          i++;
+          extent++;
+          continue;
+          
+        case " ":    // ignore whitespace
+        case "\t":
+        case "\n":
+        case "\r":
+        case ",":   
+          extent++
+          break; 
+          
+        // simple terms
+        case "^":
+        case "`":
+        case ")":
+        case "[":
+        case "]":
+        case "}":
+        case "@":
+          tokens[tn++] = new Token(c, i, c, ++extent - i);
+          break;
+        
+        case "'":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#'" : "'", extent - i);
+          break
+        
+        case "(":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "(", extent - i);
+          break;          
+          
+        case "{":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#{" : "{", extent - i);
+          break;  
+        
+        case "\\":
+          if (code.slice(i + 1, i + 8) === "newline") {
+            tokens[tn++] = new Token("\\newline", i, "value", 8);
+            extent = i + 9; 
+          }
+          else if (code.slice(i + 1, i + 6) === "space") {
+            tokens[tn++] = new Token("\\space", i, "value", 6);
+            extent = i + 6;
+          }
+          else if (code.slice(i + 1, i + 4) === "tab") {
+            tokens[tn++] = new Token("\\tab", i, "value", 4);
+            extent = i + 5;
+          } // work around fun bug with &,>,< in character literals
+          else if (code.slice(i + 1, i + 6) === "&amp;") {
+            tokens[tn++] = new Token("\\&amp;", i, "value", 6);
+            extent = i + 6; 
+          }
+          else if (code.slice(i + 1, i + 5) === "&lt;") {
+            tokens[tn++] = new Token("\\&lt;", i, "value", 5);
+            extent = i + 5;
+          }
+          else if (code.slice(i + 1, i + 5) === "&gt;") {
+            tokens[tn++] = new Token("\\&gt;", i, "value", 5);
+            extent = i + 5;
+          }
+          
+          else {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", 2);
+          }
+          break;
+        
+        case "~": // slice
+          if (code[i + 1] === "@") {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "splice", 2);
+          }
+          else {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "unquote", 2);
+          }
+          break;
+        
+        // complicated terms
+        case "\"": // strings and regexps
+          for (extent++; extent <= j; extent++) {
+            if (code[extent] === "\\") extent++;
+            else if (code[extent] === "\"") break;
+          }
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "regexp" : "string", extent - i);       
+          break;
+          
+        case ";":
+          for (; extent <= j && code[extent] !== "\n" && code[extent] !== "\r"; extent++);
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "comments", extent - i);   
+          break;
+        
+        case "+": // numbers; fall through to symbol for + and - not prefixing a number
+        case "-":
+        case "0":
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+        case "5":
+        case "6":
+        case "7":
+        case "8":
+        case "9":
+        // todo: exponents, hex
+        // http://my.safaribooksonline.com/9781449310387/14?reader=pf&readerfullscreen=&readerleftmenu=1
+          var c2 = code.charCodeAt(i + 1);
+          if (((c === "+" || c === "-") && (c2 >= zero && c2 <= nine)) // prefixes
+              || (c !== "+" && c !== "-")) {
+            if (c === "+" || c === "-") extent++; 
+            for (; extent <= j; extent++) {
+              var charCode = code.charCodeAt(extent);
+              if (charCode < zero || charCode > nine) break;
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "r" || c === "R" || c === "/" || c === ".") // interstitial characters
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "x" || c === "X") && 
+                ((c2 >= zero && c2 <= nine) 
+                 || (c2 >= lower_a && c2 <= lower_f)
+                 || (c2 >= upper_a && c2 <= upper_f))) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (((charCode >= zero && charCode <= nine) 
+                    || (charCode >= lower_a && charCode <= lower_f)
+                    || (charCode >= upper_a && charCode <= upper_f))) continue;
+                break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "e" || c === "E") 
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            if (c === "N" || c === "M") extent++;
+
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", extent - i);
+            break;
+          }
+
+        case "_":
+          if (dispatch && c === "_") {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "skip", extent - i);
+            break;
+          } // if not a skip, fall through to symbols
+        
+        // Allow just about any other symbol as a symbol. This is far more permissive than 
+        // clojure actually allows, but should catch any weirdo crap that accidentally gets
+        // into the code.
+        default: 
+          for (extent++; extent <= j; extent++) {
+            switch (code[extent]) {
+              case " ":
+              case "\t":
+              case "\n":
+              case "\r":
+              case "\\":
+              case ",":
+              case "{":
+              case "}":
+              case "(":
+              case ")":
+              case "[":
+              case "]":
+              case "^":
+              case "`":
+              case "@":   
+                break;
+              case ";":   
+                // theres a weird bug via syntax highligher that gives us escaped entities.
+                // need to watch out for these
+                if (code.slice(extent-3, extent+1) === "&lt;"
+                    ||code.slice(extent-3, extent+1) === "&gt;"
+                    ||code.slice(extent-4, extent+1) === "&amp;") {
+                  continue;
+                }
+                break;
+              default:
+                continue;
+            }
+            break;
+          }
+          
+          var value = code.slice(i, extent);
+          var tag = "symbol";
+          if (value[0] == ":") {
+            tag = "keyword";
+          }
+          else if (value === "true" || value === "false" || value === "nil") {
+            tag = "value";
+          }
+          tokens[tn++] = new Token(value, i, tag, extent - i);
+      }
+      
+      dispatch = false;
+      i = extent;
+    } 
+
+    return tokens;
+  }
+
+
+  function build_tree(tokens) {
+    var toplevel = {
+      list: [], 
+      tag: "toplevel", 
+      parent: null, 
+      opening: null,
+      closing: null,
+      depth: -1
+    };
+    
+    // loop variables hoisted out as semi globals to track position in token stream
+    var i = -1;
+    var j = tokens.length;
+    
+    function parse_one(t) {
+      // ignore special tokens and forms that dont belong in the tree
+      for (; t && (t.tag === "comments" || t.tag === "invalid" || t.tag == "skip") && i < j; ) {
+        if (t.tag === "skip") {
+          t.tag = "preprocessor";
+          annotate_comment(parse_one(tokens[++i]));
+        }
+        t = tokens[++i];
+      }
+      
+      if (!t) return {}; // hackity hack
+      
+      switch (t.tag) {
+        case "{":
+          return build_aggregate(new LispNode("map", [], t), "}");
+        case "(":
+          return build_aggregate(new LispNode("list", [], t), ")");
+        case "#{":
+          return build_aggregate(new LispNode("set", [], t), "}");
+        case "[":
+          return build_aggregate(new LispNode("vector", [], t), "]");
+        case "'":
+          return new PrefixNode("quote", t, parse_one(tokens[++i]));
+        case "#'":
+          return new PrefixNode("varquote", t, parse_one(tokens[++i]));  
+        case "@":
+          return new PrefixNode("deref", t, parse_one(tokens[++i]));  
+        case "`":
+          return new PrefixNode("quasiquote", t, parse_one(tokens[++i]));  
+        case "unquote":
+          return new PrefixNode("unquote", t, parse_one(tokens[++i]));
+        case "splice":
+          return new PrefixNode("splice", t, parse_one(tokens[++i]));  
+        case "^":
+          t.tag = "meta";
+          var meta = parse_one(tokens[++i]);
+          var next = parse_one(tokens[++i]);
+          next.meta = meta;
+          return next;
+      }
+      
+      return t;
+    }
+    
+    // build_aggregate collects to ether sub forms for one aggregate for. 
+    function build_aggregate(current, expected_closing) {
+      for (i++; i < j; i++) {
+        var t = tokens[i];
+
+        if (t.tag === "}" || t.tag === ")" || t.tag === "]") {
+          if (t.tag !== expected_closing) t.tag = "invalid";
+          current.closing = t;
+          if (expected_closing) return current;
+        }
+        var node = parse_one(t);
+
+        node.parent = current;
+        current.list[current.list.length] = node;
+      }
+      
+      return current;
+    }
+    
+    build_aggregate(toplevel, null);
+    
+    return toplevel;
+  }
+
+  // annotation rules to apply to a form based on its head
+
+  var show_locals = true;  // HACK. would rather not use a (semi)-global.
+
+  /* annotate_comment is a special case annotation. 
+   * in addition to its role in styling specific forms, it is called by parse_one to
+   * ignore any forms skipped with #_
+   */ 
+  function annotate_comment(exp) {
+    exp.tag = "comments";
+
+    if (exp.list) {
+      exp.opening.tag = "comments";
+      exp.closing.tag = "comments";
+    
+      for (var i = 0; i < exp.list.length; i++) {
+        var child = exp.list[i];
+        if (child.list) {
+          annotate_comment(child);
+        }
+        if (child.attached_node) {
+          annotate_comment(child.attached_node);
+        }
+        else {
+          child.tag = "comments";
+        }
+      }
+    }
+  }
+
+  /* custom annotation rules are stored here */
+  var annotation_rules = {};
+  
+  // this function is exposed to allow ad hoc extension of the customisation rules
+  function register_annotation_rule(names, rule) {
+    for (var i = 0; i < names.length; i++) {
+      annotation_rules[names[i]] = rule;
+    }
+  }
+
+
+  function annotate_destructuring (exp, scope) {
+    if (exp.list) {
+      if (exp.tag === "vector") {
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_destructuring(exp.list[i], scope);
+        }
+      } 
+      else if (exp.tag === "map") {
+        for (var i = 0; i < exp.list.length; i += 2) {
+          var key = exp.list[i];
+          var val = exp.list[i + 1];
+          
+          if (key.tag === "keyword" && val.tag === "vector") {
+            for (var ii = 0, jj = val.list.length; ii < jj; ii++) {
+              if (val.list[ii].tag !== "symbol") continue;
+              val.list[ii].tag = "variable";
+              scope[val.list[ii].value] = true;
+            }
+          }
+          else {
+            annotate_destructuring(key, scope);
+            annotate_expressions(val, scope);
+          }
+        } 
+      }
+    } 
+    else if (exp.tag === "symbol" && (exp.value !== "&" && exp.value !== "&amp;")){
+      exp.tag = "variable";
+      scope[exp.value] = true;
+    }
+  }
+
+  function _annotate_binding_vector (exp, scope) {
+    if (exp.tag !== "vector") return;
+  
+    var bindings = exp.list;
+
+    if (bindings.length % 2 === 1) return;
+    
+    for (var i = 0; i < bindings.length; i += 2) {
+      annotate_destructuring(bindings[i], scope);
+      annotate_expressions(bindings[i + 1], scope);
+    }    
+  }
+
+  function annotate_binding (exp, scope) {
+    var bindings = exp.list[1];
+    if (!show_locals) return; // HACK
+
+    if (bindings) {
+      scope = Object.create(scope);
+      _annotate_binding_vector(bindings, scope);
+    }
+    for (var i = 2; i < exp.list.length; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function _annotate_function_body (exp, scope, start_idx) {
+    var argvec = exp.list[start_idx];
+    if (argvec.tag !== "vector") return;
+
+    scope = Object.create(scope);
+
+    for (var i = 0, j = argvec.list.length; i < j; i++) {
+      annotate_destructuring(argvec.list[i], scope);
+    }
+    
+    for (var i = start_idx, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function annotate_function (exp, scope) {
+    for (var i = 1, j = exp.list.length; i < j; i++) {
+      var child = exp.list[i];
+      
+      if (child.tag === "vector") {
+        _annotate_function_body (exp, scope, i);
+        return;
+      }
+      else if (child.tag === "list") {
+        _annotate_function_body(child, scope, 0)
+      }
+    }
+  }
+  
+  function annotate_letfn (exp, scope) {
+    scope = Object.create(scope);
+    var bindings = exp.list[1];
+    
+    var fn;
+    for (var i = 0, j = bindings.list.length; i < j; i++) {
+      fn = bindings.list[i];
+      if (!fn.list[0]) continue;
+      fn.list[0].tag = "variable";
+      scope[fn.list[0].value] = true;
+    }
+    
+    for (i = 0, j = bindings.list.length; i < j; i++) {
+      var fn = bindings.list[i];
+      annotate_function(fn, scope);
+    }
+    
+    for (i = 2, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+
+  register_annotation_rule(
+    ["comment"],
+    annotate_comment
+  );
+  
+  register_annotation_rule(
+    ["let", "when-let", "if-let", "binding", "doseq", "for", "dotimes", "let*"],
+    annotate_binding
+  );
+  
+  register_annotation_rule(
+    ["defn", "defn-", "fn", "bound-fn", "defmacro", "fn*", "defmethod"],
+    annotate_function
+  );
+  
+  register_annotation_rule(
+    ["letfn"],
+    annotate_letfn
+  );
+
+  // standard annotations
+
+  function _annotate_metadata_recursive(meta, scope) {
+    if (!meta) return;
+
+    if (meta.list !== undefined && meta.list !== null) {
+      for (var i = 0, j = meta.list.length; i < j; i++) {
+        meta.opening.secondary_tags.meta = true
+        meta.closing.secondary_tags.meta = true
+        _annotate_metadata_recursive(meta.list[i], scope);
+      }
+    }
+    else if (meta.attached_node) {
+      meta.token.secondary_tags.meta = true;
+      _annotate_metadata_recursive(meta.attached_node, scope);
+    }
+    else {
+      meta.secondary_tags.meta = true;
+    }
+  }
+  
+  function annotate_metadata(exp) {
+    if (!(exp && exp.meta)) return;
+    var meta = exp.meta;
+    
+     annotate_expressions(meta, {});    
+    _annotate_metadata_recursive(meta, {});
+  }
+
+
+  function annotate_quoted(exp, scope) {
+    if (!exp) return;
+
+    if (exp.list !== undefined && exp.list !== null) {
+      for (var i = 0, j = exp.list.length; i < j; i++) {
+        exp.opening.secondary_tags.quoted = true
+        exp.closing.secondary_tags.quoted = true
+        annotate_quoted(exp.list[i], scope);
+      }
+    }
+    else if (exp.attached_node) {
+      if (exp.tag === "unquote" || exp.tag === "splice") return;
+      exp.token.secondary_tags.quoted = true;
+      annotate_quoted(exp.attached_node, scope);
+    }
+    else {
+      exp.secondary_tags.quoted = true;
+    }
+  }
+
+
+  function annotate_expressions(exp, scope) {
+    annotate_metadata(exp);
+    
+    switch (exp.tag) {
+      case "toplevel": 
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "list": // functions, macros, special forms, comments
+        var head = exp.list[0];
+      
+        if (head) {
+          if (head.tag === "list" || head.tag === "vector" 
+           || head.tag === "map" || head.tag === "set") {
+            annotate_expressions(head, scope);
+          }
+          else if (head.attached_node) {
+            annotate_expressions(head.attached_node, scope);
+          }
+          else {
+            head.tag = (head.value.match(/(^\.)|(\.$)|[A-Z].*\//)
+                        ? "method"
+                        : "function");
+          }
+
+          // apply specific rules
+          if (annotation_rules.hasOwnProperty(head.value)) {
+            annotation_rules[head.value](exp, scope);
+          } 
+          else {
+            for (var i = 1; i < exp.list.length; i++) {
+              annotate_expressions(exp.list[i], scope);
+            }
+          } 
+        }
+        else { // empty list
+          exp.opening.tag = "value";
+          exp.closing.tag = "value";
+        }
+      
+        break;
+      
+      case "vector": // data
+      case "map":
+      case "set":
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "symbol":
+        if (exp.value.match(/[A-Z].*\/[A-Z_]+/)) {
+          exp.tag = "constant";
+        }
+        else if (show_locals && scope[exp.value]) {
+          exp.tag = "variable";
+        }
+        else if (exp.tag === "symbol" && exp.value.match(/([A-Z].*\/)?[A-Z_]+/)) {
+          exp.tag = "type";
+        }
+        break;
+      
+      case "quote":
+      case "quasiquote":
+        annotate_quoted(exp.attached_node, scope);
+        
+      default:
+        if (exp.attached_node) annotate_expressions(exp.attached_node, scope);
+    }
+  }
+
+  // translation of tag to css:
+  var css_translation = {
+    "constant":     "constants",
+    "keyword":      "constants",
+    "method":       "color1",
+    "type":         "color3", 
+    "function":     "functions",
+    "string":       "string",
+    "regexp":       "string",
+    "value":        "value",
+    "comments":     "comments",
+    "symbol":       "symbol",
+    "variable":     "variable",
+    "splice":       "preprocessor", 
+    "unquote":      "preprocessor",     
+    "preprocessor": "preprocessor",
+    "meta":         "preprocessor", 
+    "'":            "preprocessor", 
+    "#'":           "preprocessor",    
+    "(":            "plain",
+    ")":            "plain",
+    "{":            "keyword",
+    "}":            "keyword",
+    "#{":           "keyword",   
+    "[":            "keyword",
+    "]":            "keyword",
+    "invalid":      "invalid",
+    "@":            "plain" 
+  };
+  
+  function translate_tags_to_css(tokens) {
+    for (var i = 0, j = tokens.length; i < j; i++) {
+      var token = tokens[i];
+      token.css = css_translation[token.tag];
+      for (var k in token.secondary_tags) if (token.secondary_tags.hasOwnProperty(k))
+        token.css += " " + k ;
+    };
+  }
+  
+  
+  // create the new brush
+
+  SH.brushes.Clojure = function () {};
+  SH.brushes.Clojure.prototype = new SyntaxHighlighter.Highlighter();
+  
+  SH.brushes.Clojure.prototype.findMatches = function find_matches (regexpList, code) {
+    // this is a nasty global hack. need to resolve this
+    if (this.params && this.params.locals) {
+      show_locals = this.params.locals === true || this.params.locals === "true"; 
+    }
+    else {
+      show_locals = true;
+    }
+    
+    var tokens = tokenize(code);
+    annotate_expressions(build_tree(tokens), {});
+    translate_tags_to_css(tokens);
+
+    return tokens;
+  };
+  
+  SH.brushes.Clojure.aliases = ['clojure', 'Clojure', 'clj'];
+  SH.brushes.Clojure.register_annotation_rule = register_annotation_rule;
+
+  return {
+    tokenize: tokenize,
+    build_tree: build_tree
+  };
+})(SyntaxHighlighter);
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.0-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.schema">protobuf.schema</a></li><li><a href="#protobuf.codec">protobuf.codec</a></li><li><a href="#protobuf.core">protobuf.core</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
+  (:import
+    (clojure.lang IDeref
+                  ISeq
+                  IPersistentMap
+                  IPersistentSet
+                  IPersistentCollection))
+  (:refer-clojure :exclude [update]))</pre></td></tr><tr><td class="docs"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn as-fn
+  [x]
+  (if (ifn? x) x, (constantly x)))</pre></td></tr><tr><td class="docs"><p>Update the given set using an existence map.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn into-set
+  [set map]
+  (if (map? map)
+    (reduce (fn [set [k v]] ((if v conj disj) set k))
+            set map)
+    (into set map)))</pre></td></tr><tr><td class="docs"><p>Walk through clauses, a series of predicate/transform pairs. The
+  first predicate that x satisfies has its transformation clause
+  called on x. Predicates or transforms may be values (eg true or nil)
+  rather than functions; these will be treated as functions that
+  return that value.
+  The last "pair" may be only a transform with no pred: in that case it
+  is unconditionally used to transform x, if nothing previously matched.
+  If no predicate matches, then x is returned unchanged.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn fix
+  [x &amp; clauses]
+  (let [call #((as-fn %) x)]
+    (first (or (seq (for [[pred &amp; [transform :as exists?]] (partition-all 2 clauses)
+                          :let [[pred transform] ;; handle odd number of clauses
+                                (if exists? [pred transform] [true pred])]
+                          :when (call pred)]
+                      (call transform)))
+               [x]))))</pre></td></tr><tr><td class="docs"><p>A "curried" version of fix, which sets the clauses once, yielding a
+  function that calls fix with the specified first argument.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn to-fix
+  [&amp; clauses]
+  (fn [x]
+    (apply fix x clauses)))</pre></td></tr><tr><td class="docs"><p>A macro combining the features of fix and fixing, by using parentheses to group the
+   additional arguments to each clause:
+   (-> x
+       (given string? read-string
+              map? (dissoc :x :y :z)
+              even? (/ 2)))</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro given
+  [x &amp; clauses]
+  (let [[clauses default] (if (even? (count clauses))
+                            [clauses `identity]
+                            [(butlast clauses) (last clauses)])]
+    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
+                     arg [pred `#(-&gt; % ~transform)]]
+                 arg)
+          ~default)))</pre></td></tr><tr><td class="docs"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
+  flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro map-entry
+  [a b]
+  `(clojure.lang.MapEntry. ~a ~b))</pre></td></tr><tr><td class="docs"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
+  function that will take the old value and any supplied args and return the new value, and returns
+  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
+  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
+  values are not re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update-in*
+  [m keys f &amp; args]
+  (if-let [[k &amp; ks] (seq keys)]
+    (let [old (get m k)
+          new (apply update-in* old ks f args)]
+      (if (identical? old new)
+        m
+        (assoc m k new)))
+     (apply f m args)))</pre></td></tr><tr><td class="docs"><p>Update a value for the given key in a map where f is a function that takes the previous value and
+  the supplied args and returns the new value. Like update-in*, unchanged values are not
+  re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update
+  [m key f &amp; args]
+  (apply update-in* m [key] f args))</pre></td></tr><tr><td class="docs"><p>Create a new map from m by calling function f on each value to get a new value.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn map-vals
+  [m f &amp; args]
+  (when m
+    (into {}
+          (for [[k v] m]
+            (map-entry k (apply f v args))))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol Combiner
+  (combine-onto [left right]
+  &quot;Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.&quot;))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol Combiner
+  IPersistentMap
+  (combine-onto [this other]
+    (merge-with combine-onto this other))
+
+  IPersistentSet
+  (combine-onto [this other]
+    (into-set this other))
+
+  ISeq
+  (combine-onto [this other]
+    (concat this other))
+
+  IPersistentCollection
+  (combine-onto [this other]
+    (into this other))
+
+  Object
+  (combine-onto [this other]
+    other)
+
+  nil
+  (combine-onto [this other]
+    other))</pre></td></tr><tr><td class="docs"><p>Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn combine
+  [a b]
+  (combine-onto a b))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn catbytes
+  [&amp; args]
+  (let [out-buf (byte-array (loop [len 0, args (seq args)]
+                              (if-let [[arg &amp; args] args]
+                                (recur (+ len (alength ^bytes arg)) args)
+                                len)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array &amp; more] (seq args)]
+        (let [size (alength array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))</pre></td></tr><tr><td class="docs"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn walk
+  [inner outer schema]
+  (outer
+   (case (:type schema)
+     :struct           (update schema :fields map-vals inner)
+     (:set :list :map) (-&gt; schema
+                           (given :values (update :values inner))
+                           (given :keys   (update :keys   inner)))
+     schema)))</pre></td></tr><tr><td class="docs"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each
+  and type with the result of calling f on it.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn postwalk
+  [f schema]
+  (walk (partial postwalk f) f schema))</pre></td></tr><tr><td class="docs"><p>Like postwalk, but do a pre-order traversal.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn prewalk
+  [f schema]
+  (walk (partial prewalk f) identity (f schema)))</pre></td></tr><tr><td class="docs"><p>Traverse the given schema, removing the given fields at any level.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn dissoc-fields
+  [schema &amp; fields]
+  (prewalk (to-fix #(= :struct (:type %))
+                   #(apply update % :fields dissoc fields))
+           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.schema" name="protobuf.schema"><h1 class="project-name">protobuf.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.schema
+  (:require
+    [clojure.string :as string]
+    [protobuf.util :as util])
+  (:import
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def )
+    (com.google.protobuf Descriptors$Descriptor
+                         Descriptors$FieldDescriptor
+                         Descriptors$FieldDescriptor$Type)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn extension
+  [ext ^Descriptors$FieldDescriptor field]
+  (-&gt; (.getOptions field)
+      (.getExtension ext)
+      (util/fix string? not-empty)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn field-type
+  [field]
+  (condp instance? field
+    Descriptors$FieldDescriptor
+    (if (.isRepeated ^Descriptors$FieldDescriptor field)
+      (condp extension field
+        (Extensions/counter)    :counter
+        (Extensions/succession) :succession
+        (Extensions/map)        :map
+        (Extensions/mapBy)      :map-by
+        (Extensions/set)        :set
+        :list)
+      :basic)
+    Descriptors$Descriptor
+    :struct))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmulti field-schema
+  (fn [field _ &amp; _] (field-type field)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn struct-schema
+  [^Descriptors$Descriptor struct
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [struct-name (.getFullName struct)]
+    (into {:type :struct
+           :name struct-name}
+          (when (not-any? (partial = struct-name) parents)
+            {:fields (into {}
+                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
+                             [(.intern map-def (.getName field))
+                              (field-schema field map-def (conj parents struct-name))]))}))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn basic-schema
+  [^Descriptors$FieldDescriptor field
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
+        meta-string (extension (Extensions/meta) field)]
+    (merge (case java-type
+             :message (struct-schema (.getMessageType field) map-def parents)
+             :enum    {:type   :enum
+                       :values (set (map #(.clojureEnumValue map-def %)
+                                         (.. field getEnumType getValues)))}
+             {:type java-type})
+           (when (.hasDefaultValue field)
+             {:default (.getDefaultValue field)})
+           (when meta-string
+             (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn subfield
+  [^Descriptors$FieldDescriptor field field-name]
+  (.findFieldByName (.getMessageType field) (name field-name)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :basic
+  [field map-def &amp; [parents]]
+  (basic-schema field map-def parents))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :list
+  [field map-def &amp; [parents]]
+  {:type   :list
+   :values (basic-schema field map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :succession
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :succession true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :counter
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :counter true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :set
+  [field map-def &amp; [parents]]
+  {:type   :set
+   :values (field-schema (subfield field :item) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map
+  [field map-def &amp; [parents]]
+  {:type   :map
+   :keys   (field-schema (subfield field :key) map-def parents)
+   :values (field-schema (subfield field :val) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map-by
+  [field map-def &amp; [parents]]
+  (let [map-by (extension (Extensions/mapBy) field)]
+    {:type   :map
+     :keys   (field-schema (subfield field map-by) map-def parents)
+     :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
+  [field map-def &amp; [parents]]
+  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.codec" name="protobuf.codec"><h1 class="project-name">protobuf.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.codec
+  (:require
+    [clojure.java.io :as io]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [gloss.core :as gloss]
+    [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.core :as protobuf]
+    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
+  [proto]
+  (let [proto (protobuf/mapdef proto)
+        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
+        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format &quot;In %s: %s %s&quot;
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             &quot;field is required for repeated protobufs&quot;)
+      (check (= min max)
+             &quot;must be of type fixed32 or fixed64&quot;))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
+                         #(hash-map len-key %)
+                         len-key)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [proto &amp; {:keys [validator repeated]}]
+  (let [proto (protobuf/mapdef proto)]
+    (-&gt; (reify
+          ;; Reader method
+          gloss-protocols/Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException. &quot;Invalid value in #'protobuf.codec/create&quot;)))
+            (gloss-formats/to-buf-seq
+             (protobuf/-&gt;bytes
+              (if (protobuf/map? val)
+                val
+                (protobuf/create proto val))))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
+</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
+  [proto]
+  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
+                      len-key
+                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
+  (:require
+    [clojure.java.io :as io]
+    [protobuf.schema :as protobuf-schema]
+    [protobuf.util :as util])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn map?
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
+  [obj]
+  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (mapdef map-def {})))
+  ([map-def opts]
+     (when map-def
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
+  [&amp; args]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
+
+<p>  Supported data sources are either an array of bytes or an input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmulti parse
+  (fn [map-def data &amp; _]
+    (type data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
+  ([^PersistentProtocolBufferMap$Def map-def data]
+     (when data
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  ([^PersistentProtocolBufferMap p]
+     (.toByteArray p))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (-&gt;bytes (PersistentProtocolBufferMap/construct map-def m))))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
+  from the given input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn read
+  [^PersistentProtocolBufferMap$Def map-def in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (io/input-stream in)]
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (read map-def in))
+        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn write
+  [out &amp; ps]
+  (io!
+   (let [^OutputStream out (io/output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
+  PersistentProtocolBufferMap
+  (combine-onto [^PersistentProtocolBufferMap this other]
+    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  combine #'util/combine)</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
+
+<p>TODO make this nil-safe? Or just delete it?</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-raw
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf? #'map?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protodef? #'mapdef?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protodef #'mapdef)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf #'create)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-schema #'mapdef-&gt;schema)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-load #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-load-stream #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-dump #'-&gt;bytes)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>read</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-seq #'read)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>write</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-write #'write)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li><li class="floating-toc-li" id="floating-toc_protobuf.schema">protobuf.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.codec">protobuf.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
+SyntaxHighlighter.all();
+
+// hackity hack
+$(window).load(function() {
+    var ft = $("#floating-toc");
+    var ul = ft.find('ul');
+    var lis = ft.find('li');
+    var liHeight = $(lis.first()).height();
+
+    ul.css('margin', '0px');
+    ft.css('height', liHeight + 'px');
+
+    showNs = function(ns) {
+        var index = 0;
+
+        for(i in nsPositions.nss) {
+            if(ns == nsPositions.nss[i]) index = i;
+        }
+
+        if(index != lastNsIndex) {
+            lastNsIndex = index;
+            ul.animate({marginTop: (-1 * liHeight * index) + 'px'},
+               300);
+        }
+
+    }
+
+    var calcNsPositions = function() {
+        var hheight = $('.docs-header').first().height();
+        var nss = [];
+        var anchors = [];
+        var positions = [];
+        $.each(lis, function(i, el) {
+            var ns = $(el).attr('id').split('_')[1];
+            nss.push(ns);
+            var a = $("a[name='"+ns+"']");
+            anchors.push(a);
+            positions.push(a.offset().top - hheight);
+            // console.log(a.offset().top)
+        });
+
+        return {nss: nss, positions: positions};
+    }
+
+    var nsPositions = calcNsPositions();
+    // console.log(nsPositions)
+    var lastNsIndex = -1;
+    var $window = $(window);
+
+    var currentSection = function(nsp) {
+        var ps = nsp.positions;
+        var scroll = $window.scrollTop();
+        var nsIndex = -1;
+
+        for(var i = 0, length = ps.length; i < length; i++) {
+            if(ps[i] >= scroll) {
+                nsIndex = i-1;
+                break;
+            }
+        }
+
+        if(nsIndex == -1) {
+             if(scroll >= ps[0]) {
+                 nsIndex = ps.length - 1;
+             } else {
+                 nsIndex = 0;
+             }
+        }
+
+        return nsp.nss[nsIndex];
+    }
+
+    $(window).scroll(function(e) {
+        showNs(currentSection(nsPositions));
+    });
+});
+</script></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index ecd046c..97a6abc 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index fa59d22..5156368 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index b01b01f..a4f5112 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index 9136f69..49993dc 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From e515305c82e7fdf7e91206cae101fdf15e3b36fa Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 22:06:49 -0600
Subject: [PATCH 426/525] Added a Clojure port of the official Google Java
 tutorial.

---
 resources/docs/1050-tutorial.md   | 462 ++++++++++++++++++++++++++++++
 resources/docs/1100-extensions.md |  12 +-
 2 files changed, 468 insertions(+), 6 deletions(-)
 create mode 100644 resources/docs/1050-tutorial.md

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
new file mode 100644
index 0000000..f704de6
--- /dev/null
+++ b/resources/docs/1050-tutorial.md
@@ -0,0 +1,462 @@
+# Tutorial: Protocol Buffer Basics
+
+*Note: The majority of the content for this tutorial was taken from the
+[official Google protobuf Java tutorial][java-tut], with additions, removals,
+and other changes.*
+
+
+## Introduction
+
+This tutorial provides a basic Clojure programmer's introduction to working with
+protocol buffers. By walking through creating a simple example application, it
+shows you how to:
+
+* Define message formats in a `.proto` file.
+* Use the protocol buffer compiler.
+* Use the Clojure protocol buffer API to write and read messages.
+
+This isn't a comprehensive guide to using protocol buffers in Clojure. For more
+detailed reference information, see:
+
+* the [Protocol Buffer Language Guide][protobuf-guide]
+* the [Clojure API Reference][clojure-api-ref]
+* the [Encoding Reference][enc-ref]
+
+Additionally, you may find these useful:
+
+* the [Java API Reference][java-api-ref]
+* the [Java Generated Code Guide][java-generated]
+
+
+## Why Use Protocol Buffers?
+
+Protocol buffers solve the problem of efficiently serializing and
+deserializing structured data in a language-agnostic manner, accessible a vast
+array of applications (as long as the applications are written in a language
+that has a protobuf library). We'll illustrate this with an example.
+
+The example we're going to use is a very simple "address book" application
+that can read and write people's contact details to and from a file. Each
+person in the address book has a name, an ID, an email address, and a contact
+phone number.
+
+So, how might one serialize and retrieve structured data like this if protobuf
+wasn't around? There are a few ways to solve this problem:
+
+* Use Java Serialization. This is the default approach since it's built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn't work very well if you need to share data with applications written in C++ or Python.
+* You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as "12:3:-23:67". This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.
+* Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.
+
+To avoid the problems mentioned in each of the above (as well as many others),
+protocol buffers was created. They are the flexible, efficient, automated
+solution.
+
+With protocol buffers, you write a `.proto` description of the data structure
+you wish to store. From that, the protocol buffer compiler creates compilable
+source code that implements automatic encoding and parsing of the protocol
+buffer data with an efficient binary format. The generated code provides
+getters and setters for the fields that make up a protocol buffer and takes
+care of the details of reading and writing the protocol buffer as a unit.
+Importantly, the protocol buffer format supports the idea of extending the
+format over time in such a way that the code can still read data encoded with
+the old format.
+
+
+## Defining Your Protocol Format
+
+To create your address book application, you'll need to start with a `.proto`
+file. The definitions in a `.proto` file are simple: you add a message for each
+data structure you want to serialize, then specify a name and a type for each
+field in the message. Here is the `.proto` file that defines your messages,
+`addressbook.proto`:
+
+```proto
+syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+```
+
+(Additionally, this file has been made available for you in the
+`resources/proto/examples` directory of the Clojure protobuf project.)
+
+As you can see, the syntax is similar to C++ or Java. Let's go through each
+part of the file and see what it does.
+
+The `.proto` file starts with a package declaration, which helps to prevent
+naming conflicts between different projects. In Java, the package name is used
+as the Java package unless you have explicitly specified a `java_package`, as
+we have here. Even if you do provide a `java_package`, you should still define
+a normal package as well to avoid name collisions in the Protocol Buffers name
+space as well as in non-Java languages.
+
+<blockquote>
+After the package declaration, you can see two options that are Java-specific.
+Thanks to Clojure's Java inter-op, we can take advantage of this directly,
+without writing our own Clojure protobuf compiler or waiting for Google to
+support Clojure.
+</blockquote>
+
+`java_package` specifies in what Java package name your generated classes
+should live. If you don't specify this explicitly, it simply matches the
+package name given by the package declaration, but these names usually aren't
+appropriate Java package names (since they usually don't start with a domain
+name).
+
+The `java_outer_classname` option defines the class name which should contain
+all of the classes in this file. If you don't give a `java_outer_classname`
+explicitly, it will be generated by converting the file name to camel case.
+For example, `my_proto.proto` would, by default, use `MyProto` as the outer
+class name.
+
+Next, you have your message definitions. A message is just an aggregate
+containing a set of typed fields. Many standard simple data types are
+available as field types, including `bool`, `int32`, `float`, `double`, and
+`string.` You can also add further structure to your messages by using other
+message types as field types – in the above example the `Person` message
+contains `PhoneNumber` messages, while the `AddressBook` message contains
+`Person` messages. You can even define message types nested inside other
+messages – as you can see, the `PhoneNumber` type is defined inside `Person`. You
+can also define `enum` types if you want one of your fields to have one of a
+predefined list of values – here you want to specify that a phone number can
+be one of `MOBILE`, `HOME`, or `WORK`.
+
+The " = 1", " = 2" markers on each element identify the unique "tag" that
+field uses in the binary encoding. Tag numbers 1-15 require one less byte to
+encode than higher numbers, so as an optimization you can decide to use those
+tags for the commonly used or repeated elements, leaving tags 16 and higher
+for less-commonly used optional elements. Each element in a repeated field
+requires re-encoding the tag number, so repeated fields are particularly good
+candidates for this optimization.
+
+Each field must be annotated with one of the following modifiers:
+
+* `required`: a value for the field must be provided, otherwise the message will be considered "uninitialized". Trying to build an uninitialized message will throw a `RuntimeException`. Parsing an uninitialized message will throw an `IOException`. Other than this, a required field behaves exactly like an optional field.
+* `optional`: the field may or may not be set. If an optional field value isn't set, a default value is used. For simple types, you can specify your own default value, as we've done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, `false` for bools. For embedded messages, the default value is always the "default instance" or "prototype" of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field's default value.
+* `repeated`: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.
+
+<blockquote>
+**Required Is Forever**
+
+You should be very careful about marking fields as required. If at some point
+you wish to stop writing or sending a required field, it will be problematic
+to change the field to an optional field – old readers will consider messages
+without this field to be incomplete and may reject or drop them
+unintentionally. You should consider writing application-specific custom
+validation routines for your buffers instead. Some engineers at Google have
+come to the conclusion that using required does more harm than good; they
+prefer to use only optional and repeated. However, this view is not universal.
+</blockquote>
+
+You'll find a complete guide to writing `.proto` files – including all the
+possible field types – in the
+[Protocol Buffer Language Guide][protobuf-guide]. Don't go looking for
+facilities similar to class inheritance, though – protocol buffers don't do
+that.
+
+
+## Compiling Your Protocol Buffers
+
+Now that you have a `.proto`, the next thing you need to do is generate the
+classes you'll need to read and write `AddressBook` (and hence `Person` and
+`PhoneNumber`) messages. To do this, you need to run the protocol buffer
+compiler `protoc` on your `.proto`:
+
+1. If you haven't installed this yet, now is the time. Your operating system's
+   package manager very likely already provides a version for you -- search
+   there first. If not, you can [download it][download] from Google.
+1. Now run the compiler, specifying:
+   * the source directory (where your application's source code lives – the
+     current directory is used if you don't provide a value)
+   * the destination directory (where you want the generated code to go; often
+     the same as $SRC_DIR), and
+   * the path to your `.proto.`
+
+In this case:
+
+```bash
+$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+```
+
+This gives us:
+
+```bash
+$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+```
+
+To have `lein` compile protobuf `.java` source files to `.class` that can be
+used from Clojure, we need to make sure that `lein` knows about our Java
+sources -- with do this with the `:java-source-paths` key in the `project.clj`
+file, either at the top-level or in an appropriate profile.
+
+For example, this is what the Clojure protobuf project has set, using the
+`:test` profile:
+
+```clj
+:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+```
+
+<blockquote>
+Fore convenience, the Clojure protobuf project always compiles the examples
+and the tests before starting up the REPL, so they are always freshly available
+to developers.
+</blockquote>
+
+
+## The Protocol Buffer API
+
+Let's fire up the REPL and see how to use the compiled code from Clojure:
+
+```bash
+$ lein repl
+```
+
+### Setup
+
+First we'll pull in the Clojure API:
+
+```clj
+[protobuf.dev] λ=> (require '[clojure.java.io :as io]
+                            '[protobuf.core :as protobuf])
+nil
+```
+
+Then we'll import the generated Java classes we want to use:
+
+```clj
+[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
+                                                        AddressBookProtos$Person$PhoneNumber
+                                                        AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+```
+
+Note that for nested inner classes, we simply keep using the inner class
+separator `$` of Clojure's Java inter-op.
+
+Next we'll use a Java wrapper that let's us treat these like maps:
+
+```clj
+[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+```
+
+We can view the full, nested data schema in Clojure data:
+
+```clj
+[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+```
+
+<blockquote>
+There's currently a bug/missing feature where the default value of an `enum` is
+not converted to Clojure data. For current status on this issue, see:
+<a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
+</blockquote>
+
+## Message Functions
+
+TBD
+
+## Parsing and Serialization
+
+* `protobuf/parse` - Given an array or stream of bytes, we can parse these
+  to a Clojure protobuf data structure
+* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
+  an array of raw bytes
+
+
+## Creating Messages
+
+The once you have the wrapped objects, the `create` function can generate the
+appropriate protocol buffer message. Here's how to create some `PhoneNumber`
+messages:
+
+```clj
+[protobuf.dev] λ=> (def phones [(protobuf/create PhoneNumber :number "555-1212" :type "HOME")
+                                (protobuf/create PhoneNumber :number "555-1213" :type "MOBILE")
+                                (protobuf/create PhoneNumber :number "555-1214" :type "WORK")])
+#'protobuf.dev/phones
+```
+
+Now we can use these when creating our `Person` message:
+
+```clj
+[protobuf.dev] λ=> (def alice (protobuf/create Person
+                                               :id 108
+                                               :name "Alice"
+                                               :email "alice@example.com"
+                                               :phones phones))
+#'protobuf.dev/alice
+```
+
+And then that can be used when creating (or updating) an `AddressBook` message:
+
+```clj
+[protobuf.dev] λ=> (def addresses (protobuf/create AddressBook :people [alice]))
+#'protobuf.dev/addresses
+```
+
+Let's take a quick look at the result:
+
+```clj
+[protobuf.dev] λ=> (pprint addresses)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+```
+
+
+## Writing a Messages
+
+These can then be written to an output stream:
+
+```clj
+[protobuf.dev] λ=> (protobuf/write "/tmp/address-book.db" addresses)
+nil
+```
+
+Note that the first argument doesn't have to be a string representing a file
+name; it can be anything which `clojure.java.io/output-stream` can coerce to a
+stream (e.g., `OutputStream`, `File`, `URI`, `URL`, `Socket`, or `String`).
+
+Take a look at the contents of `/tmp/address-book.db` to convince yourself the
+the data was actually written there. Then, we'll try reading it back in ...
+
+
+## Reading a Message
+
+Reading stored protobuf data is just as easy as writing it:
+
+```clj
+[protobuf.dev] λ=> (def address-book (protobuf/read AddressBook "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+```
+
+Now, keep in mind that the read operation produces a lazy sequence, so if
+we're to compare the `addresses` data with the new `address-book` data, we need
+to realize the latter, e.g.:
+
+```clj
+[protobuf.dev] λ=> (= addresses (into {} address-book))
+true
+```
+
+
+## Extending a Protocol
+
+Sooner or later after you release the code that uses your protocol buffer, you will undoubtedly want to "improve" the protocol buffer's definition. If you want your new buffers to be backwards-compatible, and your old buffers to be forward-compatible – and you almost certainly do want this – then there are some rules you need to follow. In the new version of the protocol buffer:
+
+* you **must not** change the tag numbers of any existing fields.
+* you **must not** add or delete any required fields.
+* you *may* delete optional or repeated fields.
+* you *may* add new optional or repeated fields but you must use fresh tag
+  numbers (i.e. tag numbers that were never used in this protocol buffer,
+  not even by deleted fields).
+
+If you follow these rules, old code will happily read new messages and simply
+ignore any new fields. To the old code, optional fields that were deleted will
+simply have their default value, and deleted repeated fields will be empty.
+New code will also transparently read old messages. However, keep in mind that
+new optional fields will not be present in old messages, so you will need to
+either check explicitly whether they're set or provide a reasonable default
+value in your `.proto` file with `[default = value]` after the tag number.
+
+If the default value is not specified for an optional element, a type-specific
+default value is used instead: for strings, the default value is the empty
+string. For booleans, the default value is `false`. For numeric types, the
+default value is zero. Note also that if you added a new repeated field, your
+new code will not be able to tell whether it was left empty (by new code) or
+never set at all (by old code).
+
+
+## Advanced Usage
+
+Protocol buffers have uses that go beyond simple accessors and serialization.
+Be sure to explore the [Java API reference][java-api-ref] to see what else you
+can do with them.
+
+One key feature provided by protocol message classes is `reflection`. You can
+iterate over the fields of a message and manipulate their values without
+writing your code against any specific message type. One very useful way to
+use reflection is for converting protocol messages to and from other
+encodings, such as XML or JSON. A more advanced use of reflection might be to
+find differences between two messages of the same type, or to develop a sort
+of "regular expressions for protocol messages" in which you can write
+expressions that match certain message contents. If you use your imagination,
+it's possible to apply Protocol Buffers to a much wider range of problems than
+you might initially expect!
+
+
+<!-- Named page links below: /-->
+
+[java-tut]: https://developers.google.com/protocol-buffers/docs/javatutorial
+[protobuf-guide]: https://developers.google.com/protocol-buffers/docs/proto
+[clojure-api-ref]: https://clojusc.github.io/protobuf
+[java-api-ref]: https://developers.google.com/protocol-buffers/docs/reference/java/index.html
+[java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
+[enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
+[download]: https://developers.google.com/protocol-buffers/docs/downloads.html
diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
index 9ab2e83..d3d9639 100644
--- a/resources/docs/1100-extensions.md
+++ b/resources/docs/1100-extensions.md
@@ -59,12 +59,12 @@ Create our protobuf:
 [protobuf.dev] λ=> (def Tag (protobuf/mapdef Example$Photo$Tag))
 #'protobuf.dev/Tag
 [protobuf.dev] λ=> (def p (protobuf/create
-              #_=>          Photo
-              #_=>          :id 7
-              #_=>          :path "/photos/h2k3j4h9h23"
-              #_=>          :labels #{"hawaii" "family" "surfing"}
-              #_=>          :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-              #_=>          :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+                            Photo
+                            :id 7
+                            :path "/photos/h2k3j4h9h23"
+                            :labels #{"hawaii" "family" "surfing"}
+                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                            :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
 #'protobuf.dev/p
 [protobuf.dev] λ=> p
 {:id 7,

From f787aa6284ae668008a6b32efe15854fb3a247b5 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:04:45 -0600
Subject: [PATCH 427/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html            |   2 +-
 docs/current/1050-tutorial.html               | 231 ++++++++++++++++++
 docs/current/1100-extensions.html             |  14 +-
 docs/current/1200-tutorial.html               |   2 +-
 docs/current/9800-marginalia.html             |   2 +-
 docs/current/9900-javadoc.html                |   2 +-
 docs/current/9999-other-versions.html         |   2 +-
 docs/current/index.html                       |   2 +-
 docs/current/javadoc/allclasses-frame.html    |   2 +-
 docs/current/javadoc/allclasses-noframe.html  |   2 +-
 docs/current/javadoc/constant-values.html     |   2 +-
 docs/current/javadoc/deprecated-list.html     |   2 +-
 docs/current/javadoc/help-doc.html            |   2 +-
 docs/current/javadoc/index-all.html           |   2 +-
 docs/current/javadoc/index.html               |   2 +-
 docs/current/javadoc/overview-tree.html       |   2 +-
 docs/current/javadoc/protobuf/Extensions.html |   2 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |   2 +-
 .../PersistentProtocolBufferMap.Def.html      |   2 +-
 .../protobuf/PersistentProtocolBufferMap.html |   2 +-
 .../javadoc/protobuf/package-frame.html       |   2 +-
 .../javadoc/protobuf/package-summary.html     |   2 +-
 .../javadoc/protobuf/package-tree.html        |   2 +-
 docs/current/javadoc/serialized-form.html     |   2 +-
 docs/current/protobuf.codec.html              |   2 +-
 docs/current/protobuf.core.html               |   2 +-
 docs/current/protobuf.schema.html             |   2 +-
 docs/current/protobuf.util.html               |   2 +-
 28 files changed, 264 insertions(+), 33 deletions(-)
 create mode 100644 docs/current/1050-tutorial.html

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index b16c394..4a23ae6 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
new file mode 100644
index 0000000..2a66a70
--- /dev/null
+++ b/docs/current/1050-tutorial.html
@@ -0,0 +1,231 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
+<h2><a href="#introduction" name="introduction"></a>Introduction</h2>
+<p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
+<ul>
+  <li>Define message formats in a <code>.proto</code> file.</li>
+  <li>Use the protocol buffer compiler.</li>
+  <li>Use the Clojure protocol buffer API to write and read messages.</li>
+</ul>
+<p>This isn’t a comprehensive guide to using protocol buffers in Clojure. For more detailed reference information, see:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a></li>
+  <li>the <a href="https://clojusc.github.io/protobuf">Clojure API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/encoding">Encoding Reference</a></li>
+</ul>
+<p>Additionally, you may find these useful:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
+</ul>
+<h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
+<p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
+<ul>
+  <li>Use Java Serialization. This is the default approach since it’s built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn’t work very well if you need to share data with applications written in C++ or Python.</li>
+  <li>You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as “12:3:-23:67”. This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.</li>
+  <li>Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.</li>
+</ul>
+<p>To avoid the problems mentioned in each of the above (as well as many others), protocol buffers was created. They are the flexible, efficient, automated solution.</p>
+<p>With protocol buffers, you write a <code>.proto</code> description of the data structure you wish to store. From that, the protocol buffer compiler creates compilable source code that implements automatic encoding and parsing of the protocol buffer data with an efficient binary format. The generated code provides getters and setters for the fields that make up a protocol buffer and takes care of the details of reading and writing the protocol buffer as a unit. Importantly, the protocol buffer format supports the idea of extending the format over time in such a way that the code can still read data encoded with the old format.</p>
+<h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format"></a>Defining Your Protocol Format</h2>
+<p>To create your address book application, you’ll need to start with a <code>.proto</code> file. The definitions in a <code>.proto</code> file are simple: you add a message for each data structure you want to serialize, then specify a name and a type for each field in the message. Here is the <code>.proto</code> file that defines your messages, <code>addressbook.proto</code>:</p>
+<pre><code class="proto">syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+</code></pre>
+<p>(Additionally, this file has been made available for you in the <code>resources/proto/examples</code> directory of the Clojure protobuf project.)</p>
+<p>As you can see, the syntax is similar to C++ or Java. Let’s go through each part of the file and see what it does.</p>
+<p>The <code>.proto</code> file starts with a package declaration, which helps to prevent naming conflicts between different projects. In Java, the package name is used as the Java package unless you have explicitly specified a <code>java_package</code>, as we have here. Even if you do provide a <code>java_package</code>, you should still define a normal package as well to avoid name collisions in the Protocol Buffers name space as well as in non-Java languages.</p>
+<p></p><blockquote> After the package declaration, you can see two options that are Java-specific. Thanks to Clojure’s Java inter-op, we can take advantage of this directly, without writing our own Clojure protobuf compiler or waiting for Google to support Clojure. </blockquote><p></p>
+<p><code>java_package</code> specifies in what Java package name your generated classes should live. If you don’t specify this explicitly, it simply matches the package name given by the package declaration, but these names usually aren’t appropriate Java package names (since they usually don’t start with a domain name).</p>
+<p>The <code>java_outer_classname</code> option defines the class name which should contain all of the classes in this file. If you don’t give a <code>java_outer_classname</code> explicitly, it will be generated by converting the file name to camel case. For example, <code>my_proto.proto</code> would, by default, use <code>MyProto</code> as the outer class name.</p>
+<p>Next, you have your message definitions. A message is just an aggregate containing a set of typed fields. Many standard simple data types are available as field types, including <code>bool</code>, <code>int32</code>, <code>float</code>, <code>double</code>, and <code>string.</code> You can also add further structure to your messages by using other message types as field types – in the above example the <code>Person</code> message contains <code>PhoneNumber</code> messages, while the <code>AddressBook</code> message contains <code>Person</code> messages. You can even define message types nested inside other messages – as you can see, the <code>PhoneNumber</code> type is defined inside <code>Person</code>. You can also define <code>enum</code> types if you want one of your fields to have one of a predefined list of values – here you want to specify that a phone number can be one of <code>MOBILE</code>, <code>HOME</code>, or <code>WORK</code>.</p>
+<p>The “ = 1”, “ = 2” markers on each element identify the unique “tag” that field uses in the binary encoding. Tag numbers 1-15 require one less byte to encode than higher numbers, so as an optimization you can decide to use those tags for the commonly used or repeated elements, leaving tags 16 and higher for less-commonly used optional elements. Each element in a repeated field requires re-encoding the tag number, so repeated fields are particularly good candidates for this optimization.</p>
+<p>Each field must be annotated with one of the following modifiers:</p>
+<ul>
+  <li><code>required</code>: a value for the field must be provided, otherwise the message will be considered “uninitialized”. Trying to build an uninitialized message will throw a <code>RuntimeException</code>. Parsing an uninitialized message will throw an <code>IOException</code>. Other than this, a required field behaves exactly like an optional field.</li>
+  <li><code>optional</code>: the field may or may not be set. If an optional field value isn’t set, a default value is used. For simple types, you can specify your own default value, as we’ve done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, <code>false</code> for bools. For embedded messages, the default value is always the “default instance” or “prototype” of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field’s default value.</li>
+  <li><code>repeated</code>: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.</li>
+</ul>
+<p></p><blockquote> <strong>Required Is Forever</strong><p></p>
+<p>You should be very careful about marking fields as required. If at some point you wish to stop writing or sending a required field, it will be problematic to change the field to an optional field – old readers will consider messages without this field to be incomplete and may reject or drop them unintentionally. You should consider writing application-specific custom validation routines for your buffers instead. Some engineers at Google have come to the conclusion that using required does more harm than good; they prefer to use only optional and repeated. However, this view is not universal. </p></blockquote><p></p>
+<p>You’ll find a complete guide to writing <code>.proto</code> files – including all the possible field types – in the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a>. Don’t go looking for facilities similar to class inheritance, though – protocol buffers don’t do that.</p>
+<h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buffers"></a>Compiling Your Protocol Buffers</h2>
+<p>Now that you have a <code>.proto</code>, the next thing you need to do is generate the classes you’ll need to read and write <code>AddressBook</code> (and hence <code>Person</code> and <code>PhoneNumber</code>) messages. To do this, you need to run the protocol buffer compiler <code>protoc</code> on your <code>.proto</code>:</p>
+<ol>
+  <li>If you haven’t installed this yet, now is the time. Your operating system’s  package manager very likely already provides a version for you – search  there first. If not, you can <a href="https://developers.google.com/protocol-buffers/docs/downloads.html">download it</a> from Google.</li>
+  <li>Now run the compiler, specifying:</li>
+</ol>
+<ul>
+  <li>the source directory (where your application’s source code lives – the  current directory is used if you don’t provide a value)</li>
+  <li>the destination directory (where you want the generated code to go; often  the same as $SRC_DIR), and</li>
+  <li>the path to your <code>.proto.</code></li>
+</ul>
+<p>In this case:</p>
+<pre><code class="bash">$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+</code></pre>
+<p>This gives us:</p>
+<pre><code class="bash">$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+</code></pre>
+<p>To have <code>lein</code> compile protobuf <code>.java</code> source files to <code>.class</code> that can be used from Clojure, we need to make sure that <code>lein</code> knows about our Java sources – with do this with the <code>:java-source-paths</code> key in the <code>project.clj</code> file, either at the top-level or in an appropriate profile.</p>
+<p>For example, this is what the Clojure protobuf project has set, using the <code>:test</code> profile:</p>
+<pre><code class="clj">:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+</code></pre>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
+<p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
+<pre><code class="bash">$ lein repl
+</code></pre>
+<h3><a href="#setup" name="setup"></a>Setup</h3>
+<p>First we’ll pull in the Clojure API:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[clojure.java.io :as io]
+                            '[protobuf.core :as protobuf])
+nil
+</code></pre>
+<p>Then we’ll import the generated Java classes we want to use:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial AddressBookProtos$Person
+                                                        AddressBookProtos$Person$PhoneNumber
+                                                        AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+</code></pre>
+<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Next we’ll use a Java wrapper that let’s us treat these like maps:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=&gt; (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=&gt; (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+</code></pre>
+<p>We can view the full, nested data schema in Clojure data:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/mapdef-&gt;schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+</code></pre>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
+<h2><a href="#message-functions" name="message-functions"></a>Message Functions</h2>
+<p>TBD</p>
+<h2><a href="#parsing-and-serialization" name="parsing-and-serialization"></a>Parsing and Serialization</h2>
+<ul>
+  <li><code>protobuf/parse</code> - Given an array or stream of bytes, we can parse these  to a Clojure protobuf data structure</li>
+  <li><code>protobuf/-&gt;bytes</code> - Given a Java protobuf wrapper, we can convert this to  an array of raw bytes</li>
+</ul>
+<h2><a href="#creating-messages" name="creating-messages"></a>Creating Messages</h2>
+<p>The once you have the wrapped objects, the <code>create</code> function can generate the appropriate protocol buffer message. Here’s how to create some <code>PhoneNumber</code> messages:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def phones [(protobuf/create PhoneNumber :number "555-1212" :type "HOME")
+                                (protobuf/create PhoneNumber :number "555-1213" :type "MOBILE")
+                                (protobuf/create PhoneNumber :number "555-1214" :type "WORK")])
+#'protobuf.dev/phones
+</code></pre>
+<p>Now we can use these when creating our <code>Person</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def alice (protobuf/create Person
+                                               :id 108
+                                               :name "Alice"
+                                               :email "alice@example.com"
+                                               :phones phones))
+#'protobuf.dev/alice
+</code></pre>
+<p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def addresses (protobuf/create AddressBook :people [alice]))
+#'protobuf.dev/addresses
+</code></pre>
+<p>Let’s take a quick look at the result:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint addresses)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+</code></pre>
+<h2><a href="#writing-a-messages" name="writing-a-messages"></a>Writing a Messages</h2>
+<p>These can then be written to an output stream:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write "/tmp/address-book.db" addresses)
+nil
+</code></pre>
+<p>Note that the first argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
+<p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself the the data was actually written there. Then, we’ll try reading it back in …</p>
+<h2><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h2>
+<p>Reading stored protobuf data is just as easy as writing it:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read AddressBook "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+</code></pre>
+<p>Now, keep in mind that the read operation produces a lazy sequence, so if we’re to compare the <code>addresses</code> data with the new <code>address-book</code> data, we need to realize the latter, e.g.:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (= addresses (into {} address-book))
+true
+</code></pre>
+<h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
+<p>Sooner or later after you release the code that uses your protocol buffer, you will undoubtedly want to “improve” the protocol buffer’s definition. If you want your new buffers to be backwards-compatible, and your old buffers to be forward-compatible – and you almost certainly do want this – then there are some rules you need to follow. In the new version of the protocol buffer:</p>
+<ul>
+  <li>you <strong>must not</strong> change the tag numbers of any existing fields.</li>
+  <li>you <strong>must not</strong> add or delete any required fields.</li>
+  <li>you <em>may</em> delete optional or repeated fields.</li>
+  <li>you <em>may</em> add new optional or repeated fields but you must use fresh tag  numbers (i.e. tag numbers that were never used in this protocol buffer,  not even by deleted fields).</li>
+</ul>
+<p>If you follow these rules, old code will happily read new messages and simply ignore any new fields. To the old code, optional fields that were deleted will simply have their default value, and deleted repeated fields will be empty. New code will also transparently read old messages. However, keep in mind that new optional fields will not be present in old messages, so you will need to either check explicitly whether they’re set or provide a reasonable default value in your <code>.proto</code> file with <code>[default = value]</code> after the tag number.</p>
+<p>If the default value is not specified for an optional element, a type-specific default value is used instead: for strings, the default value is the empty string. For booleans, the default value is <code>false</code>. For numeric types, the default value is zero. Note also that if you added a new repeated field, your new code will not be able to tell whether it was left empty (by new code) or never set at all (by old code).</p>
+<h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
+<p>Protocol buffers have uses that go beyond simple accessors and serialization. Be sure to explore the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API reference</a> to see what else you can do with them.</p>
+<p>One key feature provided by protocol message classes is <code>reflection</code>. You can iterate over the fields of a message and manipulate their values without writing your code against any specific message type. One very useful way to use reflection is for converting protocol messages to and from other encodings, such as XML or JSON. A more advanced use of reflection might be to find differences between two messages of the same type, or to develop a sort of “regular expressions for protocol messages” in which you can write expressions that match certain message contents. If you use your imagination, it’s possible to apply Protocol Buffers to a much wider range of problems than you might initially expect!</p>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index 4314672..ee5fad9 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
@@ -45,12 +45,12 @@
 [protobuf.dev] λ=&gt; (def Tag (protobuf/mapdef Example$Photo$Tag))
 #'protobuf.dev/Tag
 [protobuf.dev] λ=&gt; (def p (protobuf/create
-              #_=&gt;          Photo
-              #_=&gt;          :id 7
-              #_=&gt;          :path "/photos/h2k3j4h9h23"
-              #_=&gt;          :labels #{"hawaii" "family" "surfing"}
-              #_=&gt;          :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-              #_=&gt;          :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+                            Photo
+                            :id 7
+                            :path "/photos/h2k3j4h9h23"
+                            :labels #{"hawaii" "family" "surfing"}
+                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                            :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
 #'protobuf.dev/p
 [protobuf.dev] λ=&gt; p
 {:id 7,
diff --git a/docs/current/1200-tutorial.html b/docs/current/1200-tutorial.html
index 71cedc6..78256d3 100644
--- a/docs/current/1200-tutorial.html
+++ b/docs/current/1200-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 9fe9f12..991ed86 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 2a37152..04ce0f8 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index dc18dd9..ca39769 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index bf9d341..afdaf78 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index b311274..4cdde04 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index dc9a084..bae4a0b 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 3ba0ca2..90db289 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 8bf928f..49dac95 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index bc386b2..e09d899 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index a4904f1..2395302 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index b269c73..02805a6 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index ae607fb..f07fd75 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index fcdf89c..eff9b6d 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index bad77cb..5560dd5 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index bbb4ea5..f90ba81 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 19db1f6..b8296d7 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index e8390c5..bb6e763 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 4fe858e..0c59ea0 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 5a88b29..b45e347 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index c7e8f64..56e9ee6 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 11:57:41 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index 97a6abc..214837b 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 5156368..7531798 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index a4f5112..84e4207 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index 49993dc..ce9a974 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From 4396cac9eae058e327c30efbbca498cac3982298 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:04:45 -0600
Subject: [PATCH 428/525] Regen'ed docs.

---
 docs/current/javadoc/allclasses-frame.html                      | 2 +-
 docs/current/javadoc/allclasses-noframe.html                    | 2 +-
 docs/current/javadoc/constant-values.html                       | 2 +-
 docs/current/javadoc/deprecated-list.html                       | 2 +-
 docs/current/javadoc/help-doc.html                              | 2 +-
 docs/current/javadoc/index-all.html                             | 2 +-
 docs/current/javadoc/index.html                                 | 2 +-
 docs/current/javadoc/overview-tree.html                         | 2 +-
 docs/current/javadoc/protobuf/Extensions.html                   | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html         | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html       | 2 +-
 docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html  | 2 +-
 docs/current/javadoc/protobuf/package-frame.html                | 2 +-
 docs/current/javadoc/protobuf/package-summary.html              | 2 +-
 docs/current/javadoc/protobuf/package-tree.html                 | 2 +-
 docs/current/javadoc/serialized-form.html                       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 4cdde04..81216f1 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index bae4a0b..c845325 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 90db289..cfbf75f 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 49dac95..a4e96d9 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index e09d899..dcb318c 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 2395302..cb5d284 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 02805a6..bb65494 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index f07fd75..bda370c 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index eff9b6d..e287795 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:48 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 5560dd5..1f959c4 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index f90ba81..5f8e35f 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index b8296d7..2c53181 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index bb6e763..375a109 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 0c59ea0..f712650 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index b45e347..3784cb1 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 56e9ee6..4df437c 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:27:13 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

From f5a60f7d53731d90589b00f380bf6f9c209e2521 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:28:33 -0600
Subject: [PATCH 429/525] Bump version for release.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index b207ad3..4de64d7 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"
+(defproject clojusc/protobuf "3.5.1-v1.0"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {

From 4e4d6ae67715019273d4d44ed14379de5c31b04d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:32:11 -0600
Subject: [PATCH 430/525] Generated docs for release.

---
 docs/3.5.1-v1.0/1000-basic-usage.html         |   55 +
 docs/3.5.1-v1.0/1050-tutorial.html            |  231 ++
 docs/3.5.1-v1.0/1100-extensions.html          |   87 +
 docs/3.5.1-v1.0/9800-marginalia.html          |    8 +
 docs/3.5.1-v1.0/9900-javadoc.html             |    8 +
 docs/3.5.1-v1.0/9999-other-versions.html      |    9 +
 docs/3.5.1-v1.0/css/default.css               |  638 ++++
 docs/3.5.1-v1.0/highlight/atom-one-dark.css   |   96 +
 docs/3.5.1-v1.0/highlight/highlight.pack.js   |    2 +
 docs/3.5.1-v1.0/index.html                    |    3 +
 docs/3.5.1-v1.0/javadoc/allclasses-frame.html |   26 +
 .../javadoc/allclasses-noframe.html           |   26 +
 docs/3.5.1-v1.0/javadoc/constant-values.html  |  247 ++
 docs/3.5.1-v1.0/javadoc/deprecated-list.html  |  120 +
 docs/3.5.1-v1.0/javadoc/help-doc.html         |  217 ++
 docs/3.5.1-v1.0/javadoc/index-all.html        |  623 +++
 docs/3.5.1-v1.0/javadoc/index.html            |   72 +
 docs/3.5.1-v1.0/javadoc/overview-tree.html    |  147 +
 docs/3.5.1-v1.0/javadoc/package-list          |    1 +
 .../javadoc/protobuf/Extensions.html          |  764 ++++
 ...tProtocolBufferMap.Def.NamingStrategy.html |  240 ++
 .../PersistentProtocolBufferMap.Def.html      |  532 +++
 .../protobuf/PersistentProtocolBufferMap.html |  803 ++++
 .../javadoc/protobuf/package-frame.html       |   26 +
 .../javadoc/protobuf/package-summary.html     |  161 +
 .../javadoc/protobuf/package-tree.html        |  143 +
 docs/3.5.1-v1.0/javadoc/script.js             |   30 +
 docs/3.5.1-v1.0/javadoc/serialized-form.html  |  156 +
 docs/3.5.1-v1.0/javadoc/stylesheet.css        |  574 +++
 docs/3.5.1-v1.0/js/jquery.min.js              |    4 +
 docs/3.5.1-v1.0/js/page_effects.js            |  113 +
 docs/3.5.1-v1.0/marginalia.html               | 3395 +++++++++++++++++
 docs/3.5.1-v1.0/protobuf.codec.html           |    3 +
 docs/3.5.1-v1.0/protobuf.core.html            |    4 +
 docs/3.5.1-v1.0/protobuf.schema.html          |    3 +
 docs/3.5.1-v1.0/protobuf.util.html            |    3 +
 docs/current/1000-basic-usage.html            |    2 +-
 docs/current/1050-tutorial.html               |    2 +-
 docs/current/1100-extensions.html             |    2 +-
 docs/current/1200-tutorial.html               |    2 +-
 docs/current/9800-marginalia.html             |    2 +-
 docs/current/9900-javadoc.html                |    2 +-
 docs/current/9999-other-versions.html         |    3 +-
 docs/current/index.html                       |    2 +-
 docs/current/javadoc/allclasses-frame.html    |    2 +-
 docs/current/javadoc/allclasses-noframe.html  |    2 +-
 docs/current/javadoc/constant-values.html     |    2 +-
 docs/current/javadoc/deprecated-list.html     |    2 +-
 docs/current/javadoc/help-doc.html            |    2 +-
 docs/current/javadoc/index-all.html           |    2 +-
 docs/current/javadoc/index.html               |    2 +-
 docs/current/javadoc/overview-tree.html       |    2 +-
 docs/current/javadoc/protobuf/Extensions.html |    2 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |    2 +-
 .../PersistentProtocolBufferMap.Def.html      |    2 +-
 .../protobuf/PersistentProtocolBufferMap.html |    2 +-
 .../javadoc/protobuf/package-frame.html       |    2 +-
 .../javadoc/protobuf/package-summary.html     |    2 +-
 .../javadoc/protobuf/package-tree.html        |    2 +-
 docs/current/javadoc/serialized-form.html     |    2 +-
 docs/current/marginalia.html                  |    2 +-
 docs/current/protobuf.codec.html              |    2 +-
 docs/current/protobuf.core.html               |    2 +-
 docs/current/protobuf.schema.html             |    2 +-
 docs/current/protobuf.util.html               |    2 +-
 resources/docs/9999-other-versions.md         |    1 +
 66 files changed, 9601 insertions(+), 29 deletions(-)
 create mode 100644 docs/3.5.1-v1.0/1000-basic-usage.html
 create mode 100644 docs/3.5.1-v1.0/1050-tutorial.html
 create mode 100644 docs/3.5.1-v1.0/1100-extensions.html
 create mode 100644 docs/3.5.1-v1.0/9800-marginalia.html
 create mode 100644 docs/3.5.1-v1.0/9900-javadoc.html
 create mode 100644 docs/3.5.1-v1.0/9999-other-versions.html
 create mode 100644 docs/3.5.1-v1.0/css/default.css
 create mode 100644 docs/3.5.1-v1.0/highlight/atom-one-dark.css
 create mode 100644 docs/3.5.1-v1.0/highlight/highlight.pack.js
 create mode 100644 docs/3.5.1-v1.0/index.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/allclasses-frame.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/allclasses-noframe.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/constant-values.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/deprecated-list.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/help-doc.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/index-all.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/index.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/overview-tree.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/package-list
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/Extensions.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/package-frame.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/package-summary.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/protobuf/package-tree.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/script.js
 create mode 100644 docs/3.5.1-v1.0/javadoc/serialized-form.html
 create mode 100644 docs/3.5.1-v1.0/javadoc/stylesheet.css
 create mode 100644 docs/3.5.1-v1.0/js/jquery.min.js
 create mode 100644 docs/3.5.1-v1.0/js/page_effects.js
 create mode 100644 docs/3.5.1-v1.0/marginalia.html
 create mode 100644 docs/3.5.1-v1.0/protobuf.codec.html
 create mode 100644 docs/3.5.1-v1.0/protobuf.core.html
 create mode 100644 docs/3.5.1-v1.0/protobuf.schema.html
 create mode 100644 docs/3.5.1-v1.0/protobuf.util.html

diff --git a/docs/3.5.1-v1.0/1000-basic-usage.html b/docs/3.5.1-v1.0/1000-basic-usage.html
new file mode 100644
index 0000000..6d00d67
--- /dev/null
+++ b/docs/3.5.1-v1.0/1000-basic-usage.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
+<p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
+<pre><code class="proto">package protobuf.examples.person;
+
+option java_outer_classname = "Example";
+
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}
+</code></pre>
+<h2><a href="#compiling-to-and-then-to" name="compiling-to-and-then-to"></a>Compiling <code>.proto</code> to <code>.java</code> and then to <code>.class</code></h2>
+<p>A convenience script is provided to compile this: <code>bin/compile-example-protobufs</code>. This will create a <code>.java</code> file which will be saved in <code>target/examples</code>.</p>
+<p>The <code>:test</code> profile in the <code>project.clj</code> file has added <code>target/examples</code> as one of its <code>:java-source-paths</code> – as such, lein will compile the <code>.java</code> files in <code>target/examples</code> to <code>.class</code> so that they can be called from Clojure.</p>
+<p>If you started the project REPL with the command <code>lein repl</code>, then all of this has already been done for you.</p>
+<h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the Clojure API</h2>
+<p>From the dev REPL, pull in the core API and the compiled protobuf code:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import '(protobuf.examples.person Example$Person))
+protobuf.examples.person.Example$Person
+</code></pre>
+<p>Now we can create the Java wrapper for our protocol (see <code>protobuf.PersistentProtocolBufferMap</code> for more details):</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef Example$Person))
+#'protobuf.dev/Person
+</code></pre>
+<p>And with this in hand, we can finally create an instance of the protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Person
+                            :id 4
+                            :name "Alice"
+                            :email "alice@example.com"))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 4, :name "Alice", :email "alice@example.com"}
+</code></pre>
+<p>With our person data in place, we can now do the usual Clojure operations:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (assoc p :name "Alice B. Carol")
+{:id 4, :name "Alice B. Carol", :email "alice@example.com"}
+[protobuf.dev] λ=&gt; (assoc p :likes ["climbing" "running" "jumping"])
+{:id 4, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+</code></pre>
+<p>Additionally, converting between protobuf bytes and Clojure data is trivial:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x7e3a40eb "[B@7e3a40eb"]
+[protobuf.dev] λ=&gt; (protobuf/parse Person b)
+{:id 4, :name "Alice", :email "alice@example.com"}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/1050-tutorial.html b/docs/3.5.1-v1.0/1050-tutorial.html
new file mode 100644
index 0000000..e9e2ed4
--- /dev/null
+++ b/docs/3.5.1-v1.0/1050-tutorial.html
@@ -0,0 +1,231 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
+<h2><a href="#introduction" name="introduction"></a>Introduction</h2>
+<p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
+<ul>
+  <li>Define message formats in a <code>.proto</code> file.</li>
+  <li>Use the protocol buffer compiler.</li>
+  <li>Use the Clojure protocol buffer API to write and read messages.</li>
+</ul>
+<p>This isn’t a comprehensive guide to using protocol buffers in Clojure. For more detailed reference information, see:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a></li>
+  <li>the <a href="https://clojusc.github.io/protobuf">Clojure API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/encoding">Encoding Reference</a></li>
+</ul>
+<p>Additionally, you may find these useful:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
+</ul>
+<h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
+<p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
+<ul>
+  <li>Use Java Serialization. This is the default approach since it’s built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn’t work very well if you need to share data with applications written in C++ or Python.</li>
+  <li>You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as “12:3:-23:67”. This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.</li>
+  <li>Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.</li>
+</ul>
+<p>To avoid the problems mentioned in each of the above (as well as many others), protocol buffers was created. They are the flexible, efficient, automated solution.</p>
+<p>With protocol buffers, you write a <code>.proto</code> description of the data structure you wish to store. From that, the protocol buffer compiler creates compilable source code that implements automatic encoding and parsing of the protocol buffer data with an efficient binary format. The generated code provides getters and setters for the fields that make up a protocol buffer and takes care of the details of reading and writing the protocol buffer as a unit. Importantly, the protocol buffer format supports the idea of extending the format over time in such a way that the code can still read data encoded with the old format.</p>
+<h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format"></a>Defining Your Protocol Format</h2>
+<p>To create your address book application, you’ll need to start with a <code>.proto</code> file. The definitions in a <code>.proto</code> file are simple: you add a message for each data structure you want to serialize, then specify a name and a type for each field in the message. Here is the <code>.proto</code> file that defines your messages, <code>addressbook.proto</code>:</p>
+<pre><code class="proto">syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+</code></pre>
+<p>(Additionally, this file has been made available for you in the <code>resources/proto/examples</code> directory of the Clojure protobuf project.)</p>
+<p>As you can see, the syntax is similar to C++ or Java. Let’s go through each part of the file and see what it does.</p>
+<p>The <code>.proto</code> file starts with a package declaration, which helps to prevent naming conflicts between different projects. In Java, the package name is used as the Java package unless you have explicitly specified a <code>java_package</code>, as we have here. Even if you do provide a <code>java_package</code>, you should still define a normal package as well to avoid name collisions in the Protocol Buffers name space as well as in non-Java languages.</p>
+<p></p><blockquote> After the package declaration, you can see two options that are Java-specific. Thanks to Clojure’s Java inter-op, we can take advantage of this directly, without writing our own Clojure protobuf compiler or waiting for Google to support Clojure. </blockquote><p></p>
+<p><code>java_package</code> specifies in what Java package name your generated classes should live. If you don’t specify this explicitly, it simply matches the package name given by the package declaration, but these names usually aren’t appropriate Java package names (since they usually don’t start with a domain name).</p>
+<p>The <code>java_outer_classname</code> option defines the class name which should contain all of the classes in this file. If you don’t give a <code>java_outer_classname</code> explicitly, it will be generated by converting the file name to camel case. For example, <code>my_proto.proto</code> would, by default, use <code>MyProto</code> as the outer class name.</p>
+<p>Next, you have your message definitions. A message is just an aggregate containing a set of typed fields. Many standard simple data types are available as field types, including <code>bool</code>, <code>int32</code>, <code>float</code>, <code>double</code>, and <code>string.</code> You can also add further structure to your messages by using other message types as field types – in the above example the <code>Person</code> message contains <code>PhoneNumber</code> messages, while the <code>AddressBook</code> message contains <code>Person</code> messages. You can even define message types nested inside other messages – as you can see, the <code>PhoneNumber</code> type is defined inside <code>Person</code>. You can also define <code>enum</code> types if you want one of your fields to have one of a predefined list of values – here you want to specify that a phone number can be one of <code>MOBILE</code>, <code>HOME</code>, or <code>WORK</code>.</p>
+<p>The “ = 1”, “ = 2” markers on each element identify the unique “tag” that field uses in the binary encoding. Tag numbers 1-15 require one less byte to encode than higher numbers, so as an optimization you can decide to use those tags for the commonly used or repeated elements, leaving tags 16 and higher for less-commonly used optional elements. Each element in a repeated field requires re-encoding the tag number, so repeated fields are particularly good candidates for this optimization.</p>
+<p>Each field must be annotated with one of the following modifiers:</p>
+<ul>
+  <li><code>required</code>: a value for the field must be provided, otherwise the message will be considered “uninitialized”. Trying to build an uninitialized message will throw a <code>RuntimeException</code>. Parsing an uninitialized message will throw an <code>IOException</code>. Other than this, a required field behaves exactly like an optional field.</li>
+  <li><code>optional</code>: the field may or may not be set. If an optional field value isn’t set, a default value is used. For simple types, you can specify your own default value, as we’ve done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, <code>false</code> for bools. For embedded messages, the default value is always the “default instance” or “prototype” of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field’s default value.</li>
+  <li><code>repeated</code>: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.</li>
+</ul>
+<p></p><blockquote> <strong>Required Is Forever</strong><p></p>
+<p>You should be very careful about marking fields as required. If at some point you wish to stop writing or sending a required field, it will be problematic to change the field to an optional field – old readers will consider messages without this field to be incomplete and may reject or drop them unintentionally. You should consider writing application-specific custom validation routines for your buffers instead. Some engineers at Google have come to the conclusion that using required does more harm than good; they prefer to use only optional and repeated. However, this view is not universal. </p></blockquote><p></p>
+<p>You’ll find a complete guide to writing <code>.proto</code> files – including all the possible field types – in the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a>. Don’t go looking for facilities similar to class inheritance, though – protocol buffers don’t do that.</p>
+<h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buffers"></a>Compiling Your Protocol Buffers</h2>
+<p>Now that you have a <code>.proto</code>, the next thing you need to do is generate the classes you’ll need to read and write <code>AddressBook</code> (and hence <code>Person</code> and <code>PhoneNumber</code>) messages. To do this, you need to run the protocol buffer compiler <code>protoc</code> on your <code>.proto</code>:</p>
+<ol>
+  <li>If you haven’t installed this yet, now is the time. Your operating system’s  package manager very likely already provides a version for you – search  there first. If not, you can <a href="https://developers.google.com/protocol-buffers/docs/downloads.html">download it</a> from Google.</li>
+  <li>Now run the compiler, specifying:</li>
+</ol>
+<ul>
+  <li>the source directory (where your application’s source code lives – the  current directory is used if you don’t provide a value)</li>
+  <li>the destination directory (where you want the generated code to go; often  the same as $SRC_DIR), and</li>
+  <li>the path to your <code>.proto.</code></li>
+</ul>
+<p>In this case:</p>
+<pre><code class="bash">$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+</code></pre>
+<p>This gives us:</p>
+<pre><code class="bash">$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+</code></pre>
+<p>To have <code>lein</code> compile protobuf <code>.java</code> source files to <code>.class</code> that can be used from Clojure, we need to make sure that <code>lein</code> knows about our Java sources – with do this with the <code>:java-source-paths</code> key in the <code>project.clj</code> file, either at the top-level or in an appropriate profile.</p>
+<p>For example, this is what the Clojure protobuf project has set, using the <code>:test</code> profile:</p>
+<pre><code class="clj">:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+</code></pre>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
+<p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
+<pre><code class="bash">$ lein repl
+</code></pre>
+<h3><a href="#setup" name="setup"></a>Setup</h3>
+<p>First we’ll pull in the Clojure API:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[clojure.java.io :as io]
+                            '[protobuf.core :as protobuf])
+nil
+</code></pre>
+<p>Then we’ll import the generated Java classes we want to use:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial AddressBookProtos$Person
+                                                        AddressBookProtos$Person$PhoneNumber
+                                                        AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+</code></pre>
+<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Next we’ll use a Java wrapper that let’s us treat these like maps:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=&gt; (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=&gt; (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+</code></pre>
+<p>We can view the full, nested data schema in Clojure data:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/mapdef-&gt;schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+</code></pre>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
+<h2><a href="#message-functions" name="message-functions"></a>Message Functions</h2>
+<p>TBD</p>
+<h2><a href="#parsing-and-serialization" name="parsing-and-serialization"></a>Parsing and Serialization</h2>
+<ul>
+  <li><code>protobuf/parse</code> - Given an array or stream of bytes, we can parse these  to a Clojure protobuf data structure</li>
+  <li><code>protobuf/-&gt;bytes</code> - Given a Java protobuf wrapper, we can convert this to  an array of raw bytes</li>
+</ul>
+<h2><a href="#creating-messages" name="creating-messages"></a>Creating Messages</h2>
+<p>The once you have the wrapped objects, the <code>create</code> function can generate the appropriate protocol buffer message. Here’s how to create some <code>PhoneNumber</code> messages:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def phones [(protobuf/create PhoneNumber :number "555-1212" :type "HOME")
+                                (protobuf/create PhoneNumber :number "555-1213" :type "MOBILE")
+                                (protobuf/create PhoneNumber :number "555-1214" :type "WORK")])
+#'protobuf.dev/phones
+</code></pre>
+<p>Now we can use these when creating our <code>Person</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def alice (protobuf/create Person
+                                               :id 108
+                                               :name "Alice"
+                                               :email "alice@example.com"
+                                               :phones phones))
+#'protobuf.dev/alice
+</code></pre>
+<p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def addresses (protobuf/create AddressBook :people [alice]))
+#'protobuf.dev/addresses
+</code></pre>
+<p>Let’s take a quick look at the result:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint addresses)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+</code></pre>
+<h2><a href="#writing-a-messages" name="writing-a-messages"></a>Writing a Messages</h2>
+<p>These can then be written to an output stream:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write "/tmp/address-book.db" addresses)
+nil
+</code></pre>
+<p>Note that the first argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
+<p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself the the data was actually written there. Then, we’ll try reading it back in …</p>
+<h2><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h2>
+<p>Reading stored protobuf data is just as easy as writing it:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read AddressBook "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+</code></pre>
+<p>Now, keep in mind that the read operation produces a lazy sequence, so if we’re to compare the <code>addresses</code> data with the new <code>address-book</code> data, we need to realize the latter, e.g.:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (= addresses (into {} address-book))
+true
+</code></pre>
+<h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
+<p>Sooner or later after you release the code that uses your protocol buffer, you will undoubtedly want to “improve” the protocol buffer’s definition. If you want your new buffers to be backwards-compatible, and your old buffers to be forward-compatible – and you almost certainly do want this – then there are some rules you need to follow. In the new version of the protocol buffer:</p>
+<ul>
+  <li>you <strong>must not</strong> change the tag numbers of any existing fields.</li>
+  <li>you <strong>must not</strong> add or delete any required fields.</li>
+  <li>you <em>may</em> delete optional or repeated fields.</li>
+  <li>you <em>may</em> add new optional or repeated fields but you must use fresh tag  numbers (i.e. tag numbers that were never used in this protocol buffer,  not even by deleted fields).</li>
+</ul>
+<p>If you follow these rules, old code will happily read new messages and simply ignore any new fields. To the old code, optional fields that were deleted will simply have their default value, and deleted repeated fields will be empty. New code will also transparently read old messages. However, keep in mind that new optional fields will not be present in old messages, so you will need to either check explicitly whether they’re set or provide a reasonable default value in your <code>.proto</code> file with <code>[default = value]</code> after the tag number.</p>
+<p>If the default value is not specified for an optional element, a type-specific default value is used instead: for strings, the default value is the empty string. For booleans, the default value is <code>false</code>. For numeric types, the default value is zero. Note also that if you added a new repeated field, your new code will not be able to tell whether it was left empty (by new code) or never set at all (by old code).</p>
+<h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
+<p>Protocol buffers have uses that go beyond simple accessors and serialization. Be sure to explore the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API reference</a> to see what else you can do with them.</p>
+<p>One key feature provided by protocol message classes is <code>reflection</code>. You can iterate over the fields of a message and manipulate their values without writing your code against any specific message type. One very useful way to use reflection is for converting protocol messages to and from other encodings, such as XML or JSON. A more advanced use of reflection might be to find differences between two messages of the same type, or to develop a sort of “regular expressions for protocol messages” in which you can write expressions that match certain message contents. If you use your imagination, it’s possible to apply Protocol Buffers to a much wider range of problems than you might initially expect!</p>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/1100-extensions.html b/docs/3.5.1-v1.0/1100-extensions.html
new file mode 100644
index 0000000..bde33b1
--- /dev/null
+++ b/docs/3.5.1-v1.0/1100-extensions.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
+<p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
+<p>For example:</p>
+<pre><code class="proto">import "protobuf/core/extensions.proto";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+</code></pre>
+<p>Then you can access the extension fields in Clojure:</p>
+<p>Start up the REPL and do the appropriate requires/imports:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import (protobuf.examples.photo Example$Photo Example$Photo$Tag))
+protobuf.examples.photo.Example$Photo$Tag
+</code></pre>
+<p>Create our protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Photo (protobuf/mapdef Example$Photo))
+#'protobuf.dev/Photo
+[protobuf.dev] λ=&gt; (def Tag (protobuf/mapdef Example$Photo$Tag))
+#'protobuf.dev/Tag
+[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Photo
+                            :id 7
+                            :path "/photos/h2k3j4h9h23"
+                            :labels #{"hawaii" "family" "surfing"}
+                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                            :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Convert to and from bytes:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x4455bb6e "[B@4455bb6e"]
+[protobuf.dev] λ=&gt; (protobuf/parse Photo b)
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Get the schema for a protobuf (or extract a part of it):</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/mapdef-&gt;schema Tag)
+ :name "protobuf.examples.photo.Photo.Tag",
+ :fields
+ {:person-id {:type :int},
+  :x-coord {:type :int, :max 100.0, :min -100.0},
+  :y-coord {:type :int},
+  :width {:type :int},
+  :height {:type :int}}}
+[protobuf.dev] λ=&gt; (get-in (protobuf/mapdef-&gt;schema Tag) [:fields :x-coord])
+{:type :int, :max 100.0, :min -100.0}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/9800-marginalia.html b/docs/3.5.1-v1.0/9800-marginalia.html
new file mode 100644
index 0000000..89dfb09
--- /dev/null
+++ b/docs/3.5.1-v1.0/9800-marginalia.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
+<ul>
+  <li><a href="marginalia.html">Marginalia docs</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/9900-javadoc.html b/docs/3.5.1-v1.0/9900-javadoc.html
new file mode 100644
index 0000000..ed3c383
--- /dev/null
+++ b/docs/3.5.1-v1.0/9900-javadoc.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
+<ul>
+  <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/9999-other-versions.html b/docs/3.5.1-v1.0/9999-other-versions.html
new file mode 100644
index 0000000..5460b13
--- /dev/null
+++ b/docs/3.5.1-v1.0/9999-other-versions.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
+<ul>
+  <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v1.0">3.5.1-v1.0</a></li>
+  <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
+</ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/css/default.css b/docs/3.5.1-v1.0/css/default.css
new file mode 100644
index 0000000..89df9b5
--- /dev/null
+++ b/docs/3.5.1-v1.0/css/default.css
@@ -0,0 +1,638 @@
+@import url('https://fonts.googleapis.com/css?family=PT+Sans');
+
+body {
+    font-family: 'PT Sans', Helvetica, sans-serif;
+    font-size: 14px;
+}
+
+a {
+    color: #337ab7;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #30426a;
+    text-decoration: underline;
+}
+
+pre, code {
+    font-family: Monaco, DejaVu Sans Mono, Consolas, monospace;
+    font-size: 9pt;
+    margin: 15px 0;
+}
+
+h1 {
+    font-weight: normal;
+    font-size: 29px;
+    margin: 10px 0 2px 0;
+    padding: 0;
+}
+
+h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+h3 > a:hover {
+    text-decoration: none;
+}
+
+.document h1, .namespace-index h1 {
+    font-size: 32px;
+    margin-top: 12px;
+}
+
+#header, #content, .sidebar {
+    position: fixed;
+}
+
+#header {
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 22px;
+    color: #f5f5f5;
+    padding: 5px 7px;
+}
+
+#content {
+    top: 32px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    background: #eee;
+    color: #333;
+    padding: 0 18px;
+}
+
+.sidebar {
+    position: fixed;
+    top: 32px;
+    bottom: 0;
+    overflow: auto;
+    color: white;
+}
+
+.sidebar.primary {
+    background: #1f283b;
+    border-right: solid 1px #1f283b;
+    left: 0;
+    width: 250px;
+    font-size: 110%;
+}
+
+.sidebar.secondary {
+    background: #2a364f;
+    border-right: solid 1px #d7d7d7;
+    left: 251px;
+    width: 200px;
+    font-size: 110%;
+}
+
+#content.namespace-index, #content.document {
+    left: 251px;
+}
+
+#content.namespace-docs {
+    left: 452px;
+}
+
+#content.document {
+    padding-bottom: 10%;
+    left: 200px;
+}
+
+#header {
+    background: #58852b;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.4);
+    z-index: 100;
+}
+
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font-size: 18px;
+    font-weight: lighter;
+}
+
+#header h1 .project-version {
+    font-weight: normal;
+}
+
+.project-version {
+    padding-left: 0.15em;
+}
+
+#header a, .sidebar a {
+    display: block;
+    text-decoration: none;
+}
+
+#header a {
+    color: #f5f5f5;
+}
+
+.sidebar.primary, .sidebar.primary a,
+.sidebar.secondary, .sidebar.secondary a {
+    color: #b2bfdc;
+}
+
+.sidebar.primary a:hover, .sidebar.secondary a:hover {
+    color: white;
+}
+
+#header h2 {
+    float: right;
+    font-size: 9pt;
+    font-weight: normal;
+    margin: 4px 3px;
+    padding: 0;
+    color: #bbb;
+}
+
+#header h2 a {
+    display: inline;
+}
+
+.sidebar h3 {
+    margin: 0;
+    padding: 10px 13px 0 13px;
+    font-size: 19px;
+    font-weight: lighter;
+}
+
+.sidebar.primary h3.no-link, .sidebar.secondary h3 a {
+    text-transform: uppercase;
+    font-size: 12px;
+    color: #738bc0;
+}
+
+.sidebar ul {
+    padding: 7px 0 6px 0;
+    margin: 0;
+}
+
+.sidebar ul.index-link {
+    padding-bottom: 4px;
+}
+
+.sidebar li {
+    display: block;
+    vertical-align: middle;
+}
+
+.sidebar li a, .sidebar li .no-link {
+    border-left: 3px solid transparent;
+    padding: 0 10px;
+    white-space: nowrap;
+}
+
+.sidebar li .inner {
+    display: inline-block;
+    padding-top: 7px;
+    height: 24px;
+}
+
+.sidebar li a, .sidebar li .tree {
+    height: 31px;
+}
+
+.depth-1 .inner { padding-left: 2px; }
+.depth-2 .inner { padding-left: 6px; }
+.depth-3 .inner { padding-left: 20px; }
+.depth-4 .inner { padding-left: 34px; }
+.depth-5 .inner { padding-left: 48px; }
+.depth-6 .inner { padding-left: 62px; }
+.depth-7 .inner { padding-left: 76px; }
+.depth-8 .inner { padding-left: 90px; }
+
+.sidebar li .tree {
+    display: block;
+    float: left;
+    position: relative;
+    top: -10px;
+    margin: 0 4px 0 0;
+    padding: 0;
+}
+
+.sidebar li.depth-1 .tree {
+    display: none;
+}
+
+.sidebar li .tree .top, .sidebar li .tree .bottom {
+    display: block;
+    margin: 0;
+    padding: 0;
+    width: 7px;
+}
+
+.sidebar li .tree .top {
+    border-left: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    height: 19px;
+}
+
+.sidebar li .tree .bottom {
+    height: 22px;
+}
+
+.sidebar li.branch .tree .bottom {
+    border-left: 1px solid #aaa;
+}
+
+.sidebar.primary li.current a,
+.sidebar.secondary li.current a {
+    border-left: 3px solid #58852b;
+    color: white;
+}
+
+.namespace-index h2 {
+    margin: 30px 0 0 0;
+}
+
+.namespace-index h3 {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 0;
+    letter-spacing: 0.05em;
+    border-bottom: solid 1px #ddd;
+    max-width: 680px;
+    background-color: #fafafa;
+    padding: 0.5em;
+}
+
+.namespace-index .topics {
+    padding-left: 30px;
+    margin: 11px 0 0 0;
+}
+
+ul.topics {
+    list-style-type: none;
+}
+
+.namespace-index .topics li {
+    padding: 5px 0;
+}
+
+.namespace-docs h3 {
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.public h3 {
+    margin: 0;
+    float: left;
+}
+
+.usage {
+    clear: both;
+}
+
+.public {
+    margin: 0;
+    border-top: 1px solid #e0e0e0;
+    padding-top: 14px;
+    padding-bottom: 6px;
+}
+
+.public:last-child {
+    margin-bottom: 20%;
+}
+
+.members .public:last-child {
+    margin-bottom: 0;
+}
+
+.members {
+    margin: 15px 0;
+}
+
+.members h4 {
+    color: #555;
+    font-weight: normal;
+    font-variant: small-caps;
+    margin: 0 0 5px 0;
+}
+
+.members .inner {
+    padding-top: 5px;
+    padding-left: 12px;
+    margin-top: 2px;
+    margin-left: 7px;
+    border-left: 1px solid #bbb;
+}
+
+#content .members .inner h3 {
+    font-size: 12pt;
+}
+
+.members .public {
+    border-top: none;
+    margin-top: 0;
+    padding-top: 6px;
+    padding-bottom: 0;
+}
+
+.members .public:first-child {
+    padding-top: 0;
+}
+
+h4.type,
+h4.dynamic,
+h4.added,
+h4.deprecated {
+    float: left;
+    margin: 3px 10px 15px 0;
+    font-size: 15px;
+    font-weight: bold;
+    font-variant: small-caps;
+}
+
+.public h4.type,
+.public h4.dynamic,
+.public h4.added,
+.public h4.deprecated {
+    font-size: 13px;
+    font-weight: bold;
+    margin: 3px 0 0 10px;
+}
+
+.members h4.type,
+.members h4.added,
+.members h4.deprecated {
+    margin-top: 1px;
+}
+
+h4.type {
+    color: #717171;
+}
+
+h4.dynamic {
+    color: #9933aa;
+}
+
+h4.added {
+    color: #508820;
+}
+
+h4.deprecated {
+    color: #880000;
+}
+
+.namespace {
+    margin-bottom: 30px;
+}
+
+.namespace:last-child {
+    margin-bottom: 10%;
+}
+
+.index {
+    padding: 0;
+    font-size: 80%;
+    margin: 15px 0;
+    line-height: 1.6em;
+}
+
+.index * {
+    display: inline;
+}
+
+.index p {
+    padding-right: 3px;
+}
+
+.index li {
+    padding-right: 5px;
+}
+
+.index ul {
+    padding-left: 0;
+}
+
+.type-sig {
+    clear: both;
+    color: #088;
+}
+
+.type-sig pre {
+    padding-top: 10px;
+    margin: 0;
+}
+
+.usage code {
+    display: block;
+    color: #008;
+    margin: 2px 0;
+}
+
+.usage code:first-child {
+    padding-top: 10px;
+}
+
+p {
+    margin: 15px 0;
+}
+
+.public p:first-child, .public pre.plaintext {
+    margin-top: 12px;
+}
+
+.doc {
+    margin: 0 0 26px 0;
+    clear: both;
+}
+
+.public .doc {
+    margin: 0;
+}
+
+.namespace-index {
+  font-size: 120%;
+}
+
+.namespace-index .doc {
+    margin-bottom: 20px;
+}
+
+.namespace-index .namespace .doc {
+    margin-bottom: 10px;
+}
+
+.markdown p, .markdown li, .markdown dt, .markdown dd, .markdown td {
+    line-height: 1.6em;
+}
+
+.markdown h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+#content .markdown h3 {
+    font-size: 20px;
+}
+
+.markdown h4 {
+    font-size: 15px;
+}
+
+.doc, .public, .namespace .index {
+    max-width: 680px;
+    overflow-x: visible;
+}
+
+.markdown pre > code {
+    display: block;
+    padding: 10px;
+}
+
+.markdown pre > code, .src-link a {
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+}
+
+.src-link a {
+    background: #f6f6f6;
+}
+
+.markdown code:not(.hljs) {
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+    font-size: 90%;
+    padding: 2px 4px;
+}
+
+pre.deps {
+    display: inline-block;
+    margin: 0 10px;
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+    padding: 10px;
+    background-color: #f6f6f6;
+}
+
+.markdown hr {
+    border-style: solid;
+    border-top: none;
+    color: #ccc;
+}
+
+.doc ul, .doc ol {
+    padding-left: 30px;
+}
+
+.doc table {
+    border-collapse: collapse;
+    margin: 0 10px;
+}
+
+.doc table td, .doc table th {
+    border: 1px solid #dddddd;
+    padding: 4px 6px;
+}
+
+.doc table th {
+    background: #f2f2f2;
+}
+
+.doc dl {
+    margin: 0 10px 20px 10px;
+}
+
+.doc dl dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 3px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.doc dl dd {
+    padding: 5px 0;
+    margin: 0 0 5px 10px;
+}
+
+.doc abbr {
+    border-bottom: 1px dotted #333;
+    font-variant: none;
+    cursor: help;
+}
+
+.src-link {
+    margin-bottom: 15px;
+}
+
+.src-link a {
+    font-size: 70%;
+    padding: 1px 4px;
+    text-decoration: none;
+    color: #5555bb;
+    background-color: #f6f6f6;
+}
+
+blockquote {
+    opacity: 0.6;
+    border-left: solid 2px #ddd;
+    margin-left: 0;
+    padding-left: 1em;
+}
+
+/* Responsiveness Theme */
+
+@media (max-device-width: 480px) {
+  .sidebar {
+    display:none;
+  }
+
+  #content {
+    position: relative;
+    left: initial !important;
+    top: 110px;
+    padding: 1em 1em 0 1em;
+  }
+
+  #header {
+    display: flex;
+    flex-direction: column-reverse;
+    height: 100px;
+  }
+
+  #header > h1 {
+    font-size: 52px;
+  }
+
+  #header h2 {
+    float: none;
+    font-size: 20px;
+  }
+
+  .namespace-index > h1 {
+    display: none;
+  }
+
+  .public, .doc, .namespace > .index, .namespace > .doc, .namespace > h3 {
+    max-width: initial;
+  }
+
+  .doc {
+    text-align: justify;
+  }
+
+  .public {
+    padding-top: 2em;
+    padding-bottom: 2em;
+  }
+
+  .public > h3 {
+    font-size: 300%;
+  }
+
+  .public > h4.type, .public > h4.added, .public > h4.deprecated {
+    font-size: 150%;
+    margin-top: 1em;
+  }
+
+  pre > code {
+    font-size: 200%;
+  }
+}
diff --git a/docs/3.5.1-v1.0/highlight/atom-one-dark.css b/docs/3.5.1-v1.0/highlight/atom-one-dark.css
new file mode 100644
index 0000000..1616aaf
--- /dev/null
+++ b/docs/3.5.1-v1.0/highlight/atom-one-dark.css
@@ -0,0 +1,96 @@
+/*
+
+Atom One Dark by Daniel Gamage
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+base:    #282c34
+mono-1:  #abb2bf
+mono-2:  #818896
+mono-3:  #5c6370
+hue-1:   #56b6c2
+hue-2:   #61aeee
+hue-3:   #c678dd
+hue-4:   #98c379
+hue-5:   #e06c75
+hue-5-2: #be5046
+hue-6:   #d19a66
+hue-6-2: #e6c07b
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #abb2bf;
+  background: #282c34;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #5c6370;
+  font-style: italic;
+}
+
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #c678dd;
+}
+
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
+.hljs-subst {
+  color: #e06c75;
+}
+
+.hljs-literal {
+  color: #56b6c2;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #98c379;
+}
+
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #e6c07b;
+}
+
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #d19a66;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-title {
+  color: #61aeee;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/docs/3.5.1-v1.0/highlight/highlight.pack.js b/docs/3.5.1-v1.0/highlight/highlight.pack.js
new file mode 100644
index 0000000..126e338
--- /dev/null
+++ b/docs/3.5.1-v1.0/highlight/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.11.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]\n/,sL:"bash"}}],i:"</"}});hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"meta",b:"^#!",e:"$"},l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},i=b.inherit(b.QSM,{i:null}),t=b.C(";","$",{r:0}),s={b:"\\*",e:"\\*"},u={cN:"symbol",b:"[:&]"+e},d={b:e,r:0},f={b:c},m={b:"\\(",e:"\\)",c:["self",l,i,n,d]},o={c:[n,i,s,u,m,d],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},v={v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},N={b:"\\(\\s*",e:"\\)"},A={eW:!0,r:0};return N.c=[{cN:"name",v:[{b:e},{b:c}]},A],A.c=[o,v,N,l,n,i,t,s,u,f,d],{i:/\S/,c:[n,a,l,i,t,o,v,N,d]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(i,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[a,e.HCM,l,i,{cN:"symbol",b:":(?!\\s)",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:b,c:s}});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/index.html b/docs/3.5.1-v1.0/index.html
new file mode 100644
index 0000000..12505a1
--- /dev/null
+++ b/docs/3.5.1-v1.0/index.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/javadoc/allclasses-frame.html b/docs/3.5.1-v1.0/javadoc/allclasses-frame.html
new file mode 100644
index 0000000..c2e67f3
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/allclasses-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/allclasses-noframe.html b/docs/3.5.1-v1.0/javadoc/allclasses-noframe.html
new file mode 100644
index 0000000..d1c44b7
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/allclasses-noframe.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/constant-values.html b/docs/3.5.1-v1.0/javadoc/constant-values.html
new file mode 100644
index 0000000..e3bfbeb
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/constant-values.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Constant Field Values (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#protobuf">protobuf.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="protobuf">
+<!--   -->
+</a>
+<h2 title="protobuf">protobuf.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.COUNTER_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52004</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52003</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52006</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52007</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52002</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.META_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52010</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52025</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52026</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52024</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52022</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52023</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52021</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52020</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.SET_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52001</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52005</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/deprecated-list.html b/docs/3.5.1-v1.0/javadoc/deprecated-list.html
new file mode 100644
index 0000000..8df5232
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/deprecated-list.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Deprecated List (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Deprecated List (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/help-doc.html b/docs/3.5.1-v1.0/javadoc/help-doc.html
new file mode 100644
index 0000000..b8f5192
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/help-doc.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>API Help (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="API Help (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/index-all.html b/docs/3.5.1-v1.0/javadoc/index-all.html
new file mode 100644
index 0000000..50e8fd3
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/index-all.html
@@ -0,0 +1,623 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Index (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Index (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
+<!--   -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:B">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:C">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:D">
+<!--   -->
+</a>
+<h2 class="title">D</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:E">
+<!--   -->
+</a>
+<h2 class="title">E</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:F">
+<!--   -->
+</a>
+<h2 class="title">F</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:G">
+<!--   -->
+</a>
+<h2 class="title">G</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:I">
+<!--   -->
+</a>
+<h2 class="title">I</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:M">
+<!--   -->
+</a>
+<h2 class="title">M</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:N">
+<!--   -->
+</a>
+<h2 class="title">N</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+</dl>
+<a name="I:P">
+<!--   -->
+</a>
+<h2 class="title">P</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/package-summary.html">protobuf</a> - package protobuf</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+</dl>
+<a name="I:R">
+<!--   -->
+</a>
+<h2 class="title">R</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:S">
+<!--   -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:T">
+<!--   -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:W">
+<!--   -->
+</a>
+<h2 class="title">W</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/index.html b/docs/3.5.1-v1.0/javadoc/index.html
new file mode 100644
index 0000000..c472260
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/index.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Clojure Protocol Buffer Library</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="protobuf/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="protobuf/package-summary.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/overview-tree.html b/docs/3.5.1-v1.0/javadoc/overview-tree.html
new file mode 100644
index 0000000..c1f71f9
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/overview-tree.html
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="protobuf/package-tree.html">protobuf</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/package-list b/docs/3.5.1-v1.0/javadoc/package-list
new file mode 100644
index 0000000..b0c79cc
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/package-list
@@ -0,0 +1 @@
+protobuf
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/Extensions.html b/docs/3.5.1-v1.0/javadoc/protobuf/Extensions.html
new file mode 100644
index 0000000..e81e505
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/Extensions.html
@@ -0,0 +1,764 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Extensions (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Extensions (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class Extensions" class="title">Class Extensions</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.Extensions</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">Extensions</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#counter">counter</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#map">map</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapBy">mapBy</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapDeleted">mapDeleted</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapExists">mapExists</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#meta">meta</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullable">nullable</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullDouble">nullDouble</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullEnum">nullEnum</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullFloat">nullFloat</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullInt">nullInt</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullLong">nullLong</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullString">nullString</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#set">set</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#succession">succession</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static com.google.protobuf.Descriptors.FileDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#getDescriptor--">getDescriptor</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions</a></span>(com.google.protobuf.ExtensionRegistry&nbsp;registry)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="SET_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SET_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SET_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SET_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="set">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>set</h4>
+<pre>public static final&nbsp;&lt;any&gt; set</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="map">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>map</h4>
+<pre>public static final&nbsp;&lt;any&gt; map</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_BY_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_BY_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_BY_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapBy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapBy</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapBy</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="COUNTER_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COUNTER_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int COUNTER_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.COUNTER_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="counter">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>counter</h4>
+<pre>public static final&nbsp;&lt;any&gt; counter</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SUCCESSION_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SUCCESSION_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SUCCESSION_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="succession">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>succession</h4>
+<pre>public static final&nbsp;&lt;any&gt; succession</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_DELETED_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_DELETED_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapDeleted">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapDeleted</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapDeleted</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_EXISTS_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_EXISTS_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapExists">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapExists</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapExists</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="META_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>META_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int META_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.META_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="meta">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public static final&nbsp;&lt;any&gt; meta</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULLABLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULLABLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULLABLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullable">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullable</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullable</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_STRING_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_STRING_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_STRING_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullString">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullString</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullString</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_INT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_INT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_INT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullInt">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullInt</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullInt</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_LONG_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_LONG_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_LONG_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullLong">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullLong</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullLong</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_FLOAT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_FLOAT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullFloat">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullFloat</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullFloat</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_DOUBLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_DOUBLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullDouble">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullDouble</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullDouble</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_ENUM_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_ENUM_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullEnum">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>nullEnum</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullEnum</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="registerAllExtensions-com.google.protobuf.ExtensionRegistry-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerAllExtensions</h4>
+<pre>public static&nbsp;void&nbsp;registerAllExtensions(com.google.protobuf.ExtensionRegistry&nbsp;registry)</pre>
+</li>
+</ul>
+<a name="getDescriptor--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDescriptor</h4>
+<pre>public static&nbsp;com.google.protobuf.Descriptors.FileDescriptor&nbsp;getDescriptor()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
new file mode 100644
index 0000000..d6d647e
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Interface PersistentProtocolBufferMap.Def.NamingStrategy" class="title">Interface PersistentProtocolBufferMap.Def.NamingStrategy</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static interface <span class="typeNameLabel">PersistentProtocolBufferMap.Def.NamingStrategy</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName</a></span>(java.lang.String&nbsp;protoName)</code>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName</a></span>(java.lang.Object&nbsp;clojureName)</code>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="protoName-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protoName</h4>
+<pre>java.lang.String&nbsp;protoName(java.lang.Object&nbsp;clojureName)</pre>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</li>
+</ul>
+<a name="clojureName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureName</h4>
+<pre>java.lang.Object&nbsp;clojureName(java.lang.String&nbsp;protoName)</pre>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
new file mode 100644
index 0000000..d1f16e4
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -0,0 +1,532 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap.Def" class="title">Class PersistentProtocolBufferMap.Def</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap.Def</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">PersistentProtocolBufferMap.Def</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static clojure.lang.Var</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue</a></span>(Descriptors.EnumValueDescriptor&nbsp;enum_value)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create</a></span>(Descriptors.Descriptor&nbsp;type,
+      <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+      int&nbsp;sizeLimit)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>Descriptors.FieldDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr</a></span>(java.lang.Object&nbsp;named)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom</a></span>(java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom</a></span>(byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom</a></span>(CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="NAME_VAR">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NAME_VAR</h4>
+<pre>public static final&nbsp;clojure.lang.Var NAME_VAR</pre>
+</li>
+</ul>
+<a name="protobufNames">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protobufNames</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> protobufNames</pre>
+</li>
+</ul>
+<a name="convertUnderscores">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertUnderscores</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> convertUnderscores</pre>
+</li>
+</ul>
+<a name="type">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>type</h4>
+<pre>public final&nbsp;Descriptors.Descriptor type</pre>
+</li>
+</ul>
+<a name="namingStrategy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>namingStrategy</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> namingStrategy</pre>
+</li>
+</ul>
+<a name="sizeLimit">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sizeLimit</h4>
+<pre>public final&nbsp;int sizeLimit</pre>
+</li>
+</ul>
+<a name="NULL">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NULL</h4>
+<pre>public static final&nbsp;java.lang.Object NULL</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="nameStr-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nameStr</h4>
+<pre>public static final&nbsp;java.lang.String&nbsp;nameStr(java.lang.Object&nbsp;named)</pre>
+</li>
+</ul>
+<a name="create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;create(Descriptors.Descriptor&nbsp;type,
+                                                     <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+                                                     int&nbsp;sizeLimit)</pre>
+</li>
+</ul>
+<a name="parseFrom-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(byte[]&nbsp;bytes)
+                         throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(CodedInputStream&nbsp;input)
+                         throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;parseDelimitedFrom(java.io.InputStream&nbsp;input)
+                                          throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newBuilder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>newBuilder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;newBuilder()</pre>
+</li>
+</ul>
+<a name="fieldDescriptor-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fieldDescriptor</h4>
+<pre>public&nbsp;Descriptors.FieldDescriptor&nbsp;fieldDescriptor(java.lang.Object&nbsp;key)</pre>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+</li>
+</ul>
+<a name="getFullName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFullName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getFullName()</pre>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="intern-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>intern</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;intern(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="clojureEnumValue-Descriptors.EnumValueDescriptor-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureEnumValue</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;clojureEnumValue(Descriptors.EnumValueDescriptor&nbsp;enum_value)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.html
new file mode 100644
index 0000000..e5a625d
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -0,0 +1,803 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":9,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap" class="title">Class PersistentProtocolBufferMap</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.AFn</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.APersistentMap</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>clojure.lang.Associative, clojure.lang.Counted, clojure.lang.IFn, clojure.lang.IHashEq, clojure.lang.ILookup, clojure.lang.IMeta, clojure.lang.IObj, clojure.lang.IPersistentCollection, clojure.lang.IPersistentMap, clojure.lang.MapEquivalence, clojure.lang.Seqable, java.io.Serializable, java.lang.Iterable, java.lang.Runnable, java.util.concurrent.Callable, java.util.Map</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PersistentProtocolBufferMap</span>
+extends clojure.lang.APersistentMap
+implements clojure.lang.IObj</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#protobuf.PersistentProtocolBufferMap">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clojure.lang.APersistentMap.KeySeq, clojure.lang.APersistentMap.ValSeq</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;java.util.Map</h3>
+<code>java.util.Map.Entry&lt;K,V&gt;</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.IFn">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;clojure.lang.IFn</h3>
+<code>clojure.lang.IFn.D, clojure.lang.IFn.DD, clojure.lang.IFn.DDD, clojure.lang.IFn.DDDD, clojure.lang.IFn.DDDDD, clojure.lang.IFn.DDDDL, clojure.lang.IFn.DDDDO, clojure.lang.IFn.DDDL, clojure.lang.IFn.DDDLD, clojure.lang.IFn.DDDLL, clojure.lang.IFn.DDDLO, clojure.lang.IFn.DDDO, clojure.lang.IFn.DDDOD, clojure.lang.IFn.DDDOL, clojure.lang.IFn.DDDOO, clojure.lang.IFn.DDL, clojure.lang.IFn.DDLD, clojure.lang.IFn.DDLDD, clojure.lang.IFn.DDLDL, clojure.lang.IFn.DDLDO, clojure.lang.IFn.DDLL, clojure.lang.IFn.DDLLD, clojure.lang.IFn.DDLLL, clojure.lang.IFn.DDLLO, clojure.lang.IFn.DDLO, clojure.lang.IFn.DDLOD, clojure.lang.IFn.DDLOL, clojure.lang.IFn.DDLOO, clojure.lang.IFn.DDO, clojure.lang.IFn.DDOD, clojure.lang.IFn.DDODD, clojure.lang.IFn.DDODL, clojure.lang.IFn.DDODO, clojure.lang.IFn.DDOL, clojure.lang.IFn.DDOLD, clojure.lang.IFn.DDOLL, clojure.lang.IFn.DDOLO, clojure.lang.IFn.DDOO, clojure.lang.IFn.DDOOD, clojure.lang.IFn.DDOOL, clojure.lang.IFn.DDOOO, clojure.lang.IFn.DL, clojure.lang.IFn.DLD, clojure.lang.IFn.DLDD, clojure.lang.IFn.DLDDD, clojure.lang.IFn.DLDDL, clojure.lang.IFn.DLDDO, clojure.lang.IFn.DLDL, clojure.lang.IFn.DLDLD, clojure.lang.IFn.DLDLL, clojure.lang.IFn.DLDLO, clojure.lang.IFn.DLDO, clojure.lang.IFn.DLDOD, clojure.lang.IFn.DLDOL, clojure.lang.IFn.DLDOO, clojure.lang.IFn.DLL, clojure.lang.IFn.DLLD, clojure.lang.IFn.DLLDD, clojure.lang.IFn.DLLDL, clojure.lang.IFn.DLLDO, clojure.lang.IFn.DLLL, clojure.lang.IFn.DLLLD, clojure.lang.IFn.DLLLL, clojure.lang.IFn.DLLLO, clojure.lang.IFn.DLLO, clojure.lang.IFn.DLLOD, clojure.lang.IFn.DLLOL, clojure.lang.IFn.DLLOO, clojure.lang.IFn.DLO, clojure.lang.IFn.DLOD, clojure.lang.IFn.DLODD, clojure.lang.IFn.DLODL, clojure.lang.IFn.DLODO, clojure.lang.IFn.DLOL, clojure.lang.IFn.DLOLD, clojure.lang.IFn.DLOLL, clojure.lang.IFn.DLOLO, clojure.lang.IFn.DLOO, clojure.lang.IFn.DLOOD, clojure.lang.IFn.DLOOL, clojure.lang.IFn.DLOOO, clojure.lang.IFn.DO, clojure.lang.IFn.DOD, clojure.lang.IFn.DODD, clojure.lang.IFn.DODDD, clojure.lang.IFn.DODDL, clojure.lang.IFn.DODDO, clojure.lang.IFn.DODL, clojure.lang.IFn.DODLD, clojure.lang.IFn.DODLL, clojure.lang.IFn.DODLO, clojure.lang.IFn.DODO, clojure.lang.IFn.DODOD, clojure.lang.IFn.DODOL, clojure.lang.IFn.DODOO, clojure.lang.IFn.DOL, clojure.lang.IFn.DOLD, clojure.lang.IFn.DOLDD, clojure.lang.IFn.DOLDL, clojure.lang.IFn.DOLDO, clojure.lang.IFn.DOLL, clojure.lang.IFn.DOLLD, clojure.lang.IFn.DOLLL, clojure.lang.IFn.DOLLO, clojure.lang.IFn.DOLO, clojure.lang.IFn.DOLOD, clojure.lang.IFn.DOLOL, clojure.lang.IFn.DOLOO, clojure.lang.IFn.DOO, clojure.lang.IFn.DOOD, clojure.lang.IFn.DOODD, clojure.lang.IFn.DOODL, clojure.lang.IFn.DOODO, clojure.lang.IFn.DOOL, clojure.lang.IFn.DOOLD, clojure.lang.IFn.DOOLL, clojure.lang.IFn.DOOLO, clojure.lang.IFn.DOOO, clojure.lang.IFn.DOOOD, clojure.lang.IFn.DOOOL, clojure.lang.IFn.DOOOO, clojure.lang.IFn.L, clojure.lang.IFn.LD, clojure.lang.IFn.LDD, clojure.lang.IFn.LDDD, clojure.lang.IFn.LDDDD, clojure.lang.IFn.LDDDL, clojure.lang.IFn.LDDDO, clojure.lang.IFn.LDDL, clojure.lang.IFn.LDDLD, clojure.lang.IFn.LDDLL, clojure.lang.IFn.LDDLO, clojure.lang.IFn.LDDO, clojure.lang.IFn.LDDOD, clojure.lang.IFn.LDDOL, clojure.lang.IFn.LDDOO, clojure.lang.IFn.LDL, clojure.lang.IFn.LDLD, clojure.lang.IFn.LDLDD, clojure.lang.IFn.LDLDL, clojure.lang.IFn.LDLDO, clojure.lang.IFn.LDLL, clojure.lang.IFn.LDLLD, clojure.lang.IFn.LDLLL, clojure.lang.IFn.LDLLO, clojure.lang.IFn.LDLO, clojure.lang.IFn.LDLOD, clojure.lang.IFn.LDLOL, clojure.lang.IFn.LDLOO, clojure.lang.IFn.LDO, clojure.lang.IFn.LDOD, clojure.lang.IFn.LDODD, clojure.lang.IFn.LDODL, clojure.lang.IFn.LDODO, clojure.lang.IFn.LDOL, clojure.lang.IFn.LDOLD, clojure.lang.IFn.LDOLL, clojure.lang.IFn.LDOLO, clojure.lang.IFn.LDOO, clojure.lang.IFn.LDOOD, clojure.lang.IFn.LDOOL, clojure.lang.IFn.LDOOO, clojure.lang.IFn.LL, clojure.lang.IFn.LLD, clojure.lang.IFn.LLDD, clojure.lang.IFn.LLDDD, clojure.lang.IFn.LLDDL, clojure.lang.IFn.LLDDO, clojure.lang.IFn.LLDL, clojure.lang.IFn.LLDLD, clojure.lang.IFn.LLDLL, clojure.lang.IFn.LLDLO, clojure.lang.IFn.LLDO, clojure.lang.IFn.LLDOD, clojure.lang.IFn.LLDOL, clojure.lang.IFn.LLDOO, clojure.lang.IFn.LLL, clojure.lang.IFn.LLLD, clojure.lang.IFn.LLLDD, clojure.lang.IFn.LLLDL, clojure.lang.IFn.LLLDO, clojure.lang.IFn.LLLL, clojure.lang.IFn.LLLLD, clojure.lang.IFn.LLLLL, clojure.lang.IFn.LLLLO, clojure.lang.IFn.LLLO, clojure.lang.IFn.LLLOD, clojure.lang.IFn.LLLOL, clojure.lang.IFn.LLLOO, clojure.lang.IFn.LLO, clojure.lang.IFn.LLOD, clojure.lang.IFn.LLODD, clojure.lang.IFn.LLODL, clojure.lang.IFn.LLODO, clojure.lang.IFn.LLOL, clojure.lang.IFn.LLOLD, clojure.lang.IFn.LLOLL, clojure.lang.IFn.LLOLO, clojure.lang.IFn.LLOO, clojure.lang.IFn.LLOOD, clojure.lang.IFn.LLOOL, clojure.lang.IFn.LLOOO, clojure.lang.IFn.LO, clojure.lang.IFn.LOD, clojure.lang.IFn.LODD, clojure.lang.IFn.LODDD, clojure.lang.IFn.LODDL, clojure.lang.IFn.LODDO, clojure.lang.IFn.LODL, clojure.lang.IFn.LODLD, clojure.lang.IFn.LODLL, clojure.lang.IFn.LODLO, clojure.lang.IFn.LODO, clojure.lang.IFn.LODOD, clojure.lang.IFn.LODOL, clojure.lang.IFn.LODOO, clojure.lang.IFn.LOL, clojure.lang.IFn.LOLD, clojure.lang.IFn.LOLDD, clojure.lang.IFn.LOLDL, clojure.lang.IFn.LOLDO, clojure.lang.IFn.LOLL, clojure.lang.IFn.LOLLD, clojure.lang.IFn.LOLLL, clojure.lang.IFn.LOLLO, clojure.lang.IFn.LOLO, clojure.lang.IFn.LOLOD, clojure.lang.IFn.LOLOL, clojure.lang.IFn.LOLOO, clojure.lang.IFn.LOO, clojure.lang.IFn.LOOD, clojure.lang.IFn.LOODD, clojure.lang.IFn.LOODL, clojure.lang.IFn.LOODO, clojure.lang.IFn.LOOL, clojure.lang.IFn.LOOLD, clojure.lang.IFn.LOOLL, clojure.lang.IFn.LOOLO, clojure.lang.IFn.LOOO, clojure.lang.IFn.LOOOD, clojure.lang.IFn.LOOOL, clojure.lang.IFn.LOOOO, clojure.lang.IFn.OD, clojure.lang.IFn.ODD, clojure.lang.IFn.ODDD, clojure.lang.IFn.ODDDD, clojure.lang.IFn.ODDDL, clojure.lang.IFn.ODDDO, clojure.lang.IFn.ODDL, clojure.lang.IFn.ODDLD, clojure.lang.IFn.ODDLL, clojure.lang.IFn.ODDLO, clojure.lang.IFn.ODDO, clojure.lang.IFn.ODDOD, clojure.lang.IFn.ODDOL, clojure.lang.IFn.ODDOO, clojure.lang.IFn.ODL, clojure.lang.IFn.ODLD, clojure.lang.IFn.ODLDD, clojure.lang.IFn.ODLDL, clojure.lang.IFn.ODLDO, clojure.lang.IFn.ODLL, clojure.lang.IFn.ODLLD, clojure.lang.IFn.ODLLL, clojure.lang.IFn.ODLLO, clojure.lang.IFn.ODLO, clojure.lang.IFn.ODLOD, clojure.lang.IFn.ODLOL, clojure.lang.IFn.ODLOO, clojure.lang.IFn.ODO, clojure.lang.IFn.ODOD, clojure.lang.IFn.ODODD, clojure.lang.IFn.ODODL, clojure.lang.IFn.ODODO, clojure.lang.IFn.ODOL, clojure.lang.IFn.ODOLD, clojure.lang.IFn.ODOLL, clojure.lang.IFn.ODOLO, clojure.lang.IFn.ODOO, clojure.lang.IFn.ODOOD, clojure.lang.IFn.ODOOL, clojure.lang.IFn.ODOOO, clojure.lang.IFn.OL, clojure.lang.IFn.OLD, clojure.lang.IFn.OLDD, clojure.lang.IFn.OLDDD, clojure.lang.IFn.OLDDL, clojure.lang.IFn.OLDDO, clojure.lang.IFn.OLDL, clojure.lang.IFn.OLDLD, clojure.lang.IFn.OLDLL, clojure.lang.IFn.OLDLO, clojure.lang.IFn.OLDO, clojure.lang.IFn.OLDOD, clojure.lang.IFn.OLDOL, clojure.lang.IFn.OLDOO, clojure.lang.IFn.OLL, clojure.lang.IFn.OLLD, clojure.lang.IFn.OLLDD, clojure.lang.IFn.OLLDL, clojure.lang.IFn.OLLDO, clojure.lang.IFn.OLLL, clojure.lang.IFn.OLLLD, clojure.lang.IFn.OLLLL, clojure.lang.IFn.OLLLO, clojure.lang.IFn.OLLO, clojure.lang.IFn.OLLOD, clojure.lang.IFn.OLLOL, clojure.lang.IFn.OLLOO, clojure.lang.IFn.OLO, clojure.lang.IFn.OLOD, clojure.lang.IFn.OLODD, clojure.lang.IFn.OLODL, clojure.lang.IFn.OLODO, clojure.lang.IFn.OLOL, clojure.lang.IFn.OLOLD, clojure.lang.IFn.OLOLL, clojure.lang.IFn.OLOLO, clojure.lang.IFn.OLOO, clojure.lang.IFn.OLOOD, clojure.lang.IFn.OLOOL, clojure.lang.IFn.OLOOO, clojure.lang.IFn.OOD, clojure.lang.IFn.OODD, clojure.lang.IFn.OODDD, clojure.lang.IFn.OODDL, clojure.lang.IFn.OODDO, clojure.lang.IFn.OODL, clojure.lang.IFn.OODLD, clojure.lang.IFn.OODLL, clojure.lang.IFn.OODLO, clojure.lang.IFn.OODO, clojure.lang.IFn.OODOD, clojure.lang.IFn.OODOL, clojure.lang.IFn.OODOO, clojure.lang.IFn.OOL, clojure.lang.IFn.OOLD, clojure.lang.IFn.OOLDD, clojure.lang.IFn.OOLDL, clojure.lang.IFn.OOLDO, clojure.lang.IFn.OOLL, clojure.lang.IFn.OOLLD, clojure.lang.IFn.OOLLL, clojure.lang.IFn.OOLLO, clojure.lang.IFn.OOLO, clojure.lang.IFn.OOLOD, clojure.lang.IFn.OOLOL, clojure.lang.IFn.OOLOO, clojure.lang.IFn.OOOD, clojure.lang.IFn.OOODD, clojure.lang.IFn.OOODL, clojure.lang.IFn.OOODO, clojure.lang.IFn.OOOL, clojure.lang.IFn.OOOLD, clojure.lang.IFn.OOOLL, clojure.lang.IFn.OOOLO, clojure.lang.IFn.OOOOD, clojure.lang.IFn.OOOOL</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#def">def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append</a></span>(clojure.lang.IPersistentMap&nbsp;map)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx</a></span>(java.lang.Object&nbsp;key,
+       java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons</a></span>(java.lang.Object&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         java.lang.Object&nbsp;keyvals)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#count--">count</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+      byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>clojure.lang.IPersistentCollection</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#empty--">empty</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>clojure.lang.IMapEntry</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        java.lang.Object&nbsp;notFound,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>java.util.Iterator&lt;?&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#message--">message</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#meta--">meta</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                  java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>clojure.lang.ISeq</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#seq--">seq</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;notFound)</code>&nbsp;</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta</a></span>(clojure.lang.IPersistentMap&nbsp;meta)</code>&nbsp;</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo</a></span>(java.io.OutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo</a></span>(CodedOutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clear, containsValue, entrySet, equals, equiv, get, hashCode, hasheq, invoke, invoke, isEmpty, keySet, mapEquals, mapHash, mapHasheq, put, putAll, remove, size, toString, values</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.AFn">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.AFn</h3>
+<code>applyTo, applyToHelper, call, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, run, throwArity</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.util.Map</h3>
+<code>compute, computeIfAbsent, computeIfPresent, forEach, getOrDefault, merge, putIfAbsent, remove, replace, replace, replaceAll</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="def">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>def</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;create(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                 byte[]&nbsp;bytes)
+                                          throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    CodedInputStream&nbsp;input)
+                                             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseDelimitedFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                             java.io.InputStream&nbsp;input)
+                                                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>construct</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;construct(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    java.lang.Object&nbsp;keyvals)</pre>
+</li>
+</ul>
+<a name="toByteArray--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toByteArray</h4>
+<pre>public&nbsp;byte[]&nbsp;toByteArray()</pre>
+</li>
+</ul>
+<a name="writeTo-CodedOutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeTo</h4>
+<pre>public&nbsp;void&nbsp;writeTo(CodedOutputStream&nbsp;output)
+             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="writeDelimitedTo-java.io.OutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeDelimitedTo</h4>
+<pre>public&nbsp;void&nbsp;writeDelimitedTo(java.io.OutputStream&nbsp;output)
+                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="message--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>message</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;message()</pre>
+</li>
+</ul>
+<a name="builder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>builder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;builder()</pre>
+</li>
+</ul>
+<a name="withMeta-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>withMeta</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;withMeta(clojure.lang.IPersistentMap&nbsp;meta)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>withMeta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IObj</code></dd>
+</dl>
+</li>
+</ul>
+<a name="meta--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;meta()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>meta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IMeta</code></dd>
+</dl>
+</li>
+</ul>
+<a name="containsKey-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>containsKey</h4>
+<pre>public&nbsp;boolean&nbsp;containsKey(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>java.util.Map</code></dd>
+</dl>
+</li>
+</ul>
+<a name="entryAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>entryAt</h4>
+<pre>public&nbsp;clojure.lang.IMapEntry&nbsp;entryAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>entryAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key,
+                              java.lang.Object&nbsp;notFound)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 java.lang.Object&nbsp;notFound,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="assoc-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assoc</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assoc(java.lang.Object&nbsp;key,
+                                         java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="assocEx-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assocEx</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assocEx(java.lang.Object&nbsp;key,
+                                           java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assocEx</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="cons-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cons</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;cons(java.lang.Object&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>cons</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>cons</code>&nbsp;in class&nbsp;<code>clojure.lang.APersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="append-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;append(clojure.lang.IPersistentMap&nbsp;map)</pre>
+</li>
+</ul>
+<a name="without-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>without</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;without(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>without</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="iterator--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>iterator</h4>
+<pre>public&nbsp;java.util.Iterator&lt;?&gt;&nbsp;iterator()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>iterator</code>&nbsp;in interface&nbsp;<code>java.lang.Iterable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="count--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>count</h4>
+<pre>public&nbsp;int&nbsp;count()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.Counted</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+<a name="seq--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>seq</h4>
+<pre>public&nbsp;clojure.lang.ISeq&nbsp;seq()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>seq</code>&nbsp;in interface&nbsp;<code>clojure.lang.Seqable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="empty--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>empty</h4>
+<pre>public&nbsp;clojure.lang.IPersistentCollection&nbsp;empty()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>empty</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/package-frame.html b/docs/3.5.1-v1.0/javadoc/protobuf/package-frame.html
new file mode 100644
index 0000000..29949c8
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/package-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../protobuf/package-summary.html" target="classFrame">protobuf</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/package-summary.html b/docs/3.5.1-v1.0/javadoc/protobuf/package-summary.html
new file mode 100644
index 0000000..d9984af
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/package-summary.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;protobuf</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/Extensions.html" title="class in protobuf">Extensions</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/protobuf/package-tree.html b/docs/3.5.1-v1.0/javadoc/protobuf/package-tree.html
new file mode 100644
index 0000000..01f7e06
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/protobuf/package-tree.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package protobuf</h1>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/script.js b/docs/3.5.1-v1.0/javadoc/script.js
new file mode 100644
index 0000000..b346356
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/script.js
@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}
diff --git a/docs/3.5.1-v1.0/javadoc/serialized-form.html b/docs/3.5.1-v1.0/javadoc/serialized-form.html
new file mode 100644
index 0000000..90e0558
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/serialized-form.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:31:30 CST 2017 -->
+<title>Serialized Form (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2017-12-25">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Serialized Form (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Serialized Form" class="title">Serialized Form</h1>
+</div>
+<div class="serializedFormContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2 title="Package">Package&nbsp;protobuf</h2>
+<ul class="blockList">
+<li class="blockList"><a name="protobuf.PersistentProtocolBufferMap">
+<!--   -->
+</a>
+<h3>Class <a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">protobuf.PersistentProtocolBufferMap</a> extends clojure.lang.APersistentMap implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialized Fields</h3>
+<ul class="blockList">
+<li class="blockList">
+<h4>def</h4>
+<pre><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+<li class="blockList">
+<h4>message</h4>
+<pre>DynamicMessage message</pre>
+</li>
+<li class="blockList">
+<h4>_meta</h4>
+<pre>clojure.lang.IPersistentMap _meta</pre>
+</li>
+<li class="blockListLast">
+<h4>ext</h4>
+<pre>clojure.lang.IPersistentMap ext</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.0/javadoc/stylesheet.css b/docs/3.5.1-v1.0/javadoc/stylesheet.css
new file mode 100644
index 0000000..98055b2
--- /dev/null
+++ b/docs/3.5.1-v1.0/javadoc/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
diff --git a/docs/3.5.1-v1.0/js/jquery.min.js b/docs/3.5.1-v1.0/js/jquery.min.js
new file mode 100644
index 0000000..73f33fb
--- /dev/null
+++ b/docs/3.5.1-v1.0/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/docs/3.5.1-v1.0/js/page_effects.js b/docs/3.5.1-v1.0/js/page_effects.js
new file mode 100644
index 0000000..7ba93bf
--- /dev/null
+++ b/docs/3.5.1-v1.0/js/page_effects.js
@@ -0,0 +1,113 @@
+function visibleInParent(element) {
+    var position = $(element).position().top
+    return position > -50 && position < ($(element).offsetParent().height() - 50)
+}
+
+function hasFragment(link, fragment) {
+    return $(link).attr("href").indexOf("#" + fragment) != -1
+}
+
+function findLinkByFragment(elements, fragment) {
+    return $(elements).filter(function(i, e) { return hasFragment(e, fragment)}).first()
+}
+
+function scrollToCurrentVarLink(elements) {
+    var elements = $(elements);
+    var parent   = elements.offsetParent();
+
+    if (elements.length == 0) return;
+
+    var top    = elements.first().position().top;
+    var bottom = elements.last().position().top + elements.last().height();
+
+    if (top >= 0 && bottom <= parent.height()) return;
+
+    if (top < 0) {
+        parent.scrollTop(parent.scrollTop() + top);
+    }
+    else if (bottom > parent.height()) {
+        parent.scrollTop(parent.scrollTop() + bottom - parent.height());
+    }
+}
+
+function setCurrentVarLink() {
+    $('.secondary a').parent().removeClass('current')
+    $('.anchor').
+        filter(function(index) { return visibleInParent(this) }).
+        each(function(index, element) {
+            findLinkByFragment(".secondary a", element.id).
+                parent().
+                addClass('current')
+        });
+    scrollToCurrentVarLink('.secondary .current');
+}
+
+var hasStorage = (function() { try { return localStorage.getItem } catch(e) {} }())
+
+function scrollPositionId(element) {
+    var directory = window.location.href.replace(/[^\/]+\.html$/, '')
+    return 'scroll::' + $(element).attr('id') + '::' + directory
+}
+
+function storeScrollPosition(element) {
+    if (!hasStorage) return;
+    localStorage.setItem(scrollPositionId(element) + "::x", $(element).scrollLeft())
+    localStorage.setItem(scrollPositionId(element) + "::y", $(element).scrollTop())
+}
+
+function recallScrollPosition(element) {
+    if (!hasStorage) return;
+    $(element).scrollLeft(localStorage.getItem(scrollPositionId(element) + "::x"))
+    $(element).scrollTop(localStorage.getItem(scrollPositionId(element) + "::y"))
+}
+
+function persistScrollPosition(element) {
+    recallScrollPosition(element)
+    $(element).scroll(function() { storeScrollPosition(element) })
+}
+
+function sidebarContentWidth(element) {
+    var widths = $(element).find('.inner').map(function() { return $(this).innerWidth() })
+    return Math.max.apply(Math, widths)
+}
+
+function calculateSize(width, snap, margin, minimum) {
+    if (width == 0) {
+        return 0
+    }
+    else {
+        return Math.max(minimum, (Math.ceil(width / snap) * snap) + (margin * 2))
+    }
+}
+
+function resizeSidebars() {
+    var primaryWidth   = sidebarContentWidth('.primary')
+    var secondaryWidth = 0
+
+    if ($('.secondary').length != 0) {
+        secondaryWidth = sidebarContentWidth('.secondary')
+    }
+
+    // snap to grid
+    primaryWidth   = calculateSize(primaryWidth, 32, 13, 160)
+    secondaryWidth = calculateSize(secondaryWidth, 32, 13, 160)
+
+    $('.primary').css('width', primaryWidth)
+    $('.secondary').css('width', secondaryWidth).css('left', primaryWidth + 1)
+
+    if (secondaryWidth > 0) {
+        $('#content').css('left', primaryWidth + secondaryWidth + 2)
+    }
+    else {
+        $('#content').css('left', primaryWidth + 1)
+    }
+}
+
+$(window).ready(resizeSidebars)
+$(window).ready(setCurrentVarLink)
+$(window).ready(function() { persistScrollPosition('.primary')})
+$(window).ready(function() {
+    $('#content').scroll(setCurrentVarLink)
+    $(window).resize(setCurrentVarLink)
+    $(window).resize(resizeSidebars)
+})
diff --git a/docs/3.5.1-v1.0/marginalia.html b/docs/3.5.1-v1.0/marginalia.html
new file mode 100644
index 0000000..2b4940e
--- /dev/null
+++ b/docs/3.5.1-v1.0/marginalia.html
@@ -0,0 +1,3395 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8" content="text/html" http-equiv="Content-Type" /><meta content="A Clojure interface to Google's protocol buffers" name="description" /><style type="text/css">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  -moz-border-radius: 0 0 0 0 !important;
+  -webkit-border-radius: 0 0 0 0 !important;
+  background: none !important;
+  border: 0 !important;
+  bottom: auto !important;
+  float: none !important;
+  height: auto !important;
+  left: auto !important;
+  line-height: 1.1em !important;
+/*  margin: 0 !important; */
+  outline: 0 !important;
+  overflow: visible !important;
+  padding: 0 !important;
+  position: static !important;
+  right: auto !important;
+  text-align: left !important;
+  top: auto !important;
+  vertical-align: baseline !important;
+  width: auto !important;
+  box-sizing: content-box !important;
+  font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+  font-weight: normal !important;
+  font-style: normal !important;
+  min-height: inherit !important;
+  min-height: auto !important;
+}
+
+.syntaxhighlighter {
+/*  width: 100% !important; */
+  margin: 1em 0 1em 0 !important;
+  position: relative !important;
+  overflow: auto !important;
+}
+.syntaxhighlighter.source {
+  overflow: hidden !important;
+}
+.syntaxhighlighter .bold {
+  font-weight: bold !important;
+}
+.syntaxhighlighter .italic {
+  font-style: italic !important;
+}
+.syntaxhighlighter .line {
+  white-space: pre !important;
+}
+.syntaxhighlighter table {
+/*    width: 100% !important;*/
+}
+.syntaxhighlighter table caption {
+  text-align: left !important;
+  padding: .5em 0 0.5em 1em !important;
+}
+.syntaxhighlighter table td.code {
+  width: 100% !important;
+}
+.syntaxhighlighter table td.code .container {
+  position: relative !important;
+}
+.syntaxhighlighter table td.code .container textarea {
+  box-sizing: border-box !important;
+  position: absolute !important;
+  left: 0 !important;
+  top: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  border: none !important;
+  background: white !important;
+  padding-left: 1em !important;
+  overflow: hidden !important;
+  white-space: pre !important;
+}
+.syntaxhighlighter table td.gutter .line {
+  text-align: right !important;
+  padding: 0 0.5em 0 1em !important;
+}
+.syntaxhighlighter table td.code .line {
+  padding: 0 1em !important;
+}
+.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
+  padding-left: 0em !important;
+}
+.syntaxhighlighter.show {
+  display: block !important;
+}
+.syntaxhighlighter.collapsed table {
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+    display: none;
+/*  padding: 0.1em 0.8em 0em 0.8em !important;
+  font-size: 1em !important;
+  position: static !important;
+  width: auto !important;
+  height: auto !important;*/
+}
+.syntaxhighlighter.collapsed .toolbar span {
+  display: inline !important;
+  margin-right: 1em !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a {
+  padding: 0 !important;
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar {
+    display: none;
+/*  position: absolute !important;
+  right: 1px !important;
+  top: 1px !important;
+  width: 11px !important;
+  height: 11px !important;
+  font-size: 10px !important;
+  z-index: 10 !important;*/
+}
+.syntaxhighlighter .toolbar span.title {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar a {
+  display: block !important;
+  text-align: center !important;
+  text-decoration: none !important;
+  padding-top: 1px !important;
+}
+.syntaxhighlighter .toolbar a.expandSource {
+  display: none !important;
+}
+.syntaxhighlighter.ie {
+  font-size: .9em !important;
+  padding: 1px 0 1px 0 !important;
+}
+.syntaxhighlighter.ie .toolbar {
+  line-height: 8px !important;
+}
+.syntaxhighlighter.ie .toolbar a {
+  padding-top: 0px !important;
+}
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content {
+  background: none !important;
+}
+.syntaxhighlighter.printing .line .number {
+  color: #bbbbbb !important;
+}
+.syntaxhighlighter.printing .line .content {
+  color: black !important;
+}
+.syntaxhighlighter.printing .toolbar {
+  display: none !important;
+}
+.syntaxhighlighter.printing a {
+  text-decoration: none !important;
+}
+.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
+  color: black !important;
+}
+.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
+  color: blue !important;
+}
+.syntaxhighlighter.printing .keyword {
+  color: #006699 !important;
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter.printing .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter.printing .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter.printing .script {
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
+  color: red !important;
+}
+.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
+  color: black !important;
+}
+</style><style type="text/css">.syntaxhighlighter{overflow:hidden !important;}</style><style type="text/css">/**
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
+  background-color: #c3defe !important;
+}
+.syntaxhighlighter .line.highlighted.number {
+  color: white !important;
+}
+.syntaxhighlighter table caption {
+  color: black !important;
+}
+.syntaxhighlighter .gutter {
+  color: #787878 !important;
+}
+.syntaxhighlighter .gutter .line {
+  border-right: 3px solid #d4d0c8 !important;
+}
+.syntaxhighlighter .gutter .line.highlighted {
+  background-color: #d4d0c8 !important;
+  color: white !important;
+}
+.syntaxhighlighter.printing .line .content {
+  border: none !important;
+}
+.syntaxhighlighter.collapsed {
+  overflow: visible !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  color: #3f5fbf !important;
+  background: white !important;
+  border: 1px solid #d4d0c8 !important;
+}
+.syntaxhighlighter.collapsed .toolbar a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter.collapsed .toolbar a:hover {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .toolbar {
+  color: #a0a0a0 !important;
+  background: #d4d0c8 !important;
+  border: none !important;
+}
+.syntaxhighlighter .toolbar a {
+  color: #a0a0a0 !important;
+}
+.syntaxhighlighter .toolbar a:hover {
+  color: red !important;
+}
+.syntaxhighlighter .plain, .syntaxhighlighter .plain a {
+  color: black !important;
+}
+.syntaxhighlighter .comments, .syntaxhighlighter .comments a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter .string, .syntaxhighlighter .string a {
+  color: #2a00ff !important;
+}
+.syntaxhighlighter .keyword {
+  color: #7f0055 !important;
+}
+.syntaxhighlighter .preprocessor {
+  color: #646464 !important;
+}
+.syntaxhighlighter .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter .script {
+  font-weight: bold !important;
+  color: #7f0055 !important;
+  background-color: none !important;
+}
+.syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
+  color: red !important;
+}
+
+.syntaxhighlighter .xml .keyword {
+  color: #3f7f7f !important;
+  font-weight: normal !important;
+}
+.syntaxhighlighter .xml .color1, .syntaxhighlighter .xml .color1 a {
+  color: #7f007f !important;
+}
+.syntaxhighlighter .xml .string {
+  font-style: italic !important;
+  color: #2a00ff !important;
+}
+
+.clojure.syntaxhighlighter .invalid { 
+   background-color: #FAA !important;
+}
+
+.clojure.syntaxhighlighter .quoted {      
+    font-style: italic !important;
+}
+
+.syntaxhighlighter .clojure.variable,
+.syntaxhighlighter .clojure.symbol,
+.syntaxhighlighter .clojure.value
+{
+    color: #006060 !important;
+}
+
+.syntaxhighlighter .clojure.string {
+    color: #55B !important;
+}
+
+.syntaxhighlighter .clojure.functions {
+    color: black !important;
+}
+
+.syntaxhighlighter .clojure.color1 {
+    color: #666 !important;
+}
+
+.syntaxhighlighter .clojure.color3 {
+    color: #900 !important;
+}
+
+.syntaxhighlighter .clojure.constants {
+    color: #1A734D !important;
+}
+
+</style><style type="text/css">html{margin:0;padding:0;}h1{margin:0;padding:0;}h2{margin:0;padding:0;}h3{margin:0;padding:0;}h4{margin:0;padding:0;}a{color:#261A3B;}a:visited{color:#261A3B;}</style><style type="text/css">.header{margin-top:30px;}h1.project-name{font-size:34px;display:inline;}h2.project-version{font-size:18px;margin-top:0;display:inline;margin-left:10px;}.toc-link{font-size:12px;margin-left:10px;color:#252519;text-decoration:none;}.toc-link:hover{color:#5050A6;}.toc h1{font-size:34px;margin:0;}.docs-header{border-bottom:dotted #aaa 1px;padding-bottom:10px;margin-bottom:25px;}.toc h1{font-size:24px;}.toc{border-bottom:solid #bbb 1px;margin-bottom:40px;}.toc ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.toc li{list-style-type:none;padding-left:0;}.dependencies{}.dependencies table{font-size:16px;width:99.99%;border:none;margin-left:20px;}.dependencies td{padding-right:20px;;white-space:nowrap;}.dependencies .dotted{width:99%;}.dependencies .dotted hr{border-right:none;color:transparent;background-color:transparent;noshade:noshade;border-left:none;border-top:none;margin-bottom:-6px;height:0;border-bottom:dotted #bbb 1px;}.dependencies .dep-version{text-align:right;}.plugins ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.plugins li{list-style-type:none;padding-left:0;}.header p{margin-left:20px;}</style><style type="text/css">#floating-toc{position:fixed;top:10px;right:20px;height:20px;overflow:hidden;text-align:right;}#floating-toc li{list-style-type:none;margin:0;padding:0;}</style><style type="text/css">body{margin:0;padding:0;font-family:'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;;font-size:16px;color:#252519;background-color:#F5F5FF;}h1{font-size:20px;margin-top:0;}h2{font-size:18px;}h3{font-size:16px;}a.anchor{text-decoration:none;color:#252519;}a.anchor:hover{color:#5050A6;}table{border-spacing:0;border-bottom:solid #ddd 1px;;margin-bottom:10px;}code{display:inline;}p{margin-top:8px;}tr{margin:0px;padding:0px;}td.docs{width:410px;max-width:410px;vertical-align:top;margin:0px;padding-left:55px;padding-right:20px;border:none;background-color:#FFF;}td.docs pre{font-size:12px;overflow:hidden;}td.codes{vertical-align:top;font-size:10pt;overflow:hidden;background-color:#F5F5FF;width:55%;border-left:solid #E5E5EE 1px;padding-left:20px;border:none;margin:0px;}td.spacer{padding-bottom:40px;}pre code{display:block;padding:4px;}code{background-color:ghostWhite;border:solid #DEDEDE 1px;padding-left:3px;padding-right:3px;font-size:14px;}.syntaxhighlighter code{font-size:13px;}.footer{text-align:center;}</style><script type="text/javascript">/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
+</script><script type="text/javascript">//XRegExp 1.5.0 <xregexp.com> MIT License
+var XRegExp;if(XRegExp){throw Error("can't load XRegExp twice in the same frame")}(function(){XRegExp=function(w,r){var q=[],u=XRegExp.OUTSIDE_CLASS,x=0,p,s,v,t,y;if(XRegExp.isRegExp(w)){if(r!==undefined){throw TypeError("can't supply flags when constructing one RegExp from another")}return j(w)}if(g){throw Error("can't call the XRegExp constructor within token definition functions")}r=r||"";p={hasNamedCapture:false,captureNames:[],hasFlag:function(z){return r.indexOf(z)>-1},setFlag:function(z){r+=z}};while(x<w.length){s=o(w,x,u,p);if(s){q.push(s.output);x+=(s.match[0].length||1)}else{if(v=m.exec.call(i[u],w.slice(x))){q.push(v[0]);x+=v[0].length}else{t=w.charAt(x);if(t==="["){u=XRegExp.INSIDE_CLASS}else{if(t==="]"){u=XRegExp.OUTSIDE_CLASS}}q.push(t);x++}}}y=RegExp(q.join(""),m.replace.call(r,h,""));y._xregexp={source:w,captureNames:p.hasNamedCapture?p.captureNames:null};return y};XRegExp.version="1.5.0";XRegExp.INSIDE_CLASS=1;XRegExp.OUTSIDE_CLASS=2;var c=/\$(?:(\d\d?|[$&`'])|{([$\w]+)})/g,h=/[^gimy]+|([\s\S])(?=[\s\S]*\1)/g,n=/^(?:[?*+]|{\d+(?:,\d*)?})\??/,g=false,k=[],m={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},a=m.exec.call(/()??/,"")[1]===undefined,e=function(){var p=/^/g;m.test.call(p,"");return !p.lastIndex}(),f=function(){var p=/x/g;m.replace.call("x",p,"");return !p.lastIndex}(),b=RegExp.prototype.sticky!==undefined,i={};i[XRegExp.INSIDE_CLASS]=/^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/;i[XRegExp.OUTSIDE_CLASS]=/^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/;XRegExp.addToken=function(s,r,q,p){k.push({pattern:j(s,"g"+(b?"y":"")),handler:r,scope:q||XRegExp.OUTSIDE_CLASS,trigger:p||null})};XRegExp.cache=function(r,p){var q=r+"/"+(p||"");return XRegExp.cache[q]||(XRegExp.cache[q]=XRegExp(r,p))};XRegExp.copyAsGlobal=function(p){return j(p,"g")};XRegExp.escape=function(p){return p.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")};XRegExp.execAt=function(s,r,t,q){r=j(r,"g"+((q&&b)?"y":""));r.lastIndex=t=t||0;var p=r.exec(s);if(q){return(p&&p.index===t)?p:null}else{return p}};XRegExp.freezeTokens=function(){XRegExp.addToken=function(){throw Error("can't run addToken after freezeTokens")}};XRegExp.isRegExp=function(p){return Object.prototype.toString.call(p)==="[object RegExp]"};XRegExp.iterate=function(u,p,v,s){var t=j(p,"g"),r=-1,q;while(q=t.exec(u)){v.call(s,q,++r,u,t);if(t.lastIndex===q.index){t.lastIndex++}}if(p.global){p.lastIndex=0}};XRegExp.matchChain=function(q,p){return function r(s,x){var v=p[x].regex?p[x]:{regex:p[x]},u=j(v.regex,"g"),w=[],t;for(t=0;t<s.length;t++){XRegExp.iterate(s[t],u,function(y){w.push(v.backref?(y[v.backref]||""):y[0])})}return((x===p.length-1)||!w.length)?w:r(w,x+1)}([q],0)};RegExp.prototype.apply=function(q,p){return this.exec(p[0])};RegExp.prototype.call=function(p,q){return this.exec(q)};RegExp.prototype.exec=function(t){var r=m.exec.apply(this,arguments),q,p;if(r){if(!a&&r.length>1&&l(r,"")>-1){p=RegExp(this.source,m.replace.call(d(this),"g",""));m.replace.call(t.slice(r.index),p,function(){for(var u=1;u<arguments.length-2;u++){if(arguments[u]===undefined){r[u]=undefined}}})}if(this._xregexp&&this._xregexp.captureNames){for(var s=1;s<r.length;s++){q=this._xregexp.captureNames[s-1];if(q){r[q]=r[s]}}}if(!e&&this.global&&!r[0].length&&(this.lastIndex>r.index)){this.lastIndex--}}return r};if(!e){RegExp.prototype.test=function(q){var p=m.exec.call(this,q);if(p&&this.global&&!p[0].length&&(this.lastIndex>p.index)){this.lastIndex--}return !!p}}String.prototype.match=function(q){if(!XRegExp.isRegExp(q)){q=RegExp(q)}if(q.global){var p=m.match.apply(this,arguments);q.lastIndex=0;return p}return q.exec(this)};String.prototype.replace=function(r,s){var t=XRegExp.isRegExp(r),q,p,u;if(t&&typeof s.valueOf()==="string"&&s.indexOf("${")===-1&&f){return m.replace.apply(this,arguments)}if(!t){r=r+""}else{if(r._xregexp){q=r._xregexp.captureNames}}if(typeof s==="function"){p=m.replace.call(this,r,function(){if(q){arguments[0]=new String(arguments[0]);for(var v=0;v<q.length;v++){if(q[v]){arguments[0][q[v]]=arguments[v+1]}}}if(t&&r.global){r.lastIndex=arguments[arguments.length-2]+arguments[0].length}return s.apply(null,arguments)})}else{u=this+"";p=m.replace.call(u,r,function(){var v=arguments;return m.replace.call(s,c,function(x,w,A){if(w){switch(w){case"$":return"$";case"&":return v[0];case"`":return v[v.length-1].slice(0,v[v.length-2]);case"'":return v[v.length-1].slice(v[v.length-2]+v[0].length);default:var y="";w=+w;if(!w){return x}while(w>v.length-3){y=String.prototype.slice.call(w,-1)+y;w=Math.floor(w/10)}return(w?v[w]||"":"$")+y}}else{var z=+A;if(z<=v.length-3){return v[z]}z=q?l(q,A):-1;return z>-1?v[z+1]:x}})})}if(t&&r.global){r.lastIndex=0}return p};String.prototype.split=function(u,p){if(!XRegExp.isRegExp(u)){return m.split.apply(this,arguments)}var w=this+"",r=[],v=0,t,q;if(p===undefined||+p<0){p=Infinity}else{p=Math.floor(+p);if(!p){return[]}}u=XRegExp.copyAsGlobal(u);while(t=u.exec(w)){if(u.lastIndex>v){r.push(w.slice(v,t.index));if(t.length>1&&t.index<w.length){Array.prototype.push.apply(r,t.slice(1))}q=t[0].length;v=u.lastIndex;if(r.length>=p){break}}if(u.lastIndex===t.index){u.lastIndex++}}if(v===w.length){if(!m.test.call(u,"")||q){r.push("")}}else{r.push(w.slice(v))}return r.length>p?r.slice(0,p):r};function j(r,q){if(!XRegExp.isRegExp(r)){throw TypeError("type RegExp expected")}var p=r._xregexp;r=XRegExp(r.source,d(r)+(q||""));if(p){r._xregexp={source:p.source,captureNames:p.captureNames?p.captureNames.slice(0):null}}return r}function d(p){return(p.global?"g":"")+(p.ignoreCase?"i":"")+(p.multiline?"m":"")+(p.extended?"x":"")+(p.sticky?"y":"")}function o(v,u,w,p){var r=k.length,y,s,x;g=true;try{while(r--){x=k[r];if((w&x.scope)&&(!x.trigger||x.trigger.call(p))){x.pattern.lastIndex=u;s=x.pattern.exec(v);if(s&&s.index===u){y={output:x.handler.call(p,s,w),match:s};break}}}}catch(q){throw q}finally{g=false}return y}function l(s,q,r){if(Array.prototype.indexOf){return s.indexOf(q,r)}for(var p=r||0;p<s.length;p++){if(s[p]===q){return p}}return -1}XRegExp.addToken(/\(\?#[^)]*\)/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"});XRegExp.addToken(/\((?!\?)/,function(){this.captureNames.push(null);return"("});XRegExp.addToken(/\(\?<([$\w]+)>/,function(p){this.captureNames.push(p[1]);this.hasNamedCapture=true;return"("});XRegExp.addToken(/\\k<([\w$]+)>/,function(q){var p=l(this.captureNames,q[1]);return p>-1?"\\"+(p+1)+(isNaN(q.input.charAt(q.index+q[0].length))?"":"(?:)"):q[0]});XRegExp.addToken(/\[\^?]/,function(p){return p[0]==="[]"?"\\b\\B":"[\\s\\S]"});XRegExp.addToken(/^\(\?([imsx]+)\)/,function(p){this.setFlag(p[1]);return""});XRegExp.addToken(/(?:\s+|#.*)+/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("x")});XRegExp.addToken(/\./,function(){return"[\\s\\S]"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("s")})})();
+</script><script type="text/javascript">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+//
+// Begin anonymous function. This is used to contain local scope variables without polutting global scope.
+//
+var SyntaxHighlighter = function() { 
+
+// CommonJS
+if (typeof(require) != 'undefined' && typeof(XRegExp) == 'undefined')
+{
+	XRegExp = require('XRegExp').XRegExp;
+}
+
+// Shortcut object which will be assigned to the SyntaxHighlighter variable.
+// This is a shorthand for local reference in order to avoid long namespace 
+// references to SyntaxHighlighter.whatever...
+var sh = {
+	defaults : {
+		/** Additional CSS class names to be added to highlighter elements. */
+		'class-name' : '',
+		
+		/** First line number. */
+		'first-line' : 1,
+		
+		/**
+		 * Pads line numbers. Possible values are:
+		 *
+		 *   false - don't pad line numbers.
+		 *   true  - automaticaly pad numbers with minimum required number of leading zeroes.
+		 *   [int] - length up to which pad line numbers.
+		 */
+		'pad-line-numbers' : false,
+		
+		/** Lines to highlight. */
+		'highlight' : null,
+		
+		/** Title to be displayed above the code block. */
+		'title' : null,
+		
+		/** Enables or disables smart tabs. */
+		'smart-tabs' : true,
+		
+		/** Gets or sets tab size. */
+		'tab-size' : 4,
+		
+		/** Enables or disables gutter. */
+		'gutter' : true,
+		
+		/** Enables or disables toolbar. */
+		'toolbar' : true,
+		
+		/** Enables quick code copy and paste from double click. */
+		'quick-code' : true,
+		
+		/** Forces code view to be collapsed. */
+		'collapse' : false,
+		
+		/** Enables or disables automatic links. */
+		'auto-links' : true,
+		
+		/** Gets or sets light mode. Equavalent to turning off gutter and toolbar. */
+		'light' : false,
+		
+		'html-script' : false
+	},
+	
+	config : {
+		space : '&nbsp;',
+		
+		/** Enables use of <SCRIPT type="syntaxhighlighter" /> tags. */
+		useScriptTags : true,
+		
+		/** Blogger mode flag. */
+		bloggerMode : false,
+		
+		stripBrs : false,
+		
+		/** Name of the tag that SyntaxHighlighter will automatically look for. */
+		tagName : 'pre',
+		
+		strings : {
+			expandSource : 'expand source',
+			help : '?',
+			alert: 'SyntaxHighlighter\n\n',
+			noBrush : 'Can\'t find brush for: ',
+			brushNotHtmlScript : 'Brush wasn\'t configured for html-script option: ',
+			
+			// this is populated by the build script
+			aboutDialog : '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>About SyntaxHighlighter</title></head><body style="font-family:Geneva,Arial,Helvetica,sans-serif;background-color:#fff;color:#000;font-size:1em;text-align:center;"><div style="text-align:center;margin-top:1.5em;"><div style="font-size:xx-large;">SyntaxHighlighter</div><div style="font-size:.75em;margin-bottom:3em;"><div>version 3.0.83 (July 02 2010)</div><div><a href="http://alexgorbatchev.com/SyntaxHighlighter" target="_blank" style="color:#005896">http://alexgorbatchev.com/SyntaxHighlighter</a></div><div>JavaScript code syntax highlighter.</div><div>Copyright 2004-2010 Alex Gorbatchev.</div></div><div>If you like this script, please <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2930402" style="color:#005896">donate</a> to <br/>keep development active!</div></div></body></html>'
+		}
+	},
+	
+	/** Internal 'global' variables. */
+	vars : {
+		discoveredBrushes : null,
+		highlighters : {}
+	},
+	
+	/** This object is populated by user included external brush files. */
+	brushes : {},
+
+	/** Common regular expressions. */
+	regexLib : {
+		multiLineCComments			: /\/\*[\s\S]*?\*\//gm,
+		singleLineCComments			: /\/\/.*$/gm,
+		singleLinePerlComments		: /#.*$/gm,
+		doubleQuotedString			: /"([^\\"\n]|\\.)*"/g,
+		singleQuotedString			: /'([^\\'\n]|\\.)*'/g,
+		multiLineDoubleQuotedString	: new XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
+		multiLineSingleQuotedString	: new XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
+		xmlComments					: /(&lt;|<)!--[\s\S]*?--(&gt;|>)/gm,
+		url							: /\w+:\/\/[\w-.\/?%&=:@;]*/g,
+		
+		/** <?= ?> tags. */
+		phpScriptTags 				: { left: /(&lt;|<)\?=?/g, right: /\?(&gt;|>)/g },
+		
+		/** <%= %> tags. */
+		aspScriptTags				: { left: /(&lt;|<)%=?/g, right: /%(&gt;|>)/g },
+		
+		scriptScriptTags			: { left: /(&lt;|<)\s*script.*?(&gt;|>)/gi, right: /(&lt;|<)\/\s*script\s*(&gt;|>)/gi }
+	},
+
+	toolbar: {
+		/**
+		 * Generates HTML markup for the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @return {String} Returns HTML markup.
+		 */
+		getHtml: function(highlighter)
+		{
+			var html = '<div class="toolbar">',
+				items = sh.toolbar.items,
+				list = items.list
+				;
+			
+			function defaultGetHtml(highlighter, name)
+			{
+				return sh.toolbar.getButtonHtml(highlighter, name, sh.config.strings[name]);
+			};
+			
+			for (var i = 0; i < list.length; i++)
+				html += (items[list[i]].getHtml || defaultGetHtml)(highlighter, list[i]);
+			
+			html += '</div>';
+			
+			return html;
+		},
+		
+		/**
+		 * Generates HTML markup for a regular button in the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @param {String} commandName		Command name that would be executed.
+		 * @param {String} label			Label text to display.
+		 * @return {String}					Returns HTML markup.
+		 */
+		getButtonHtml: function(highlighter, commandName, label)
+		{
+			return '<span><a href="#" class="toolbar_item'
+				+ ' command_' + commandName
+				+ ' ' + commandName
+				+ '">' + label + '</a></span>'
+				;
+		},
+		
+		/**
+		 * Event handler for a toolbar anchor.
+		 */
+		handler: function(e)
+		{
+			var target = e.target,
+				className = target.className || ''
+				;
+
+			function getValue(name)
+			{
+				var r = new RegExp(name + '_(\\w+)'),
+					match = r.exec(className)
+					;
+
+				return match ? match[1] : null;
+			};
+			
+			var highlighter = getHighlighterById(findParentElement(target, '.syntaxhighlighter').id),
+				commandName = getValue('command')
+				;
+			
+			// execute the toolbar command
+			if (highlighter && commandName)
+				sh.toolbar.items[commandName].execute(highlighter);
+
+			// disable default A click behaviour
+			e.preventDefault();
+		},
+		
+		/** Collection of toolbar items. */
+		items : {
+			// Ordered lis of items in the toolbar. Can't expect `for (var n in items)` to be consistent.
+			list: ['expandSource', 'help'],
+
+			expandSource: {
+				getHtml: function(highlighter)
+				{
+					if (highlighter.getParam('collapse') != true)
+						return '';
+						
+					var title = highlighter.getParam('title');
+					return sh.toolbar.getButtonHtml(highlighter, 'expandSource', title ? title : sh.config.strings.expandSource);
+				},
+			
+				execute: function(highlighter)
+				{
+					var div = getHighlighterDivById(highlighter.id);
+					removeClass(div, 'collapsed');
+				}
+			},
+
+			/** Command to display the about dialog window. */
+			help: {
+				execute: function(highlighter)
+				{	
+					var wnd = popup('', '_blank', 500, 250, 'scrollbars=0'),
+						doc = wnd.document
+						;
+					
+					doc.write(sh.config.strings.aboutDialog);
+					doc.close();
+					wnd.focus();
+				}
+			}
+		}
+	},
+
+	/**
+	 * Finds all elements on the page which should be processes by SyntaxHighlighter.
+	 *
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are returned which qualify.
+	 *
+	 * @return {Array}	Returns list of <code>{ target: DOMElement, params: Object }</code> objects.
+	 */
+	findElements: function(globalParams, element)
+	{
+		var elements = element ? [element] : toArray(document.getElementsByTagName(sh.config.tagName)), 
+			conf = sh.config,
+			result = []
+			;
+
+		// support for <SCRIPT TYPE="syntaxhighlighter" /> feature
+		if (conf.useScriptTags)
+			elements = elements.concat(getSyntaxHighlighterScriptTags());
+
+		if (elements.length === 0) 
+			return result;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var item = {
+				target: elements[i], 
+				// local params take precedence over globals
+				params: merge(globalParams, parseParams(elements[i].className))
+			};
+
+			if (item.params['brush'] == null)
+				continue;
+				
+			result.push(item);
+		}
+		
+		return result;
+	},
+
+	/**
+	 * Shorthand to highlight all elements on the page that are marked as 
+	 * SyntaxHighlighter source code.
+	 * 
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are highlighted.
+	 */ 
+	highlight: function(globalParams, element)
+	{
+		var elements = this.findElements(globalParams, element),
+			propertyName = 'innerHTML', 
+			highlighter = null,
+			conf = sh.config
+			;
+
+		if (elements.length === 0) 
+			return;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var element = elements[i],
+				target = element.target,
+				params = element.params,
+				brushName = params.brush,
+				code
+				;
+
+			if (brushName == null)
+				continue;
+
+			// Instantiate a brush
+			if (params['html-script'] == 'true' || sh.defaults['html-script'] == true) 
+			{
+				highlighter = new sh.HtmlScript(brushName);
+				brushName = 'htmlscript';
+			}
+			else
+			{
+				var brush = findBrush(brushName);
+				
+				if (brush)
+					highlighter = new brush();
+				else
+					continue;
+			}
+			
+			code = target[propertyName];
+			
+			// remove CDATA from <SCRIPT/> tags if it's present
+			if (conf.useScriptTags)
+				code = stripCData(code);
+				
+			// Inject title if the attribute is present
+			if ((target.title || '') != '')
+				params.title = target.title;
+				
+			params['brush'] = brushName;
+			highlighter.init(params);
+			element = highlighter.getDiv(code);
+			
+			// carry over ID
+			if ((target.id || '') != '')
+				element.id = target.id;
+			
+			target.parentNode.replaceChild(element, target);
+		}
+	},
+
+	/**
+	 * Main entry point for the SyntaxHighlighter.
+	 * @param {Object} params Optional params to apply to all highlighted elements.
+	 */
+	all: function(params)
+	{
+		attachEvent(
+			window,
+			'load',
+			function() { sh.highlight(params); }
+		);
+	}
+}; // end of sh
+
+sh['all']			= sh.all;
+sh['highlight']		= sh.highlight;
+
+/**
+ * Checks if target DOM elements has specified CSS class.
+ * @param {DOMElement} target Target DOM element to check.
+ * @param {String} className Name of the CSS class to check for.
+ * @return {Boolean} Returns true if class name is present, false otherwise.
+ */
+function hasClass(target, className)
+{
+	return target.className.indexOf(className) != -1;
+};
+
+/**
+ * Adds CSS class name to the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className New CSS class to add.
+ */
+function addClass(target, className)
+{
+	if (!hasClass(target, className))
+		target.className += ' ' + className;
+};
+
+/**
+ * Removes CSS class name from the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className CSS class to remove.
+ */
+function removeClass(target, className)
+{
+	target.className = target.className.replace(className, '');
+};
+
+/**
+ * Converts the source to array object. Mostly used for function arguments and 
+ * lists returned by getElementsByTagName() which aren't Array objects.
+ * @param {List} source Source list.
+ * @return {Array} Returns array.
+ */
+function toArray(source)
+{
+	var result = [];
+	
+	for (var i = 0; i < source.length; i++) 
+		result.push(source[i]);
+		
+	return result;
+};
+
+/**
+ * Splits block of text into lines.
+ * @param {String} block Block of text.
+ * @return {Array} Returns array of lines.
+ */
+function splitLines(block)
+{
+	return block.split('\n');
+}
+
+/**
+ * Generates HTML ID for the highlighter.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {String} Returns HTML ID.
+ */
+function getHighlighterId(id)
+{
+	var prefix = 'highlighter_';
+	return id.indexOf(prefix) == 0 ? id : prefix + id;
+};
+
+/**
+ * Finds Highlighter instance by ID.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Highlighter} Returns instance of the highlighter.
+ */
+function getHighlighterById(id)
+{
+	return sh.vars.highlighters[getHighlighterId(id)];
+};
+
+/**
+ * Finds highlighter's DIV container.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Element} Returns highlighter's DIV element.
+ */
+function getHighlighterDivById(id)
+{
+	return document.getElementById(getHighlighterId(id));
+};
+
+/**
+ * Stores highlighter so that getHighlighterById() can do its thing. Each
+ * highlighter must call this method to preserve itself.
+ * @param {Highilghter} highlighter Highlighter instance.
+ */
+function storeHighlighter(highlighter)
+{
+	sh.vars.highlighters[getHighlighterId(highlighter.id)] = highlighter;
+};
+
+/**
+ * Looks for a child or parent node which has specified classname.
+ * Equivalent to jQuery's $(container).find(".className")
+ * @param {Element} target Target element.
+ * @param {String} search Class name or node name to look for.
+ * @param {Boolean} reverse If set to true, will go up the node tree instead of down.
+ * @return {Element} Returns found child or parent element on null.
+ */
+function findElement(target, search, reverse /* optional */)
+{
+	if (target == null)
+		return null;
+		
+	var nodes			= reverse != true ? target.childNodes : [ target.parentNode ],
+		propertyToFind	= { '#' : 'id', '.' : 'className' }[search.substr(0, 1)] || 'nodeName',
+		expectedValue,
+		found
+		;
+
+	expectedValue = propertyToFind != 'nodeName'
+		? search.substr(1)
+		: search.toUpperCase()
+		;
+		
+	// main return of the found node
+	if ((target[propertyToFind] || '').indexOf(expectedValue) != -1)
+		return target;
+	
+	for (var i = 0; nodes && i < nodes.length && found == null; i++)
+		found = findElement(nodes[i], search, reverse);
+	
+	return found;
+};
+
+/**
+ * Looks for a parent node which has specified classname.
+ * This is an alias to <code>findElement(container, className, true)</code>.
+ * @param {Element} target Target element.
+ * @param {String} className Class name to look for.
+ * @return {Element} Returns found parent element on null.
+ */
+function findParentElement(target, className)
+{
+	return findElement(target, className, true);
+};
+
+/**
+ * Finds an index of element in the array.
+ * @ignore
+ * @param {Object} searchElement
+ * @param {Number} fromIndex
+ * @return {Number} Returns index of element if found; -1 otherwise.
+ */
+function indexOf(array, searchElement, fromIndex)
+{
+	fromIndex = Math.max(fromIndex || 0, 0);
+
+	for (var i = fromIndex; i < array.length; i++)
+		if(array[i] == searchElement)
+			return i;
+	
+	return -1;
+};
+
+/**
+ * Generates a unique element ID.
+ */
+function guid(prefix)
+{
+	return (prefix || '') + Math.round(Math.random() * 1000000).toString();
+};
+
+/**
+ * Merges two objects. Values from obj2 override values in obj1.
+ * Function is NOT recursive and works only for one dimensional objects.
+ * @param {Object} obj1 First object.
+ * @param {Object} obj2 Second object.
+ * @return {Object} Returns combination of both objects.
+ */
+function merge(obj1, obj2)
+{
+	var result = {}, name;
+
+	for (name in obj1) 
+		result[name] = obj1[name];
+	
+	for (name in obj2) 
+		result[name] = obj2[name];
+		
+	return result;
+};
+
+/**
+ * Attempts to convert string to boolean.
+ * @param {String} value Input string.
+ * @return {Boolean} Returns true if input was "true", false if input was "false" and value otherwise.
+ */
+function toBoolean(value)
+{
+	var result = { "true" : true, "false" : false }[value];
+	return result == null ? value : result;
+};
+
+/**
+ * Opens up a centered popup window.
+ * @param {String} url		URL to open in the window.
+ * @param {String} name		Popup name.
+ * @param {int} width		Popup width.
+ * @param {int} height		Popup height.
+ * @param {String} options	window.open() options.
+ * @return {Window}			Returns window instance.
+ */
+function popup(url, name, width, height, options)
+{
+	var x = (screen.width - width) / 2,
+		y = (screen.height - height) / 2
+		;
+		
+	options +=	', left=' + x + 
+				', top=' + y +
+				', width=' + width +
+				', height=' + height
+		;
+	options = options.replace(/^,/, '');
+
+	var win = window.open(url, name, options);
+	win.focus();
+	return win;
+};
+
+/**
+ * Adds event handler to the target object.
+ * @param {Object} obj		Target object.
+ * @param {String} type		Name of the event.
+ * @param {Function} func	Handling function.
+ */
+function attachEvent(obj, type, func, scope)
+{
+	function handler(e)
+	{
+		e = e || window.event;
+		
+		if (!e.target)
+		{
+			e.target = e.srcElement;
+			e.preventDefault = function()
+			{
+				this.returnValue = false;
+			};
+		}
+			
+		func.call(scope || window, e);
+	};
+	
+	if (obj.attachEvent) 
+	{
+		obj.attachEvent('on' + type, handler);
+	}
+	else 
+	{
+		obj.addEventListener(type, handler, false);
+	}
+};
+
+/**
+ * Displays an alert.
+ * @param {String} str String to display.
+ */
+function alert(str)
+{
+	window.alert(sh.config.strings.alert + str);
+};
+
+/**
+ * Finds a brush by its alias.
+ *
+ * @param {String} alias		Brush alias.
+ * @param {Boolean} showAlert	Suppresses the alert if false.
+ * @return {Brush}				Returns bursh constructor if found, null otherwise.
+ */
+function findBrush(alias, showAlert)
+{
+	var brushes = sh.vars.discoveredBrushes,
+		result = null
+		;
+	
+	if (brushes == null) 
+	{
+		brushes = {};
+		
+		// Find all brushes
+		for (var brush in sh.brushes) 
+		{
+			var info = sh.brushes[brush],
+				aliases = info.aliases
+				;
+			
+			if (aliases == null) 
+				continue;
+			
+			// keep the brush name
+			info.brushName = brush.toLowerCase();
+			
+			for (var i = 0; i < aliases.length; i++) 
+				brushes[aliases[i]] = brush;
+		}
+		
+		sh.vars.discoveredBrushes = brushes;
+	}
+	
+	result = sh.brushes[brushes[alias]];
+
+	if (result == null && showAlert != false)
+		alert(sh.config.strings.noBrush + alias);
+	
+	return result;
+};
+
+/**
+ * Executes a callback on each line and replaces each line with result from the callback.
+ * @param {Object} str			Input string.
+ * @param {Object} callback		Callback function taking one string argument and returning a string.
+ */
+function eachLine(str, callback)
+{
+	var lines = splitLines(str);
+	
+	for (var i = 0; i < lines.length; i++)
+		lines[i] = callback(lines[i], i);
+		
+	return lines.join('\n');
+};
+
+/**
+ * This is a special trim which only removes first and last empty lines
+ * and doesn't affect valid leading space on the first line.
+ * 
+ * @param {String} str   Input string
+ * @return {String}      Returns string without empty first and last lines.
+ */
+function trimFirstAndLastLines(str)
+{
+	return str.replace(/^[ ]*[\n]+|[\n]*[ ]*$/g, '');
+};
+
+/**
+ * Parses key/value pairs into hash object.
+ * 
+ * Understands the following formats:
+ * - name: word;
+ * - name: [word, word];
+ * - name: "string";
+ * - name: 'string';
+ * 
+ * For example:
+ *   name1: value; name2: [value, value]; name3: 'value'
+ *   
+ * @param {String} str    Input string.
+ * @return {Object}       Returns deserialized object.
+ */
+function parseParams(str)
+{
+	var match, 
+		result = {},
+		arrayRegex = new XRegExp("^\\[(?<values>(.*?))\\]$"),
+		regex = new XRegExp(
+			"(?<name>[\\w-]+)" +
+			"\\s*:\\s*" +
+			"(?<value>" +
+				"[\\w-%#]+|" +		// word
+				"\\[.*?\\]|" +		// [] array
+				'".*?"|' +			// "" string
+				"'.*?'" +			// '' string
+			")\\s*;?",
+			"g"
+		)
+		;
+
+	while ((match = regex.exec(str)) != null) 
+	{
+		var value = match.value
+			.replace(/^['"]|['"]$/g, '') // strip quotes from end of strings
+			;
+		
+		// try to parse array value
+		if (value != null && arrayRegex.test(value))
+		{
+			var m = arrayRegex.exec(value);
+			value = m.values.length > 0 ? m.values.split(/\s*,\s*/) : [];
+		}
+		
+		result[match.name] = value;
+	}
+	
+	return result;
+};
+
+/**
+ * Wraps each line of the string into <code/> tag with given style applied to it.
+ * 
+ * @param {String} str   Input string.
+ * @param {String} css   Style name to apply to the string.
+ * @return {String}      Returns input string with each line surrounded by <span/> tag.
+ */
+function wrapLinesWithCode(str, css)
+{
+	if (str == null || str.length == 0 || str == '\n') 
+		return str;
+
+	str = str.replace(/</g, '&lt;');
+
+	// Replace two or more sequential spaces with &nbsp; leaving last space untouched.
+	str = str.replace(/ {2,}/g, function(m)
+	{
+		var spaces = '';
+		
+		for (var i = 0; i < m.length - 1; i++)
+			spaces += sh.config.space;
+		
+		return spaces + ' ';
+	});
+
+	// Split each line and apply <span class="...">...</span> to them so that
+	// leading spaces aren't included.
+	if (css != null) 
+		str = eachLine(str, function(line)
+		{
+			if (line.length == 0) 
+				return '';
+			
+			var spaces = '';
+			
+			line = line.replace(/^(&nbsp;| )+/, function(s)
+			{
+				spaces = s;
+				return '';
+			});
+			
+			if (line.length == 0) 
+				return spaces;
+			
+			return spaces + '<code class="' + css + '">' + line + '</code>';
+		});
+
+	return str;
+};
+
+/**
+ * Pads number with zeros until it's length is the same as given length.
+ * 
+ * @param {Number} number	Number to pad.
+ * @param {Number} length	Max string length with.
+ * @return {String}			Returns a string padded with proper amount of '0'.
+ */
+function padNumber(number, length)
+{
+	var result = number.toString();
+	
+	while (result.length < length)
+		result = '0' + result;
+	
+	return result;
+};
+
+/**
+ * Replaces tabs with spaces.
+ * 
+ * @param {String} code		Source code.
+ * @param {Number} tabSize	Size of the tab.
+ * @return {String}			Returns code with all tabs replaces by spaces.
+ */
+function processTabs(code, tabSize)
+{
+	var tab = '';
+	
+	for (var i = 0; i < tabSize; i++)
+		tab += ' ';
+
+	return code.replace(/\t/g, tab);
+};
+
+/**
+ * Replaces tabs with smart spaces.
+ * 
+ * @param {String} code    Code to fix the tabs in.
+ * @param {Number} tabSize Number of spaces in a column.
+ * @return {String}        Returns code with all tabs replaces with roper amount of spaces.
+ */
+function processSmartTabs(code, tabSize)
+{
+	var lines = splitLines(code),
+		tab = '\t',
+		spaces = ''
+		;
+	
+	// Create a string with 1000 spaces to copy spaces from... 
+	// It's assumed that there would be no indentation longer than that.
+	for (var i = 0; i < 50; i++) 
+		spaces += '                    '; // 20 spaces * 50
+			
+	// This function inserts specified amount of spaces in the string
+	// where a tab is while removing that given tab.
+	function insertSpaces(line, pos, count)
+	{
+		return line.substr(0, pos)
+			+ spaces.substr(0, count)
+			+ line.substr(pos + 1, line.length) // pos + 1 will get rid of the tab
+			;
+	};
+
+	// Go through all the lines and do the 'smart tabs' magic.
+	code = eachLine(code, function(line)
+	{
+		if (line.indexOf(tab) == -1) 
+			return line;
+		
+		var pos = 0;
+		
+		while ((pos = line.indexOf(tab)) != -1) 
+		{
+			// This is pretty much all there is to the 'smart tabs' logic.
+			// Based on the position within the line and size of a tab,
+			// calculate the amount of spaces we need to insert.
+			var spaces = tabSize - pos % tabSize;
+			line = insertSpaces(line, pos, spaces);
+		}
+		
+		return line;
+	});
+	
+	return code;
+};
+
+/**
+ * Performs various string fixes based on configuration.
+ */
+function fixInputString(str)
+{
+	var br = /<br\s*\/?>|&lt;br\s*\/?&gt;/gi;
+	
+	if (sh.config.bloggerMode == true)
+		str = str.replace(br, '\n');
+
+	if (sh.config.stripBrs == true)
+		str = str.replace(br, '');
+		
+	return str;
+};
+
+/**
+ * Removes all white space at the begining and end of a string.
+ * 
+ * @param {String} str   String to trim.
+ * @return {String}      Returns string without leading and following white space characters.
+ */
+function trim(str)
+{
+	return str.replace(/^\s+|\s+$/g, '');
+};
+
+/**
+ * Unindents a block of text by the lowest common indent amount.
+ * @param {String} str   Text to unindent.
+ * @return {String}      Returns unindented text block.
+ */
+function unindent(str)
+{
+	var lines = splitLines(fixInputString(str)),
+		indents = new Array(),
+		regex = /^\s*/,
+		min = 1000
+		;
+	
+	// go through every line and check for common number of indents
+	for (var i = 0; i < lines.length && min > 0; i++) 
+	{
+		var line = lines[i];
+		
+		if (trim(line).length == 0) 
+			continue;
+		
+		var matches = regex.exec(line);
+		
+		// In the event that just one line doesn't have leading white space
+		// we can't unindent anything, so bail completely.
+		if (matches == null) 
+			return str;
+			
+		min = Math.min(matches[0].length, min);
+	}
+	
+	// trim minimum common number of white space from the begining of every line
+	if (min > 0) 
+		for (var i = 0; i < lines.length; i++) 
+			lines[i] = lines[i].substr(min);
+	
+	return lines.join('\n');
+};
+
+/**
+ * Callback method for Array.sort() which sorts matches by
+ * index position and then by length.
+ * 
+ * @param {Match} m1	Left object.
+ * @param {Match} m2    Right object.
+ * @return {Number}     Returns -1, 0 or -1 as a comparison result.
+ */
+function matchesSortCallback(m1, m2)
+{
+	// sort matches by index first
+	if(m1.index < m2.index)
+		return -1;
+	else if(m1.index > m2.index)
+		return 1;
+	else
+	{
+		// if index is the same, sort by length
+		if(m1.length < m2.length)
+			return -1;
+		else if(m1.length > m2.length)
+			return 1;
+	}
+	
+	return 0;
+};
+
+/**
+ * Executes given regular expression on provided code and returns all
+ * matches that are found.
+ * 
+ * @param {String} code    Code to execute regular expression on.
+ * @param {Object} regex   Regular expression item info from <code>regexList</code> collection.
+ * @return {Array}         Returns a list of Match objects.
+ */ 
+function getMatches(code, regexInfo)
+{
+	function defaultAdd(match, regexInfo)
+	{
+		return match[0];
+	};
+	
+	var index = 0,
+		match = null,
+		matches = [],
+		func = regexInfo.func ? regexInfo.func : defaultAdd
+		;
+	
+	while((match = regexInfo.regex.exec(code)) != null)
+	{
+		var resultMatch = func(match, regexInfo);
+		
+		if (typeof(resultMatch) == 'string')
+			resultMatch = [new sh.Match(resultMatch, match.index, regexInfo.css)];
+
+		matches = matches.concat(resultMatch);
+	}
+	
+	return matches;
+};
+
+/**
+ * Turns all URLs in the code into <a/> tags.
+ * @param {String} code Input code.
+ * @return {String} Returns code with </a> tags.
+ */
+function processUrls(code)
+{
+	var gt = /(.*)((&gt;|&lt;).*)/;
+	
+	return code.replace(sh.regexLib.url, function(m)
+	{
+		var suffix = '',
+			match = null
+			;
+		
+		// We include &lt; and &gt; in the URL for the common cases like <http://google.com>
+		// The problem is that they get transformed into &lt;http://google.com&gt;
+		// Where as &gt; easily looks like part of the URL string.
+	
+		if (match = gt.exec(m))
+		{
+			m = match[1];
+			suffix = match[2];
+		}
+		
+		return '<a href="' + m + '">' + m + '</a>' + suffix;
+	});
+};
+
+/**
+ * Finds all <SCRIPT TYPE="syntaxhighlighter" /> elementss.
+ * @return {Array} Returns array of all found SyntaxHighlighter tags.
+ */
+function getSyntaxHighlighterScriptTags()
+{
+	var tags = document.getElementsByTagName('script'),
+		result = []
+		;
+	
+	for (var i = 0; i < tags.length; i++)
+		if (tags[i].type == 'syntaxhighlighter')
+			result.push(tags[i]);
+			
+	return result;
+};
+
+/**
+ * Strips <![CDATA[]]> from <SCRIPT /> content because it should be used
+ * there in most cases for XHTML compliance.
+ * @param {String} original	Input code.
+ * @return {String} Returns code without leading <![CDATA[]]> tags.
+ */
+function stripCData(original)
+{
+	var left = '<![CDATA[',
+		right = ']]>',
+		// for some reason IE inserts some leading blanks here
+		copy = trim(original),
+		changed = false,
+		leftLength = left.length,
+		rightLength = right.length
+		;
+	
+	if (copy.indexOf(left) == 0)
+	{
+		copy = copy.substring(leftLength);
+		changed = true;
+	}
+	
+	var copyLength = copy.length;
+	
+	if (copy.indexOf(right) == copyLength - rightLength)
+	{
+		copy = copy.substring(0, copyLength - rightLength);
+		changed = true;
+	}
+	
+	return changed ? copy : original;
+};
+
+
+/**
+ * Quick code mouse double click handler.
+ */
+function quickCodeHandler(e)
+{
+	var target = e.target,
+		highlighterDiv = findParentElement(target, '.syntaxhighlighter'),
+		container = findParentElement(target, '.container'),
+		textarea = document.createElement('textarea'),
+		highlighter
+		;
+
+	if (!container || !highlighterDiv || findElement(container, 'textarea'))
+		return;
+
+	highlighter = getHighlighterById(highlighterDiv.id);
+	
+	// add source class name
+	addClass(highlighterDiv, 'source');
+
+	// Have to go over each line and grab it's text, can't just do it on the
+	// container because Firefox loses all \n where as Webkit doesn't.
+	var lines = container.childNodes,
+		code = []
+		;
+	
+	for (var i = 0; i < lines.length; i++)
+		code.push(lines[i].innerText || lines[i].textContent);
+	
+	// using \r instead of \r or \r\n makes this work equally well on IE, FF and Webkit
+	code = code.join('\r');
+	
+	// inject <textarea/> tag
+	textarea.appendChild(document.createTextNode(code));
+	container.appendChild(textarea);
+	
+	// preselect all text
+	textarea.focus();
+	textarea.select();
+	
+	// set up handler for lost focus
+	attachEvent(textarea, 'blur', function(e)
+	{
+		textarea.parentNode.removeChild(textarea);
+		removeClass(highlighterDiv, 'source');
+	});
+};
+
+/**
+ * Match object.
+ */
+sh.Match = function(value, index, css)
+{
+	this.value = value;
+	this.index = index;
+	this.length = value.length;
+	this.css = css;
+	this.brushName = null;
+};
+
+sh.Match.prototype.toString = function()
+{
+	return this.value;
+};
+
+/**
+ * Simulates HTML code with a scripting language embedded.
+ * 
+ * @param {String} scriptBrushName Brush name of the scripting language.
+ */
+sh.HtmlScript = function(scriptBrushName)
+{
+	var brushClass = findBrush(scriptBrushName),
+		scriptBrush,
+		xmlBrush = new sh.brushes.Xml(),
+		bracketsRegex = null,
+		ref = this,
+		methodsToExpose = 'getDiv getHtml init'.split(' ')
+		;
+
+	if (brushClass == null)
+		return;
+	
+	scriptBrush = new brushClass();
+	
+	for(var i = 0; i < methodsToExpose.length; i++)
+		// make a closure so we don't lose the name after i changes
+		(function() {
+			var name = methodsToExpose[i];
+			
+			ref[name] = function()
+			{
+				return xmlBrush[name].apply(xmlBrush, arguments);
+			};
+		})();
+	
+	if (scriptBrush.htmlScript == null)
+	{
+		alert(sh.config.strings.brushNotHtmlScript + scriptBrushName);
+		return;
+	}
+	
+	xmlBrush.regexList.push(
+		{ regex: scriptBrush.htmlScript.code, func: process }
+	);
+	
+	function offsetMatches(matches, offset)
+	{
+		for (var j = 0; j < matches.length; j++) 
+			matches[j].index += offset;
+	}
+	
+	function process(match, info)
+	{
+		var code = match.code,
+			matches = [],
+			regexList = scriptBrush.regexList,
+			offset = match.index + match.left.length,
+			htmlScript = scriptBrush.htmlScript,
+			result
+			;
+
+		// add all matches from the code
+		for (var i = 0; i < regexList.length; i++)
+		{
+			result = getMatches(code, regexList[i]);
+			offsetMatches(result, offset);
+			matches = matches.concat(result);
+		}
+		
+		// add left script bracket
+		if (htmlScript.left != null && match.left != null)
+		{
+			result = getMatches(match.left, htmlScript.left);
+			offsetMatches(result, match.index);
+			matches = matches.concat(result);
+		}
+		
+		// add right script bracket
+		if (htmlScript.right != null && match.right != null)
+		{
+			result = getMatches(match.right, htmlScript.right);
+			offsetMatches(result, match.index + match[0].lastIndexOf(match.right));
+			matches = matches.concat(result);
+		}
+		
+		for (var j = 0; j < matches.length; j++)
+			matches[j].brushName = brushClass.brushName;
+			
+		return matches;
+	}
+};
+
+/**
+ * Main Highlither class.
+ * @constructor
+ */
+sh.Highlighter = function()
+{
+	// not putting any code in here because of the prototype inheritance
+};
+
+sh.Highlighter.prototype = {
+	/**
+	 * Returns value of the parameter passed to the highlighter.
+	 * @param {String} name				Name of the parameter.
+	 * @param {Object} defaultValue		Default value.
+	 * @return {Object}					Returns found value or default value otherwise.
+	 */
+	getParam: function(name, defaultValue)
+	{
+		var result = this.params[name];
+		return toBoolean(result == null ? defaultValue : result);
+	},
+	
+	/**
+	 * Shortcut to document.createElement().
+	 * @param {String} name		Name of the element to create (DIV, A, etc).
+	 * @return {HTMLElement}	Returns new HTML element.
+	 */
+	create: function(name)
+	{
+		return document.createElement(name);
+	},
+	
+	/**
+	 * Applies all regular expression to the code and stores all found
+	 * matches in the `this.matches` array.
+	 * @param {Array} regexList		List of regular expressions.
+	 * @param {String} code			Source code.
+	 * @return {Array}				Returns list of matches.
+	 */
+	findMatches: function(regexList, code)
+	{
+		var result = [];
+		
+		if (regexList != null)
+			for (var i = 0; i < regexList.length; i++) 
+				// BUG: length returns len+1 for array if methods added to prototype chain (oising@gmail.com)
+				if (typeof (regexList[i]) == "object")
+					result = result.concat(getMatches(code, regexList[i]));
+		
+		// sort and remove nested the matches
+		return this.removeNestedMatches(result.sort(matchesSortCallback));
+	},
+	
+	/**
+	 * Checks to see if any of the matches are inside of other matches. 
+	 * This process would get rid of highligted strings inside comments, 
+	 * keywords inside strings and so on.
+	 */
+	removeNestedMatches: function(matches)
+	{
+		// Optimized by Jose Prado (http://joseprado.com)
+		for (var i = 0; i < matches.length; i++) 
+		{ 
+			if (matches[i] === null)
+				continue;
+			
+			var itemI = matches[i],
+				itemIEndPos = itemI.index + itemI.length
+				;
+			
+			for (var j = i + 1; j < matches.length && matches[i] !== null; j++) 
+			{
+				var itemJ = matches[j];
+				
+				if (itemJ === null) 
+					continue;
+				else if (itemJ.index > itemIEndPos) 
+					break;
+				else if (itemJ.index == itemI.index && itemJ.length > itemI.length)
+					matches[i] = null;
+				else if (itemJ.index >= itemI.index && itemJ.index < itemIEndPos) 
+					matches[j] = null;
+			}
+		}
+		
+		return matches;
+	},
+	
+	/**
+	 * Creates an array containing integer line numbers starting from the 'first-line' param.
+	 * @return {Array} Returns array of integers.
+	 */
+	figureOutLineNumbers: function(code)
+	{
+		var lines = [],
+			firstLine = parseInt(this.getParam('first-line'))
+			;
+		
+		eachLine(code, function(line, index)
+		{
+			lines.push(index + firstLine);
+		});
+		
+		return lines;
+	},
+	
+	/**
+	 * Determines if specified line number is in the highlighted list.
+	 */
+	isLineHighlighted: function(lineNumber)
+	{
+		var list = this.getParam('highlight', []);
+		
+		if (typeof(list) != 'object' && list.push == null) 
+			list = [ list ];
+		
+		return indexOf(list, lineNumber.toString()) != -1;
+	},
+	
+	/**
+	 * Generates HTML markup for a single line of code while determining alternating line style.
+	 * @param {Integer} lineNumber	Line number.
+	 * @param {String} code Line	HTML markup.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineHtml: function(lineIndex, lineNumber, code)
+	{
+		var classes = [
+			'line',
+			'number' + lineNumber,
+			'index' + lineIndex,
+			'alt' + (lineNumber % 2 == 0 ? 1 : 2).toString()
+		];
+		
+		if (this.isLineHighlighted(lineNumber))
+		 	classes.push('highlighted');
+		
+		if (lineNumber == 0)
+			classes.push('break');
+			
+		return '<div class="' + classes.join(' ') + '">' + code + '</div>';
+	},
+	
+	/**
+	 * Generates HTML markup for line number column.
+	 * @param {String} code			Complete code HTML markup.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineNumbersHtml: function(code, lineNumbers)
+	{
+		var html = '',
+			count = splitLines(code).length,
+			firstLine = parseInt(this.getParam('first-line')),
+			pad = this.getParam('pad-line-numbers')
+			;
+		
+		if (pad == true)
+			pad = (firstLine + count - 1).toString().length;
+		else if (isNaN(pad) == true)
+			pad = 0;
+			
+		for (var i = 0; i < count; i++)
+		{
+			var lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i,
+				code = lineNumber == 0 ? sh.config.space : padNumber(lineNumber, pad)
+				;
+				
+			html += this.getLineHtml(i, lineNumber, code);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Splits block of text into individual DIV lines.
+	 * @param {String} code			Code to highlight.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns highlighted code in HTML form.
+	 */
+	getCodeLinesHtml: function(html, lineNumbers)
+	{
+		html = trim(html);
+		
+		var lines = splitLines(html),
+			padLength = this.getParam('pad-line-numbers'),
+			firstLine = parseInt(this.getParam('first-line')),
+			html = '',
+			brushName = this.getParam('brush')
+			;
+
+		for (var i = 0; i < lines.length; i++)
+		{
+			var line = lines[i],
+				indent = /^(&nbsp;|\s)+/.exec(line),
+				spaces = null,
+				lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i;
+				;
+
+			if (indent != null)
+			{
+				spaces = indent[0].toString();
+				line = line.substr(spaces.length);
+				spaces = spaces.replace(' ', sh.config.space);
+			}
+
+			line = trim(line);
+			
+			if (line.length == 0)
+				line = sh.config.space;
+			
+			html += this.getLineHtml(
+				i,
+				lineNumber, 
+				(spaces != null ? '<code class="' + brushName + ' spaces">' + spaces + '</code>' : '') + line
+			);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Returns HTML for the table title or empty string if title is null.
+	 */
+	getTitleHtml: function(title)
+	{
+		return title ? '<caption>' + title + '</caption>' : '';
+	},
+	
+	/**
+	 * Finds all matches in the source code.
+	 * @param {String} code		Source code to process matches in.
+	 * @param {Array} matches	Discovered regex matches.
+	 * @return {String} Returns formatted HTML with processed mathes.
+	 */
+	getMatchesHtml: function(code, matches)
+	{
+		var pos = 0, 
+			result = '',
+			brushName = this.getParam('brush', '')
+			;
+		
+		function getBrushNameCss(match)
+		{
+			var result = match ? (match.brushName || brushName) : brushName;
+			return result ? result + ' ' : '';
+		};
+		
+		// Finally, go through the final list of matches and pull the all
+		// together adding everything in between that isn't a match.
+		for (var i = 0; i < matches.length; i++) 
+		{
+			var match = matches[i],
+				matchBrushName
+				;
+			
+			if (match === null || match.length === 0) 
+				continue;
+			
+			matchBrushName = getBrushNameCss(match);
+			
+			result += wrapLinesWithCode(code.substr(pos, match.index - pos), matchBrushName + 'plain')
+					+ wrapLinesWithCode(match.value, matchBrushName + match.css)
+					;
+
+			pos = match.index + match.length + (match.offset || 0);
+		}
+
+		// don't forget to add whatever's remaining in the string
+		result += wrapLinesWithCode(code.substr(pos), getBrushNameCss() + 'plain');
+
+		return result;
+	},
+	
+	/**
+	 * Generates HTML markup for the whole syntax highlighter.
+	 * @param {String} code Source code.
+	 * @return {String} Returns HTML markup.
+	 */
+	getHtml: function(code)
+	{
+		var html = '',
+			classes = [ 'syntaxhighlighter' ],
+			tabSize,
+			matches,
+			lineNumbers
+			;
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+
+		className = 'syntaxhighlighter';
+
+		if (this.getParam('collapse') == true)
+			classes.push('collapsed');
+		
+		if ((gutter = this.getParam('gutter')) == false)
+			classes.push('nogutter');
+
+		// add custom user style name
+		classes.push(this.getParam('class-name'));
+
+		// add brush alias to the class name for custom CSS
+		classes.push(this.getParam('brush'));
+
+		code = trimFirstAndLastLines(code)
+			.replace(/\r/g, ' ') // IE lets these buggers through
+			;
+
+		tabSize = this.getParam('tab-size');
+
+		// replace tabs with spaces
+		code = this.getParam('smart-tabs') == true
+			? processSmartTabs(code, tabSize)
+			: processTabs(code, tabSize)
+			;
+
+		// unindent code by the common indentation
+		code = unindent(code);
+
+		if (gutter)
+			lineNumbers = this.figureOutLineNumbers(code);
+		
+		// find matches in the code using brushes regex list
+		matches = this.findMatches(this.regexList, code);
+		// processes found matches into the html
+		html = this.getMatchesHtml(code, matches);
+		// finally, split all lines so that they wrap well
+		html = this.getCodeLinesHtml(html, lineNumbers);
+
+		// finally, process the links
+		if (this.getParam('auto-links'))
+			html = processUrls(html);
+		
+		if (typeof(navigator) != 'undefined' && navigator.userAgent && navigator.userAgent.match(/MSIE/))
+			classes.push('ie');
+		
+		html = 
+			'<div id="' + getHighlighterId(this.id) + '" class="' + classes.join(' ') + '">'
+				+ (this.getParam('toolbar') ? sh.toolbar.getHtml(this) : '')
+				+ '<table border="0" cellpadding="0" cellspacing="0">'
+					+ this.getTitleHtml(this.getParam('title'))
+					+ '<tbody>'
+						+ '<tr>'
+							+ (gutter ? '<td class="gutter">' + this.getLineNumbersHtml(code) + '</td>' : '')
+							+ '<td class="code">'
+								+ '<div class="container">'
+									+ html
+								+ '</div>'
+							+ '</td>'
+						+ '</tr>'
+					+ '</tbody>'
+				+ '</table>'
+			+ '</div>'
+			;
+			
+		return html;
+	},
+	
+	/**
+	 * Highlights the code and returns complete HTML.
+	 * @param {String} code     Code to highlight.
+	 * @return {Element}        Returns container DIV element with all markup.
+	 */
+	getDiv: function(code)
+	{
+		if (code === null) 
+			code = '';
+		
+		this.code = code;
+
+		var div = this.create('div');
+
+		// create main HTML
+		div.innerHTML = this.getHtml(code);
+		
+		// set up click handlers
+		if (this.getParam('toolbar'))
+			attachEvent(findElement(div, '.toolbar'), 'click', sh.toolbar.handler);
+		
+		if (this.getParam('quick-code'))
+			attachEvent(findElement(div, '.code'), 'dblclick', quickCodeHandler);
+		
+		return div;
+	},
+	
+	/**
+	 * Initializes the highlighter/brush.
+	 *
+	 * Constructor isn't used for initialization so that nothing executes during necessary
+	 * `new SyntaxHighlighter.Highlighter()` call when setting up brush inheritence.
+	 *
+	 * @param {Hash} params Highlighter parameters.
+	 */
+	init: function(params)
+	{
+		this.id = guid();
+		
+		// register this instance in the highlighters list
+		storeHighlighter(this);
+		
+		// local params take precedence over defaults
+		this.params = merge(sh.defaults, params || {})
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+	},
+	
+	/**
+	 * Converts space separated list of keywords into a regular expression string.
+	 * @param {String} str    Space separated keywords.
+	 * @return {String}       Returns regular expression string.
+	 */
+	getKeywords: function(str)
+	{
+		str = str
+			.replace(/^\s+|\s+$/g, '')
+			.replace(/\s+/g, '|')
+			;
+		
+		return '\\b(?:' + str + ')\\b';
+	},
+	
+	/**
+	 * Makes a brush compatible with the `html-script` functionality.
+	 * @param {Object} regexGroup Object containing `left` and `right` regular expressions.
+	 */
+	forHtmlScript: function(regexGroup)
+	{
+		this.htmlScript = {
+			left : { regex: regexGroup.left, css: 'script' },
+			right : { regex: regexGroup.right, css: 'script' },
+			code : new XRegExp(
+				"(?<left>" + regexGroup.left.source + ")" +
+				"(?<code>.*?)" +
+				"(?<right>" + regexGroup.right.source + ")",
+				"sgi"
+				)
+		};
+	}
+}; // end of Highlighter
+
+return sh;
+}(); // end of anonymous function
+
+// CommonJS
+typeof(exports) != 'undefined' ? exports['SyntaxHighlighter'] = SyntaxHighlighter : null;
+</script><script type="text/javascript">// (inc clojure-brush) ;; an improved SyntaxHighlighter brush for clojure
+//
+// Copyright (C) 2011 Andrew Brehaut
+//
+// Distributed under the Eclipse Public License, the same as Clojure.
+//
+// https://github.com/brehaut/inc-clojure-brush
+//
+// Written by Andrew Brehaut
+// V0.9.1, November 2011
+
+if (typeof net == "undefined") net = {};
+if (!(net.brehaut)) net.brehaut = {};
+
+net.brehaut.ClojureTools = (function (SH) {
+  "use strict";
+  // utiliies
+  if (!Object.create) Object.create = function object(o) {
+    function F() {};
+    F.prototype = o;  
+    return new F();
+  };
+        
+  // data
+  
+  function Token(value, index, tag, length) {
+    this.value = value;
+    this.index = index;
+    this.length = length || value.length;
+    this.tag = tag;
+    this.secondary_tags = {};
+  }
+  
+  // null_token exists so that LispNodes that have not had a closing tag attached
+  // can have a dummy token to simplify annotation
+  var null_token = new Token("", -1, "null", -1);
+  
+  /* LispNodes are aggregate nodes for sexpressions. 
+   *
+   */
+  function LispNode(tag, children, opening) {
+    this.tag = tag;            // current metadata for syntax inference
+    this.parent = null;        // the parent expression
+    this.list = children;      // all the child forms in order
+    this.opening = opening;    // the token that opens this form.
+    this.closing = null_token; // the token that closes this form.
+    this.meta = null;          // metadata nodes will be attached here if they are found
+  }
+
+  var null_lispnode = new LispNode("null", [], null_token);
+
+  
+  function PrefixNode(tag, token, attached_node) {
+    this.tag = tag;
+    this.token = token;
+    this.attached_node = attached_node;
+    this.parent = null;
+  }
+
+  
+  
+  // tokenize
+
+  function tokenize(code) {
+    var tokens = [];
+    var tn = 0;
+    
+    var zero = "0".charCodeAt(0);
+    var nine = "9".charCodeAt(0); 
+    var lower_a = "a".charCodeAt(0);
+    var lower_f = "f".charCodeAt(0);    
+    var upper_a = "A".charCodeAt(0);
+    var upper_f = "F".charCodeAt(0);
+    
+    var dispatch = false; // have we just seen a # character?
+    
+    // i tracks the start of the current window
+    // extent is the window for slicing
+    
+    for (var i = 0, 
+             extent = i, 
+             j = code.length; 
+             i < j && extent <= j;) {          
+                
+      var c = code[i];
+      
+      // we care about capturing the whole token when dispatch is used, so back up the
+      // starting index by 1
+      if (dispatch) i--; 
+      
+      switch (c) {
+        // dispatch alters the value of the next thing read
+        case "#":
+          dispatch = true;
+          i++;
+          extent++;
+          continue;
+          
+        case " ":    // ignore whitespace
+        case "\t":
+        case "\n":
+        case "\r":
+        case ",":   
+          extent++
+          break; 
+          
+        // simple terms
+        case "^":
+        case "`":
+        case ")":
+        case "[":
+        case "]":
+        case "}":
+        case "@":
+          tokens[tn++] = new Token(c, i, c, ++extent - i);
+          break;
+        
+        case "'":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#'" : "'", extent - i);
+          break
+        
+        case "(":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "(", extent - i);
+          break;          
+          
+        case "{":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#{" : "{", extent - i);
+          break;  
+        
+        case "\\":
+          if (code.slice(i + 1, i + 8) === "newline") {
+            tokens[tn++] = new Token("\\newline", i, "value", 8);
+            extent = i + 9; 
+          }
+          else if (code.slice(i + 1, i + 6) === "space") {
+            tokens[tn++] = new Token("\\space", i, "value", 6);
+            extent = i + 6;
+          }
+          else if (code.slice(i + 1, i + 4) === "tab") {
+            tokens[tn++] = new Token("\\tab", i, "value", 4);
+            extent = i + 5;
+          } // work around fun bug with &,>,< in character literals
+          else if (code.slice(i + 1, i + 6) === "&amp;") {
+            tokens[tn++] = new Token("\\&amp;", i, "value", 6);
+            extent = i + 6; 
+          }
+          else if (code.slice(i + 1, i + 5) === "&lt;") {
+            tokens[tn++] = new Token("\\&lt;", i, "value", 5);
+            extent = i + 5;
+          }
+          else if (code.slice(i + 1, i + 5) === "&gt;") {
+            tokens[tn++] = new Token("\\&gt;", i, "value", 5);
+            extent = i + 5;
+          }
+          
+          else {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", 2);
+          }
+          break;
+        
+        case "~": // slice
+          if (code[i + 1] === "@") {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "splice", 2);
+          }
+          else {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "unquote", 2);
+          }
+          break;
+        
+        // complicated terms
+        case "\"": // strings and regexps
+          for (extent++; extent <= j; extent++) {
+            if (code[extent] === "\\") extent++;
+            else if (code[extent] === "\"") break;
+          }
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "regexp" : "string", extent - i);       
+          break;
+          
+        case ";":
+          for (; extent <= j && code[extent] !== "\n" && code[extent] !== "\r"; extent++);
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "comments", extent - i);   
+          break;
+        
+        case "+": // numbers; fall through to symbol for + and - not prefixing a number
+        case "-":
+        case "0":
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+        case "5":
+        case "6":
+        case "7":
+        case "8":
+        case "9":
+        // todo: exponents, hex
+        // http://my.safaribooksonline.com/9781449310387/14?reader=pf&readerfullscreen=&readerleftmenu=1
+          var c2 = code.charCodeAt(i + 1);
+          if (((c === "+" || c === "-") && (c2 >= zero && c2 <= nine)) // prefixes
+              || (c !== "+" && c !== "-")) {
+            if (c === "+" || c === "-") extent++; 
+            for (; extent <= j; extent++) {
+              var charCode = code.charCodeAt(extent);
+              if (charCode < zero || charCode > nine) break;
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "r" || c === "R" || c === "/" || c === ".") // interstitial characters
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "x" || c === "X") && 
+                ((c2 >= zero && c2 <= nine) 
+                 || (c2 >= lower_a && c2 <= lower_f)
+                 || (c2 >= upper_a && c2 <= upper_f))) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (((charCode >= zero && charCode <= nine) 
+                    || (charCode >= lower_a && charCode <= lower_f)
+                    || (charCode >= upper_a && charCode <= upper_f))) continue;
+                break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "e" || c === "E") 
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            if (c === "N" || c === "M") extent++;
+
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", extent - i);
+            break;
+          }
+
+        case "_":
+          if (dispatch && c === "_") {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "skip", extent - i);
+            break;
+          } // if not a skip, fall through to symbols
+        
+        // Allow just about any other symbol as a symbol. This is far more permissive than 
+        // clojure actually allows, but should catch any weirdo crap that accidentally gets
+        // into the code.
+        default: 
+          for (extent++; extent <= j; extent++) {
+            switch (code[extent]) {
+              case " ":
+              case "\t":
+              case "\n":
+              case "\r":
+              case "\\":
+              case ",":
+              case "{":
+              case "}":
+              case "(":
+              case ")":
+              case "[":
+              case "]":
+              case "^":
+              case "`":
+              case "@":   
+                break;
+              case ";":   
+                // theres a weird bug via syntax highligher that gives us escaped entities.
+                // need to watch out for these
+                if (code.slice(extent-3, extent+1) === "&lt;"
+                    ||code.slice(extent-3, extent+1) === "&gt;"
+                    ||code.slice(extent-4, extent+1) === "&amp;") {
+                  continue;
+                }
+                break;
+              default:
+                continue;
+            }
+            break;
+          }
+          
+          var value = code.slice(i, extent);
+          var tag = "symbol";
+          if (value[0] == ":") {
+            tag = "keyword";
+          }
+          else if (value === "true" || value === "false" || value === "nil") {
+            tag = "value";
+          }
+          tokens[tn++] = new Token(value, i, tag, extent - i);
+      }
+      
+      dispatch = false;
+      i = extent;
+    } 
+
+    return tokens;
+  }
+
+
+  function build_tree(tokens) {
+    var toplevel = {
+      list: [], 
+      tag: "toplevel", 
+      parent: null, 
+      opening: null,
+      closing: null,
+      depth: -1
+    };
+    
+    // loop variables hoisted out as semi globals to track position in token stream
+    var i = -1;
+    var j = tokens.length;
+    
+    function parse_one(t) {
+      // ignore special tokens and forms that dont belong in the tree
+      for (; t && (t.tag === "comments" || t.tag === "invalid" || t.tag == "skip") && i < j; ) {
+        if (t.tag === "skip") {
+          t.tag = "preprocessor";
+          annotate_comment(parse_one(tokens[++i]));
+        }
+        t = tokens[++i];
+      }
+      
+      if (!t) return {}; // hackity hack
+      
+      switch (t.tag) {
+        case "{":
+          return build_aggregate(new LispNode("map", [], t), "}");
+        case "(":
+          return build_aggregate(new LispNode("list", [], t), ")");
+        case "#{":
+          return build_aggregate(new LispNode("set", [], t), "}");
+        case "[":
+          return build_aggregate(new LispNode("vector", [], t), "]");
+        case "'":
+          return new PrefixNode("quote", t, parse_one(tokens[++i]));
+        case "#'":
+          return new PrefixNode("varquote", t, parse_one(tokens[++i]));  
+        case "@":
+          return new PrefixNode("deref", t, parse_one(tokens[++i]));  
+        case "`":
+          return new PrefixNode("quasiquote", t, parse_one(tokens[++i]));  
+        case "unquote":
+          return new PrefixNode("unquote", t, parse_one(tokens[++i]));
+        case "splice":
+          return new PrefixNode("splice", t, parse_one(tokens[++i]));  
+        case "^":
+          t.tag = "meta";
+          var meta = parse_one(tokens[++i]);
+          var next = parse_one(tokens[++i]);
+          next.meta = meta;
+          return next;
+      }
+      
+      return t;
+    }
+    
+    // build_aggregate collects to ether sub forms for one aggregate for. 
+    function build_aggregate(current, expected_closing) {
+      for (i++; i < j; i++) {
+        var t = tokens[i];
+
+        if (t.tag === "}" || t.tag === ")" || t.tag === "]") {
+          if (t.tag !== expected_closing) t.tag = "invalid";
+          current.closing = t;
+          if (expected_closing) return current;
+        }
+        var node = parse_one(t);
+
+        node.parent = current;
+        current.list[current.list.length] = node;
+      }
+      
+      return current;
+    }
+    
+    build_aggregate(toplevel, null);
+    
+    return toplevel;
+  }
+
+  // annotation rules to apply to a form based on its head
+
+  var show_locals = true;  // HACK. would rather not use a (semi)-global.
+
+  /* annotate_comment is a special case annotation. 
+   * in addition to its role in styling specific forms, it is called by parse_one to
+   * ignore any forms skipped with #_
+   */ 
+  function annotate_comment(exp) {
+    exp.tag = "comments";
+
+    if (exp.list) {
+      exp.opening.tag = "comments";
+      exp.closing.tag = "comments";
+    
+      for (var i = 0; i < exp.list.length; i++) {
+        var child = exp.list[i];
+        if (child.list) {
+          annotate_comment(child);
+        }
+        if (child.attached_node) {
+          annotate_comment(child.attached_node);
+        }
+        else {
+          child.tag = "comments";
+        }
+      }
+    }
+  }
+
+  /* custom annotation rules are stored here */
+  var annotation_rules = {};
+  
+  // this function is exposed to allow ad hoc extension of the customisation rules
+  function register_annotation_rule(names, rule) {
+    for (var i = 0; i < names.length; i++) {
+      annotation_rules[names[i]] = rule;
+    }
+  }
+
+
+  function annotate_destructuring (exp, scope) {
+    if (exp.list) {
+      if (exp.tag === "vector") {
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_destructuring(exp.list[i], scope);
+        }
+      } 
+      else if (exp.tag === "map") {
+        for (var i = 0; i < exp.list.length; i += 2) {
+          var key = exp.list[i];
+          var val = exp.list[i + 1];
+          
+          if (key.tag === "keyword" && val.tag === "vector") {
+            for (var ii = 0, jj = val.list.length; ii < jj; ii++) {
+              if (val.list[ii].tag !== "symbol") continue;
+              val.list[ii].tag = "variable";
+              scope[val.list[ii].value] = true;
+            }
+          }
+          else {
+            annotate_destructuring(key, scope);
+            annotate_expressions(val, scope);
+          }
+        } 
+      }
+    } 
+    else if (exp.tag === "symbol" && (exp.value !== "&" && exp.value !== "&amp;")){
+      exp.tag = "variable";
+      scope[exp.value] = true;
+    }
+  }
+
+  function _annotate_binding_vector (exp, scope) {
+    if (exp.tag !== "vector") return;
+  
+    var bindings = exp.list;
+
+    if (bindings.length % 2 === 1) return;
+    
+    for (var i = 0; i < bindings.length; i += 2) {
+      annotate_destructuring(bindings[i], scope);
+      annotate_expressions(bindings[i + 1], scope);
+    }    
+  }
+
+  function annotate_binding (exp, scope) {
+    var bindings = exp.list[1];
+    if (!show_locals) return; // HACK
+
+    if (bindings) {
+      scope = Object.create(scope);
+      _annotate_binding_vector(bindings, scope);
+    }
+    for (var i = 2; i < exp.list.length; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function _annotate_function_body (exp, scope, start_idx) {
+    var argvec = exp.list[start_idx];
+    if (argvec.tag !== "vector") return;
+
+    scope = Object.create(scope);
+
+    for (var i = 0, j = argvec.list.length; i < j; i++) {
+      annotate_destructuring(argvec.list[i], scope);
+    }
+    
+    for (var i = start_idx, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function annotate_function (exp, scope) {
+    for (var i = 1, j = exp.list.length; i < j; i++) {
+      var child = exp.list[i];
+      
+      if (child.tag === "vector") {
+        _annotate_function_body (exp, scope, i);
+        return;
+      }
+      else if (child.tag === "list") {
+        _annotate_function_body(child, scope, 0)
+      }
+    }
+  }
+  
+  function annotate_letfn (exp, scope) {
+    scope = Object.create(scope);
+    var bindings = exp.list[1];
+    
+    var fn;
+    for (var i = 0, j = bindings.list.length; i < j; i++) {
+      fn = bindings.list[i];
+      if (!fn.list[0]) continue;
+      fn.list[0].tag = "variable";
+      scope[fn.list[0].value] = true;
+    }
+    
+    for (i = 0, j = bindings.list.length; i < j; i++) {
+      var fn = bindings.list[i];
+      annotate_function(fn, scope);
+    }
+    
+    for (i = 2, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+
+  register_annotation_rule(
+    ["comment"],
+    annotate_comment
+  );
+  
+  register_annotation_rule(
+    ["let", "when-let", "if-let", "binding", "doseq", "for", "dotimes", "let*"],
+    annotate_binding
+  );
+  
+  register_annotation_rule(
+    ["defn", "defn-", "fn", "bound-fn", "defmacro", "fn*", "defmethod"],
+    annotate_function
+  );
+  
+  register_annotation_rule(
+    ["letfn"],
+    annotate_letfn
+  );
+
+  // standard annotations
+
+  function _annotate_metadata_recursive(meta, scope) {
+    if (!meta) return;
+
+    if (meta.list !== undefined && meta.list !== null) {
+      for (var i = 0, j = meta.list.length; i < j; i++) {
+        meta.opening.secondary_tags.meta = true
+        meta.closing.secondary_tags.meta = true
+        _annotate_metadata_recursive(meta.list[i], scope);
+      }
+    }
+    else if (meta.attached_node) {
+      meta.token.secondary_tags.meta = true;
+      _annotate_metadata_recursive(meta.attached_node, scope);
+    }
+    else {
+      meta.secondary_tags.meta = true;
+    }
+  }
+  
+  function annotate_metadata(exp) {
+    if (!(exp && exp.meta)) return;
+    var meta = exp.meta;
+    
+     annotate_expressions(meta, {});    
+    _annotate_metadata_recursive(meta, {});
+  }
+
+
+  function annotate_quoted(exp, scope) {
+    if (!exp) return;
+
+    if (exp.list !== undefined && exp.list !== null) {
+      for (var i = 0, j = exp.list.length; i < j; i++) {
+        exp.opening.secondary_tags.quoted = true
+        exp.closing.secondary_tags.quoted = true
+        annotate_quoted(exp.list[i], scope);
+      }
+    }
+    else if (exp.attached_node) {
+      if (exp.tag === "unquote" || exp.tag === "splice") return;
+      exp.token.secondary_tags.quoted = true;
+      annotate_quoted(exp.attached_node, scope);
+    }
+    else {
+      exp.secondary_tags.quoted = true;
+    }
+  }
+
+
+  function annotate_expressions(exp, scope) {
+    annotate_metadata(exp);
+    
+    switch (exp.tag) {
+      case "toplevel": 
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "list": // functions, macros, special forms, comments
+        var head = exp.list[0];
+      
+        if (head) {
+          if (head.tag === "list" || head.tag === "vector" 
+           || head.tag === "map" || head.tag === "set") {
+            annotate_expressions(head, scope);
+          }
+          else if (head.attached_node) {
+            annotate_expressions(head.attached_node, scope);
+          }
+          else {
+            head.tag = (head.value.match(/(^\.)|(\.$)|[A-Z].*\//)
+                        ? "method"
+                        : "function");
+          }
+
+          // apply specific rules
+          if (annotation_rules.hasOwnProperty(head.value)) {
+            annotation_rules[head.value](exp, scope);
+          } 
+          else {
+            for (var i = 1; i < exp.list.length; i++) {
+              annotate_expressions(exp.list[i], scope);
+            }
+          } 
+        }
+        else { // empty list
+          exp.opening.tag = "value";
+          exp.closing.tag = "value";
+        }
+      
+        break;
+      
+      case "vector": // data
+      case "map":
+      case "set":
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "symbol":
+        if (exp.value.match(/[A-Z].*\/[A-Z_]+/)) {
+          exp.tag = "constant";
+        }
+        else if (show_locals && scope[exp.value]) {
+          exp.tag = "variable";
+        }
+        else if (exp.tag === "symbol" && exp.value.match(/([A-Z].*\/)?[A-Z_]+/)) {
+          exp.tag = "type";
+        }
+        break;
+      
+      case "quote":
+      case "quasiquote":
+        annotate_quoted(exp.attached_node, scope);
+        
+      default:
+        if (exp.attached_node) annotate_expressions(exp.attached_node, scope);
+    }
+  }
+
+  // translation of tag to css:
+  var css_translation = {
+    "constant":     "constants",
+    "keyword":      "constants",
+    "method":       "color1",
+    "type":         "color3", 
+    "function":     "functions",
+    "string":       "string",
+    "regexp":       "string",
+    "value":        "value",
+    "comments":     "comments",
+    "symbol":       "symbol",
+    "variable":     "variable",
+    "splice":       "preprocessor", 
+    "unquote":      "preprocessor",     
+    "preprocessor": "preprocessor",
+    "meta":         "preprocessor", 
+    "'":            "preprocessor", 
+    "#'":           "preprocessor",    
+    "(":            "plain",
+    ")":            "plain",
+    "{":            "keyword",
+    "}":            "keyword",
+    "#{":           "keyword",   
+    "[":            "keyword",
+    "]":            "keyword",
+    "invalid":      "invalid",
+    "@":            "plain" 
+  };
+  
+  function translate_tags_to_css(tokens) {
+    for (var i = 0, j = tokens.length; i < j; i++) {
+      var token = tokens[i];
+      token.css = css_translation[token.tag];
+      for (var k in token.secondary_tags) if (token.secondary_tags.hasOwnProperty(k))
+        token.css += " " + k ;
+    };
+  }
+  
+  
+  // create the new brush
+
+  SH.brushes.Clojure = function () {};
+  SH.brushes.Clojure.prototype = new SyntaxHighlighter.Highlighter();
+  
+  SH.brushes.Clojure.prototype.findMatches = function find_matches (regexpList, code) {
+    // this is a nasty global hack. need to resolve this
+    if (this.params && this.params.locals) {
+      show_locals = this.params.locals === true || this.params.locals === "true"; 
+    }
+    else {
+      show_locals = true;
+    }
+    
+    var tokens = tokenize(code);
+    annotate_expressions(build_tree(tokens), {});
+    translate_tags_to_css(tokens);
+
+    return tokens;
+  };
+  
+  SH.brushes.Clojure.aliases = ['clojure', 'Clojure', 'clj'];
+  SH.brushes.Clojure.register_annotation_rule = register_annotation_rule;
+
+  return {
+    tokenize: tokenize,
+    build_tree: build_tree
+  };
+})(SyntaxHighlighter);
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.0</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.schema">protobuf.schema</a></li><li><a href="#protobuf.codec">protobuf.codec</a></li><li><a href="#protobuf.core">protobuf.core</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
+  (:import
+    (clojure.lang IDeref
+                  ISeq
+                  IPersistentMap
+                  IPersistentSet
+                  IPersistentCollection))
+  (:refer-clojure :exclude [update]))</pre></td></tr><tr><td class="docs"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn as-fn
+  [x]
+  (if (ifn? x) x, (constantly x)))</pre></td></tr><tr><td class="docs"><p>Update the given set using an existence map.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn into-set
+  [set map]
+  (if (map? map)
+    (reduce (fn [set [k v]] ((if v conj disj) set k))
+            set map)
+    (into set map)))</pre></td></tr><tr><td class="docs"><p>Walk through clauses, a series of predicate/transform pairs. The
+  first predicate that x satisfies has its transformation clause
+  called on x. Predicates or transforms may be values (eg true or nil)
+  rather than functions; these will be treated as functions that
+  return that value.
+  The last "pair" may be only a transform with no pred: in that case it
+  is unconditionally used to transform x, if nothing previously matched.
+  If no predicate matches, then x is returned unchanged.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn fix
+  [x &amp; clauses]
+  (let [call #((as-fn %) x)]
+    (first (or (seq (for [[pred &amp; [transform :as exists?]] (partition-all 2 clauses)
+                          :let [[pred transform] ;; handle odd number of clauses
+                                (if exists? [pred transform] [true pred])]
+                          :when (call pred)]
+                      (call transform)))
+               [x]))))</pre></td></tr><tr><td class="docs"><p>A "curried" version of fix, which sets the clauses once, yielding a
+  function that calls fix with the specified first argument.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn to-fix
+  [&amp; clauses]
+  (fn [x]
+    (apply fix x clauses)))</pre></td></tr><tr><td class="docs"><p>A macro combining the features of fix and fixing, by using parentheses to group the
+   additional arguments to each clause:
+   (-> x
+       (given string? read-string
+              map? (dissoc :x :y :z)
+              even? (/ 2)))</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro given
+  [x &amp; clauses]
+  (let [[clauses default] (if (even? (count clauses))
+                            [clauses `identity]
+                            [(butlast clauses) (last clauses)])]
+    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
+                     arg [pred `#(-&gt; % ~transform)]]
+                 arg)
+          ~default)))</pre></td></tr><tr><td class="docs"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
+  flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro map-entry
+  [a b]
+  `(clojure.lang.MapEntry. ~a ~b))</pre></td></tr><tr><td class="docs"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
+  function that will take the old value and any supplied args and return the new value, and returns
+  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
+  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
+  values are not re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update-in*
+  [m keys f &amp; args]
+  (if-let [[k &amp; ks] (seq keys)]
+    (let [old (get m k)
+          new (apply update-in* old ks f args)]
+      (if (identical? old new)
+        m
+        (assoc m k new)))
+     (apply f m args)))</pre></td></tr><tr><td class="docs"><p>Update a value for the given key in a map where f is a function that takes the previous value and
+  the supplied args and returns the new value. Like update-in*, unchanged values are not
+  re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update
+  [m key f &amp; args]
+  (apply update-in* m [key] f args))</pre></td></tr><tr><td class="docs"><p>Create a new map from m by calling function f on each value to get a new value.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn map-vals
+  [m f &amp; args]
+  (when m
+    (into {}
+          (for [[k v] m]
+            (map-entry k (apply f v args))))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol Combiner
+  (combine-onto [left right]
+  &quot;Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.&quot;))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol Combiner
+  IPersistentMap
+  (combine-onto [this other]
+    (merge-with combine-onto this other))
+
+  IPersistentSet
+  (combine-onto [this other]
+    (into-set this other))
+
+  ISeq
+  (combine-onto [this other]
+    (concat this other))
+
+  IPersistentCollection
+  (combine-onto [this other]
+    (into this other))
+
+  Object
+  (combine-onto [this other]
+    other)
+
+  nil
+  (combine-onto [this other]
+    other))</pre></td></tr><tr><td class="docs"><p>Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn combine
+  [a b]
+  (combine-onto a b))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn catbytes
+  [&amp; args]
+  (let [out-buf (byte-array (loop [len 0, args (seq args)]
+                              (if-let [[arg &amp; args] args]
+                                (recur (+ len (alength ^bytes arg)) args)
+                                len)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array &amp; more] (seq args)]
+        (let [size (alength array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))</pre></td></tr><tr><td class="docs"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn walk
+  [inner outer schema]
+  (outer
+   (case (:type schema)
+     :struct           (update schema :fields map-vals inner)
+     (:set :list :map) (-&gt; schema
+                           (given :values (update :values inner))
+                           (given :keys   (update :keys   inner)))
+     schema)))</pre></td></tr><tr><td class="docs"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each
+  and type with the result of calling f on it.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn postwalk
+  [f schema]
+  (walk (partial postwalk f) f schema))</pre></td></tr><tr><td class="docs"><p>Like postwalk, but do a pre-order traversal.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn prewalk
+  [f schema]
+  (walk (partial prewalk f) identity (f schema)))</pre></td></tr><tr><td class="docs"><p>Traverse the given schema, removing the given fields at any level.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn dissoc-fields
+  [schema &amp; fields]
+  (prewalk (to-fix #(= :struct (:type %))
+                   #(apply update % :fields dissoc fields))
+           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.schema" name="protobuf.schema"><h1 class="project-name">protobuf.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.schema
+  (:require
+    [clojure.string :as string]
+    [protobuf.util :as util])
+  (:import
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def )
+    (com.google.protobuf Descriptors$Descriptor
+                         Descriptors$FieldDescriptor
+                         Descriptors$FieldDescriptor$Type)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn extension
+  [ext ^Descriptors$FieldDescriptor field]
+  (-&gt; (.getOptions field)
+      (.getExtension ext)
+      (util/fix string? not-empty)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn field-type
+  [field]
+  (condp instance? field
+    Descriptors$FieldDescriptor
+    (if (.isRepeated ^Descriptors$FieldDescriptor field)
+      (condp extension field
+        (Extensions/counter)    :counter
+        (Extensions/succession) :succession
+        (Extensions/map)        :map
+        (Extensions/mapBy)      :map-by
+        (Extensions/set)        :set
+        :list)
+      :basic)
+    Descriptors$Descriptor
+    :struct))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmulti field-schema
+  (fn [field _ &amp; _] (field-type field)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn struct-schema
+  [^Descriptors$Descriptor struct
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [struct-name (.getFullName struct)]
+    (into {:type :struct
+           :name struct-name}
+          (when (not-any? (partial = struct-name) parents)
+            {:fields (into {}
+                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
+                             [(.intern map-def (.getName field))
+                              (field-schema field map-def (conj parents struct-name))]))}))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn basic-schema
+  [^Descriptors$FieldDescriptor field
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
+        meta-string (extension (Extensions/meta) field)]
+    (merge (case java-type
+             :message (struct-schema (.getMessageType field) map-def parents)
+             :enum    {:type   :enum
+                       :values (set (map #(.clojureEnumValue map-def %)
+                                         (.. field getEnumType getValues)))}
+             {:type java-type})
+           (when (.hasDefaultValue field)
+             {:default (.getDefaultValue field)})
+           (when meta-string
+             (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn subfield
+  [^Descriptors$FieldDescriptor field field-name]
+  (.findFieldByName (.getMessageType field) (name field-name)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :basic
+  [field map-def &amp; [parents]]
+  (basic-schema field map-def parents))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :list
+  [field map-def &amp; [parents]]
+  {:type   :list
+   :values (basic-schema field map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :succession
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :succession true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :counter
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :counter true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :set
+  [field map-def &amp; [parents]]
+  {:type   :set
+   :values (field-schema (subfield field :item) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map
+  [field map-def &amp; [parents]]
+  {:type   :map
+   :keys   (field-schema (subfield field :key) map-def parents)
+   :values (field-schema (subfield field :val) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map-by
+  [field map-def &amp; [parents]]
+  (let [map-by (extension (Extensions/mapBy) field)]
+    {:type   :map
+     :keys   (field-schema (subfield field map-by) map-def parents)
+     :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
+  [field map-def &amp; [parents]]
+  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.codec" name="protobuf.codec"><h1 class="project-name">protobuf.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.codec
+  (:require
+    [clojure.java.io :as io]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [gloss.core :as gloss]
+    [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.core :as protobuf]
+    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
+  [proto]
+  (let [proto (protobuf/mapdef proto)
+        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
+        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format &quot;In %s: %s %s&quot;
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             &quot;field is required for repeated protobufs&quot;)
+      (check (= min max)
+             &quot;must be of type fixed32 or fixed64&quot;))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
+                         #(hash-map len-key %)
+                         len-key)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [proto &amp; {:keys [validator repeated]}]
+  (let [proto (protobuf/mapdef proto)]
+    (-&gt; (reify
+          ;; Reader method
+          gloss-protocols/Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException. &quot;Invalid value in #'protobuf.codec/create&quot;)))
+            (gloss-formats/to-buf-seq
+             (protobuf/-&gt;bytes
+              (if (protobuf/map? val)
+                val
+                (protobuf/create proto val))))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
+</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
+  [proto]
+  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
+                      len-key
+                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
+  (:require
+    [clojure.java.io :as io]
+    [protobuf.schema :as protobuf-schema]
+    [protobuf.util :as util])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn map?
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
+  [obj]
+  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (mapdef map-def {})))
+  ([map-def opts]
+     (when map-def
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
+  [&amp; args]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
+
+<p>  Supported data sources are either an array of bytes or an input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmulti parse
+  (fn [map-def data &amp; _]
+    (type data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
+  ([^PersistentProtocolBufferMap$Def map-def data]
+     (when data
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  ([^PersistentProtocolBufferMap p]
+     (.toByteArray p))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (-&gt;bytes (PersistentProtocolBufferMap/construct map-def m))))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
+  from the given input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn read
+  [^PersistentProtocolBufferMap$Def map-def in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (io/input-stream in)]
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (read map-def in))
+        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn write
+  [out &amp; ps]
+  (io!
+   (let [^OutputStream out (io/output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
+  PersistentProtocolBufferMap
+  (combine-onto [^PersistentProtocolBufferMap this other]
+    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  combine #'util/combine)</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
+
+<p>TODO make this nil-safe? Or just delete it?</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-raw
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf? #'map?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protodef? #'mapdef?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protodef #'mapdef)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf #'create)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-schema #'mapdef-&gt;schema)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-load #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-load-stream #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-dump #'-&gt;bytes)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>read</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-seq #'read)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>write</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-write #'write)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li><li class="floating-toc-li" id="floating-toc_protobuf.schema">protobuf.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.codec">protobuf.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
+SyntaxHighlighter.all();
+
+// hackity hack
+$(window).load(function() {
+    var ft = $("#floating-toc");
+    var ul = ft.find('ul');
+    var lis = ft.find('li');
+    var liHeight = $(lis.first()).height();
+
+    ul.css('margin', '0px');
+    ft.css('height', liHeight + 'px');
+
+    showNs = function(ns) {
+        var index = 0;
+
+        for(i in nsPositions.nss) {
+            if(ns == nsPositions.nss[i]) index = i;
+        }
+
+        if(index != lastNsIndex) {
+            lastNsIndex = index;
+            ul.animate({marginTop: (-1 * liHeight * index) + 'px'},
+               300);
+        }
+
+    }
+
+    var calcNsPositions = function() {
+        var hheight = $('.docs-header').first().height();
+        var nss = [];
+        var anchors = [];
+        var positions = [];
+        $.each(lis, function(i, el) {
+            var ns = $(el).attr('id').split('_')[1];
+            nss.push(ns);
+            var a = $("a[name='"+ns+"']");
+            anchors.push(a);
+            positions.push(a.offset().top - hheight);
+            // console.log(a.offset().top)
+        });
+
+        return {nss: nss, positions: positions};
+    }
+
+    var nsPositions = calcNsPositions();
+    // console.log(nsPositions)
+    var lastNsIndex = -1;
+    var $window = $(window);
+
+    var currentSection = function(nsp) {
+        var ps = nsp.positions;
+        var scroll = $window.scrollTop();
+        var nsIndex = -1;
+
+        for(var i = 0, length = ps.length; i < length; i++) {
+            if(ps[i] >= scroll) {
+                nsIndex = i-1;
+                break;
+            }
+        }
+
+        if(nsIndex == -1) {
+             if(scroll >= ps[0]) {
+                 nsIndex = ps.length - 1;
+             } else {
+                 nsIndex = 0;
+             }
+        }
+
+        return nsp.nss[nsIndex];
+    }
+
+    $(window).scroll(function(e) {
+        showNs(currentSection(nsPositions));
+    });
+});
+</script></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/protobuf.codec.html b/docs/3.5.1-v1.0/protobuf.codec.html
new file mode 100644
index 0000000..90c5d3d
--- /dev/null
+++ b/docs/3.5.1-v1.0/protobuf.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/protobuf.core.html b/docs/3.5.1-v1.0/protobuf.core.html
new file mode 100644
index 0000000..c6458a6
--- /dev/null
+++ b/docs/3.5.1-v1.0/protobuf.core.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/protobuf.schema.html b/docs/3.5.1-v1.0/protobuf.schema.html
new file mode 100644
index 0000000..7250990
--- /dev/null
+++ b/docs/3.5.1-v1.0/protobuf.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.0/protobuf.util.html b/docs/3.5.1-v1.0/protobuf.util.html
new file mode 100644
index 0000000..c611436
--- /dev/null
+++ b/docs/3.5.1-v1.0/protobuf.util.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index 4a23ae6..3504f44 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 2a66a70..82ff6be 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index ee5fad9..385cd08 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
diff --git a/docs/current/1200-tutorial.html b/docs/current/1200-tutorial.html
index 78256d3..bb425bc 100644
--- a/docs/current/1200-tutorial.html
+++ b/docs/current/1200-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 991ed86..0345a51 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 04ce0f8..b02ffdb 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index ca39769..e3758b4 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v1.0">3.5.1-v1.0</a></li>
   <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
 </ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/index.html b/docs/current/index.html
index afdaf78..785dfc5 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 81216f1..2c2b642 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index c845325..0c99b0f 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index cfbf75f..456140c 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index a4e96d9..bd44fd3 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index dcb318c..5d8820b 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index cb5d284..4c4f081 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index bb65494..a50837d 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index bda370c..b28bbb7 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index e287795..3ff40d9 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:48 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 1f959c4..4f73bfc 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 5f8e35f..2ddce0f 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 2c53181..4434462 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 375a109..32882cf 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index f712650..ec29f86 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 3784cb1..db2c40f 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 4df437c..ad380bc 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:34:49 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2017-12-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index ceccbd8..2b4940e 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -2865,7 +2865,7 @@
     build_tree: build_tree
   };
 })(SyntaxHighlighter);
-</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.0-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.0</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
 </div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.schema">protobuf.schema</a></li><li><a href="#protobuf.codec">protobuf.codec</a></li><li><a href="#protobuf.core">protobuf.core</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
   (:import
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index 214837b..a2dee29 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 7531798..f70556c 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index 84e4207..a06daac 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index ce9a974..a2e797e 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/resources/docs/9999-other-versions.md b/resources/docs/9999-other-versions.md
index 9173084..9e4ac3a 100644
--- a/resources/docs/9999-other-versions.md
+++ b/resources/docs/9999-other-versions.md
@@ -3,4 +3,5 @@
 ### API Reference
 
 * [Development](../current)
+* [3.5.1-v1.0](../3.5.1-v1.0)
 * [3.5.1-v0.3](../3.5.1-v0.3)

From 0b3d933ab333c96f043e74598a502f5a33a883e4 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:37:10 -0600
Subject: [PATCH 431/525] Bumped version for next release cycle.

---
 project.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 4de64d7..3fde075 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v1.0"
+(defproject clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {

From 33a9753d578a5be21fa4639cd36189f331fd5d09 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:39:34 -0600
Subject: [PATCH 432/525] More alias headings/comments.

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 3fde075..1469ff4 100644
--- a/project.clj
+++ b/project.clj
@@ -54,7 +54,7 @@
     :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
     :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
-    ;; AOT compilation, REPL, and doc-generation
+    ;; Dev tasks
     "ubercompile" [
       "with-profile"
       "+ubercompile"
@@ -68,6 +68,7 @@
       ["protoc-test"]
       ["protoc-examples"]
       ["repl"]]
+    ;; Doc-generation
     "clojuredocs" [
       "with-profile"
       "+docs"

From 7cac5d1410404668149c2dcb60e3a97f807c544c Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 22:34:14 -0600
Subject: [PATCH 433/525] Moved implementation code to new home.

---
 dev-resources/src/protobuf/dev.clj            | 19 ++++--
 resources/docs/1200-tutorial.md               | 10 +--
 .../protobuf/{ => impl/flatland}/codec.clj    | 16 +++--
 src/clj/protobuf/impl/flatland/core.clj       | 10 +++
 src/clj/protobuf/impl/flatland/map.clj        | 20 ++++++
 .../{core.clj => impl/flatland/mapdef.clj}    | 64 ++-----------------
 .../protobuf/{ => impl/flatland}/schema.clj   |  2 +-
 test/protobuf/examples/photo_test.clj         |  2 +-
 .../{ => impl/flatland}/codec_test.clj        |  4 +-
 .../flatland/mapdef_test.clj}                 | 23 +++----
 10 files changed, 80 insertions(+), 90 deletions(-)
 rename src/clj/protobuf/{ => impl/flatland}/codec.clj (84%)
 create mode 100644 src/clj/protobuf/impl/flatland/core.clj
 create mode 100644 src/clj/protobuf/impl/flatland/map.clj
 rename src/clj/protobuf/{core.clj => impl/flatland/mapdef.clj} (69%)
 rename src/clj/protobuf/{ => impl/flatland}/schema.clj (99%)
 rename test/protobuf/{ => impl/flatland}/codec_test.clj (97%)
 rename test/protobuf/{core_test.clj => impl/flatland/mapdef_test.clj} (96%)

diff --git a/dev-resources/src/protobuf/dev.clj b/dev-resources/src/protobuf/dev.clj
index 6566983..b352604 100644
--- a/dev-resources/src/protobuf/dev.clj
+++ b/dev-resources/src/protobuf/dev.clj
@@ -1,7 +1,18 @@
 (ns protobuf.dev
   (:require
-    [protobuf.codec :as codec]
-    [protobuf.core :as core]
-    [protobuf.schema :as schema])
+    [clojure.pprint :refer [print-table]]
+    [clojure.reflect :refer [reflect]]
+    [protobuf.impl.flatland.codec :as codec]
+    [protobuf.impl.flatland.core :as core]
+    [protobuf.impl.flatland.schema :as schema])
   (:import
-    (protobuf.test.Codec$Foo)))
+    (protobuf.testing Codec$Foo)))
+
+(defn show-methods
+  "Display a Java object's public methods."
+  [obj]
+  (print-table
+    (sort-by :name
+      (filter (fn [x]
+                (contains? (:flags x) :public))
+              (:members (reflect obj))))))
diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
index 1dccdd8..3a97eaa 100644
--- a/resources/docs/1200-tutorial.md
+++ b/resources/docs/1200-tutorial.md
@@ -186,7 +186,7 @@ classes you'll need to read and write `AddressBook` (and hence `Person` and
 `PhoneNumber`) messages. To do this, you need to run the protocol buffer
 compiler `protoc` on your `.proto`:
 
-1. If you haven't installed this yet, now is the time. Your operating system's
+1. If you haven't installed `protoc` yet, now is the time. Your operating system's
    package manager very likely already provides a version for you -- search
    there first. If not, you can [download it][download] from Google.
 1. Now run the compiler, specifying:
@@ -210,10 +210,10 @@ $ ls -1 target/examples/protobuf/examples/tutorial/
 AddressBookProtos.java
 ```
 
-To have `lein` compile protobuf `.java` source files to `.class` that can be
-used from Clojure, we need to make sure that `lein` knows about our Java
-sources -- with do this with the `:java-source-paths` key in the `project.clj`
-file, either at the top-level or in an appropriate profile.
+To have `lein` compile protobuf `.java` source files to `.class` files that
+can be used from Clojure, we need to make sure that `lein` knows about our
+Java sources -- with do this with the `:java-source-paths` key in the
+`project.clj` file, either at the top-level or in an appropriate profile.
 
 For example, this is what the Clojure protobuf project has set, using the
 `:test` profile:
diff --git a/src/clj/protobuf/codec.clj b/src/clj/protobuf/impl/flatland/codec.clj
similarity index 84%
rename from src/clj/protobuf/codec.clj
rename to src/clj/protobuf/impl/flatland/codec.clj
index b4f7f54..18d9241 100644
--- a/src/clj/protobuf/codec.clj
+++ b/src/clj/protobuf/impl/flatland/codec.clj
@@ -1,4 +1,4 @@
-(ns protobuf.codec
+(ns protobuf.impl.flatland.codec
   (:require
     [clojure.java.io :as io]
     ;; flatland.io extends Seqable so we can concat InputStream from
@@ -8,7 +8,8 @@
     [gloss.core.formats :as gloss-formats]
     [gloss.io :as gloss-io]
     [gloss.core.protocols :as gloss-protocols]
-    [protobuf.core :as protobuf]
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.impl.flatland.map :as protobuf-map]
     [protobuf.util :as util]))
 
 (declare create)
@@ -46,12 +47,13 @@
           (sizeof [this] nil)
           (write-bytes [this _ val]
             (when (and validator (not (validator val)))
-              (throw (IllegalStateException. "Invalid value in #'protobuf.codec/create")))
+              (throw (IllegalStateException.
+                      "Invalid value in #'protobuf.impl.flatland.codec/create")))
             (gloss-formats/to-buf-seq
-             (protobuf/->bytes
-              (if (protobuf/map? val)
-                val
-                (protobuf/create proto val))))))
+              (protobuf-map/->bytes
+                (if (protobuf-map/map? val)
+                  val
+                  (protobuf/create proto val))))))
         (util/fix
           repeated
           #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
new file mode 100644
index 0000000..f5231cd
--- /dev/null
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -0,0 +1,10 @@
+(ns protobuf.impl.flatland.core
+  "This implementation takes its name from the original code for this project
+  that was done under the flatland Github org and which pulled in several
+  flatland libraries as dependencies.")
+
+(defrecord FlatlandProtoBuf
+  [protobuf-class])
+
+(def behaviour
+  {})
diff --git a/src/clj/protobuf/impl/flatland/map.clj b/src/clj/protobuf/impl/flatland/map.clj
new file mode 100644
index 0000000..757ce54
--- /dev/null
+++ b/src/clj/protobuf/impl/flatland/map.clj
@@ -0,0 +1,20 @@
+(ns protobuf.impl.flatland.map
+  (:import
+    (protobuf PersistentProtocolBufferMap))
+  (:refer-clojure :exclude [map?]))
+
+(defn map?
+  "Is the given object a `PersistentProtocolBufferMap?`"
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))
+
+(defn ^"[B" ->bytes
+  "Return the byte representation of the given protobuf."
+  [^PersistentProtocolBufferMap p]
+  (.toByteArray p))
+
+;; TODO make this nil-safe? Or just delete it?
+(defn get-raw
+  "Get value at key ignoring extension fields."
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))
diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/impl/flatland/mapdef.clj
similarity index 69%
rename from src/clj/protobuf/core.clj
rename to src/clj/protobuf/impl/flatland/mapdef.clj
index 4cd5023..68492ca 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/impl/flatland/mapdef.clj
@@ -1,7 +1,8 @@
-(ns protobuf.core
+(ns protobuf.impl.flatland.mapdef
   (:require
     [clojure.java.io :as io]
-    [protobuf.schema :as protobuf-schema]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.schema :as protobuf-schema]
     [protobuf.util :as util])
   (:import
     (clojure.lang Reflector)
@@ -15,11 +16,6 @@
               PersistentProtocolBufferMap$Def$NamingStrategy))
   (:refer-clojure :exclude [map? read]))
 
-(defn map?
-  "Is the given object a `PersistentProtocolBufferMap?`"
-  [obj]
-  (instance? PersistentProtocolBufferMap obj))
-
 (defn mapdef?
   "Is the given object a `PersistentProtocolBufferMap$Def?`"
   [obj]
@@ -82,10 +78,8 @@
 
 (defn ^"[B" ->bytes
   "Return the byte representation of the given protobuf."
-  ([^PersistentProtocolBufferMap p]
-     (.toByteArray p))
-  ([^PersistentProtocolBufferMap$Def map-def m]
-     (->bytes (PersistentProtocolBufferMap/construct map-def m))))
+  [^PersistentProtocolBufferMap$Def map-def m]
+  (protobuf-map/->bytes (PersistentProtocolBufferMap/construct map-def m)))
 
 (defn read
   "Lazily read a sequence of length-delimited protobufs of the specified map-def
@@ -115,51 +109,3 @@
 
 (def ^{:doc "A convenience alias for `util/combine`"}
   combine #'util/combine)
-
-;; TODO make this nil-safe? Or just delete it?
-(defn get-raw
-  "Get value at key ignoring extension fields."
-  [^PersistentProtocolBufferMap p key]
-  (.getValAt p key false))
-
-;;; Aliases
-
-(def ^{:doc "Backwards-compatible alias for `protobuf.core/map?`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf? #'map?)
-
-(def ^{:doc "Backwards-compatible alias for `mapdef?`"
-       :deprecated "3.5.1-v1.0"}
-  protodef? #'mapdef?)
-
-(def ^{:doc "Backwards-compatible alias for `mapdef`"
-       :deprecated "3.5.1-v1.0"}
-  protodef #'mapdef)
-
-(def ^{:doc "Backwards-compatible alias for `mapdef`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf #'create)
-
-(def ^{:doc "Backwards-compatible alias for `mapdef`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-schema #'mapdef->schema)
-
-(def ^{:doc "Backwards-compatible alias for `parse`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-load #'parse)
-
-(def ^{:doc "Backwards-compatible alias for `parse`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-load-stream #'parse)
-
-(def ^{:doc "Backwards-compatible alias for `->bytes`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-dump #'->bytes)
-
-(def ^{:doc "Backwards-compatible alias for `read`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-seq #'read)
-
-(def ^{:doc "Backwards-compatible alias for `write`"
-       :deprecated "3.5.1-v1.0"}
-  protobuf-write #'write)
diff --git a/src/clj/protobuf/schema.clj b/src/clj/protobuf/impl/flatland/schema.clj
similarity index 99%
rename from src/clj/protobuf/schema.clj
rename to src/clj/protobuf/impl/flatland/schema.clj
index 07d2141..d0d3361 100644
--- a/src/clj/protobuf/schema.clj
+++ b/src/clj/protobuf/impl/flatland/schema.clj
@@ -1,4 +1,4 @@
-(ns protobuf.schema
+(ns protobuf.impl.flatland.schema
   (:require
     [clojure.string :as string]
     [protobuf.util :as util])
diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index f23a985..9f045f3 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -1,7 +1,7 @@
 (ns protobuf.examples.photo-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.core :as protobuf])
+    [protobuf.impl.flatland.mapdef :as protobuf])
   (:import
     (com.google.protobuf ByteString)
     (protobuf.examples.photo Example$Photo)))
diff --git a/test/protobuf/codec_test.clj b/test/protobuf/impl/flatland/codec_test.clj
similarity index 97%
rename from test/protobuf/codec_test.clj
rename to test/protobuf/impl/flatland/codec_test.clj
index a93ab93..ee3c317 100644
--- a/test/protobuf/codec_test.clj
+++ b/test/protobuf/impl/flatland/codec_test.clj
@@ -1,7 +1,7 @@
-(ns protobuf.codec-test
+(ns protobuf.impl.flatland.codec-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.codec :as protobuf-codec])
+    [protobuf.impl.flatland.codec :as protobuf-codec])
   (:import
     (java.nio ByteBuffer)
     (protobuf.testing Codec$Foo)))
diff --git a/test/protobuf/core_test.clj b/test/protobuf/impl/flatland/mapdef_test.clj
similarity index 96%
rename from test/protobuf/core_test.clj
rename to test/protobuf/impl/flatland/mapdef_test.clj
index 068fd98..3d178e8 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/impl/flatland/mapdef_test.clj
@@ -1,7 +1,8 @@
-(ns protobuf.core-test
+(ns protobuf.impl.flatland.mapdef-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.core :as protobuf]
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.impl.flatland.map :as protobuf-map]
     [protobuf.util :as util])
   (:import
     (java.io PipedInputStream PipedOutputStream)
@@ -133,7 +134,7 @@
 
     ;; TODO add test back once we re-enable this check
     (comment
-      (is (thrown? Exception (protobuf/->bytes p))
+      (is (thrown? Exception (protobuf-map/->bytes p))
           "Should refuse to serialize with stuff in extmap"))))
 
 (deftest test-string-keys
@@ -154,8 +155,8 @@
                     :tags ["savory"] :tag-set {"bar" false "foo" false "bap" true}
                     :things {"first" {:marked true}})
         r (protobuf/create Foo :label "bad")
-        s (protobuf/parse Foo (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))
-        t (protobuf/parse Foo (util/catbytes (protobuf/->bytes p) (protobuf/->bytes r)))]
+        s (protobuf/parse Foo (util/catbytes (protobuf-map/->bytes p) (protobuf-map/->bytes q)))
+        t (protobuf/parse Foo (util/catbytes (protobuf-map/->bytes p) (protobuf-map/->bytes r)))]
     (is (= 43 (s :id))) ; make sure an explicit default overwrites on append
     (is (= 5  (t :id))) ; make sure a missing default doesn't overwrite on append
     (is (= "rad" (s :label)))
@@ -206,7 +207,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :exists true}
                                     "I" {:bar 9 :exists false}})
-          r (protobuf/parse Maps (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf-map/->bytes p) (protobuf-map/->bytes q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :exists]))
            "A" [1   1 nil  ]
@@ -239,7 +240,7 @@
                                     "G" {:bar 7}
                                     "H" {:bar 8 :deleted true}
                                     "I" {:bar 9 :deleted false}})
-          r (protobuf/parse Maps (util/catbytes (protobuf/->bytes p) (protobuf/->bytes q)))]
+          r (protobuf/parse Maps (util/catbytes (protobuf-map/->bytes p) (protobuf-map/->bytes q)))]
       (are [key vals] (= vals (map (get-in r [map-key key])
                                    [:foo :bar :deleted]))
            "A" [1   1 nil  ]
@@ -312,7 +313,7 @@
                 {:key "bar", :i 99}
                 {:key "foo", :i -8, :d 4.06}
                 {:key "bar", :i -66}]
-               (protobuf/get-raw p :counts)))))))
+               (protobuf-map/get-raw p :counts)))))))
 
 (deftest test-succession
   (let [p (protobuf/create Foo :time {:year 1978 :month 11 :day 24})]
@@ -324,7 +325,7 @@
       (is (= 1    (get-in p [:time :month])))
       (is (= nil  (get-in p [:time :day])))
       (is (= [{:year 1978, :month 11, :day 24} {:year 1974, :month 1}]
-             (protobuf/get-raw p :time))))))
+             (protobuf-map/get-raw p :time))))))
 
 (deftest test-nullable
   (let [p (protobuf/create Bar :int 1 :long 330000000000 :flt 1.23 :dbl 9.87654321 :str "foo" :enu :a)
@@ -349,13 +350,13 @@
         (is (= "foo" (get p :label)))
         (let [p (util/combine p {:label nil})]
           (is (= nil        (get     p :label)))
-          (is (= ["foo" ""] (protobuf/get-raw p :label))))))
+          (is (= ["foo" ""] (protobuf-map/get-raw p :label))))))
     (testing "repeated nullable"
       (let [p (protobuf/create Bar :labels ["foo" "bar"])]
         (is (= ["foo" "bar"] (get p :labels)))
         (let [p (util/combine p {:labels [nil]})]
           (is (= ["foo" "bar" nil] (get     p :labels)))
-          (is (= ["foo" "bar" ""]  (protobuf/get-raw p :labels))))))))
+          (is (= ["foo" "bar" ""]  (protobuf-map/get-raw p :labels))))))))
 
 (deftest test-mapdef->schema
   (let [fields

From a8db3a3f2c679dfabdfde149ba559c463953d481 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:19:33 -0600
Subject: [PATCH 434/525] Added initial protocol definition.

---
 project.clj               |  4 ++--
 src/clj/protobuf/core.clj | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/clj/protobuf/core.clj

diff --git a/project.clj b/project.clj
index 1469ff4..42f1763 100644
--- a/project.clj
+++ b/project.clj
@@ -13,12 +13,12 @@
     [org.flatland/io "0.3.0"]]
   :source-paths ["src/clj"]
   :java-source-paths ["src/java"]
+  :jvm-opts ["-Dprotobuf.impl=flatland"]
   :profiles {
     :ubercompile {
       :aot :all}
-    :dev {
-      :source-paths ["dev-resources/src"]}
     :custom-repl {
+      :source-paths ["dev-resources/src"]
       :repl-options {
         :init-ns protobuf.dev
         :prompt ~#(str "\u001B[35m[\u001B[34m"
diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
new file mode 100644
index 0000000..089e249
--- /dev/null
+++ b/src/clj/protobuf/core.clj
@@ -0,0 +1,25 @@
+(ns protobuf.core
+  (:require
+    [protobuf.impl.flatland.core :as flatland])
+  (:import
+    (protobuf.impl.flatland.core FlatlandProtoBuf))
+  (:refer-clojure :exclude [map? read]))
+
+(defprotocol ProtoBufAPI
+  (->bytes [this])
+  (bytes-> [this bytes])
+  (read [this in])
+  (write [this out & args]))
+
+(extend FlatlandProtoBuf
+        ProtoBufAPI
+        flatland/behaviour)
+
+(defn get-impl
+  []
+  (keyword (System/getProperty "protobuf.impl")))
+
+(defn create
+  [protobuf-class data]
+  (case (get-impl)
+    :flatland (flatland/create protobuf-class data)))

From ec2fe229825a9c31e661e4cdc29d124d216434eb Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:19:51 -0600
Subject: [PATCH 435/525] Updated implementation to be in accord with new
 protocol.

---
 dev-resources/src/protobuf/dev.clj      | 11 ++++++---
 src/clj/protobuf/impl/flatland/core.clj | 31 ++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/dev-resources/src/protobuf/dev.clj b/dev-resources/src/protobuf/dev.clj
index b352604..305e8fc 100644
--- a/dev-resources/src/protobuf/dev.clj
+++ b/dev-resources/src/protobuf/dev.clj
@@ -2,10 +2,15 @@
   (:require
     [clojure.pprint :refer [print-table]]
     [clojure.reflect :refer [reflect]]
-    [protobuf.impl.flatland.codec :as codec]
-    [protobuf.impl.flatland.core :as core]
-    [protobuf.impl.flatland.schema :as schema])
+    [protobuf.core :as protobuf]
+    [protobuf.impl.flatland.codec :as f-codec]
+    [protobuf.impl.flatland.core :as f-core]
+    [protobuf.impl.flatland.map :as f-map]
+    [protobuf.impl.flatland.mapdef :as f-mapdef]
+    [protobuf.impl.flatland.schema :as f-schema])
   (:import
+    (protobuf.examples.person Example$Person)
+    (protobuf.examples.photo Example$Photo)
     (protobuf.testing Codec$Foo)))
 
 (defn show-methods
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index f5231cd..1e60a9a 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -1,10 +1,35 @@
 (ns protobuf.impl.flatland.core
   "This implementation takes its name from the original code for this project
   that was done under the flatland Github org and which pulled in several
-  flatland libraries as dependencies.")
+  flatland libraries as dependencies."
+  (:require
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.mapdef :as protobuf]))
 
 (defrecord FlatlandProtoBuf
-  [protobuf-class])
+  [protobuf-class
+   java-wrapper
+   init-data
+   instance])
+
+(defn create
+  [protobuf-class data]
+  (let [wrapper (protobuf/mapdef protobuf-class)]
+    (map->FlatlandProtoBuf
+      {:protobuf-class protobuf-class
+       :java-wrapper wrapper
+       :instance (protobuf/create wrapper data)})))
 
 (def behaviour
-  {})
+  {:->bytes (fn [this]
+             (protobuf-map/->bytes (:instance this)))
+   :->schema (fn [this & args]
+              (apply protobuf/mapdef->schema args))
+   :bytes-> (fn [this bytes]
+             (create
+              (:protobuf-class this)
+              (protobuf/parse (:java-wrapper this) bytes)))
+   :read (fn [this in]
+          (protobuf/read (:java-wrapper this) in))
+   :write (fn [this out & protobufs]
+           (apply protobuf/write (concat [out] protobufs)))})

From eba158ed5f6e2dc94cc3264e42ffa6ac9702eddf Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:20:15 -0600
Subject: [PATCH 436/525] Updated test to use new protocol.

---
 test/protobuf/examples/photo_test.clj | 32 +++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index 9f045f3..71c38df 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -1,23 +1,27 @@
 (ns protobuf.examples.photo-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.impl.flatland.mapdef :as protobuf])
+    [protobuf.core :as protobuf])
   (:import
     (com.google.protobuf ByteString)
     (protobuf.examples.photo Example$Photo)))
 
-(def Photo (protobuf/mapdef Example$Photo))
-
-(def data {:id 7
-           :path "/photos/h2k3j4h9h23"
-           :labels #{"hawaii" "family" "surfing"},
-           :attrs {"color space" "RGB" "dimensions" "1632x1224" "alpha" "no"},
-           :tags {4 {:person-id 4
-                     :x-coord 607
-                     :y-coord 813
-                     :width 25
-                     :height 27}}
-           :image (ByteString/copyFrom (byte-array (map unchecked-byte [1 2 3 4 -1])))})
+(def data {
+  :id 7
+  :path "/photos/h2k3j4h9h23"
+  :labels #{"hawaii" "family" "surfing"},
+  :attrs {"color space" "RGB" "dimensions" "1632x1224" "alpha" "no"},
+  :tags {
+    4 {
+      :person-id 4
+      :x-coord 607
+      :y-coord 813
+      :width 25
+      :height 27}}
+  :image (ByteString/copyFrom
+          (byte-array
+           (map unchecked-byte [1 2 3 4 -1])))})
 
 (deftest example-test
-  (is (= data (apply protobuf/create Photo (apply concat data)))))
+  (is (= data
+         (:instance (protobuf/create Example$Photo data)))))

From fa057c9e0d2a45059f304a7f82a40b3e505bfcaa Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:23:14 -0600
Subject: [PATCH 437/525] Updated docs.

---
 README.md                          | 46 +++++++++++++++++++++---------
 resources/docs/1000-basic-usage.md | 40 ++++++++++++--------------
 resources/docs/1050-tutorial.md    | 26 +++++++----------
 resources/docs/1100-extensions.md  | 20 +++++++------
 4 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index e584be7..f72aa9d 100644
--- a/README.md
+++ b/README.md
@@ -63,27 +63,45 @@ Now you can use the protocol buffer in Clojure:
 (require '[protobuf.core :as protobuf])
 (import (your.namespace.person Example$Person)
 
-(def Person (protobuf/mapdef Example$Person))
+(def alice (protobuf/create Example$Person
+                            {:id 4 :name "Alice" :email "alice@example.com"}))
+```
 
-(def p (protobuf/create Person :id 4 :name "Alice" :email "alice@example.com"))
-=> {:id 4, :name "Alice", :email "alice@example.com"}
+Makes some changes to the data and serialize to bytes:
 
-(assoc p :name "Alice B. Carol")
-=> {:id 4, :name "Alice B. Carol", :email "alice@example.com"}
+```clj
+(def b (-> alice
+           (assoc-in [:instance :name] "Alice B. Carol")
+           (assoc-in [:instance :likes] ["climbing" "running" "jumping"])
+           (protobuf/->bytes)))
+```
 
-(assoc p :likes ["climbing" "running" "jumping"])
-=> {:id 4, name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+Round-trip the bytes back to a probuf object:
 
-(def b (protobuf/->bytes p))
-=> #<byte[] [B@7cbe41ec>
+```clj
+(->> b
+     (protobuf/bytes-> alice)
+     :instance)
+```
 
-(protobuf/parse Person b)
-=> {:id 4, :name "Alice", :email "alice@example.com"}
+Which gives us:
+
+```clj
+{:id 4,
+ :name "Alice B. Carol",
+ :email "alice@example.com",
+ :likes ["climbing" "running" "jumping"]}
 ```
 
-A protocol buffer map is immutable just like other clojure objects. It is
-similar to a struct-map, except you cannot insert fields that aren't specified
-in the `.proto` file.
+The data stored in the `:instance` key is a protocol buffer map and is
+immutable just like other clojure objects. It is similar to a struct-map,
+except that you cannot insert fields that aren't specified in the `.proto`
+file.
+
+(For instance, if you do a round trip with the data like we did above, but use
+`:dislikes` -- not in the protobuf definition -- instead of `:likes`,
+converting from bytes back to the protobuf instance will result in the
+`:dislikes` key and associated value being dropped.)
 
 
 ## Documentation
diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
index cc05f49..9fcf4ed 100644
--- a/resources/docs/1000-basic-usage.md
+++ b/resources/docs/1000-basic-usage.md
@@ -45,34 +45,30 @@ nil
 protobuf.examples.person.Example$Person
 ```
 
-Now we can create the Java wrapper for our protocol (see
-`protobuf.PersistentProtocolBufferMap` for more details):
-
-```clj
-[protobuf.dev] λ=> (def Person (protobuf/mapdef Example$Person))
-#'protobuf.dev/Person
-```
-
-And with this in hand, we can finally create an instance of the protobuf:
+Now we can create a protobuf:
 
 ```clj
 [protobuf.dev] λ=> (def p (protobuf/create
-                            Person
-                            :id 4
-                            :name "Alice"
-                            :email "alice@example.com"))
+                            Example$Person
+                            {:id 108
+                             :name "Alice"
+                             :email "alice@example.com"}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> p
-{:id 4, :name "Alice", :email "alice@example.com"}
+[protobuf.dev] λ=> (:instance p)
+{:id 108, :name "Alice", :email "alice@example.com"}
 ```
 
 With our person data in place, we can now do the usual Clojure operations:
 
 ```clj
-[protobuf.dev] λ=> (assoc p :name "Alice B. Carol")
-{:id 4, :name "Alice B. Carol", :email "alice@example.com"}
-[protobuf.dev] λ=> (assoc p :likes ["climbing" "running" "jumping"])
-{:id 4, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+[protobuf.dev] λ=> (-> p
+                       (assoc-in [:instance :name] "Alice B. Carol")
+                       :instance)
+{:id 108, :name "Alice B. Carol", :email "alice@example.com"}
+[protobuf.dev] λ=> (-> p
+                       (assoc-in [:instance :likes] ["climbing" "running" "jumping"])
+                       :instance)
+{:id 108, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
 ```
 
 Additionally, converting between protobuf bytes and Clojure data is trivial:
@@ -82,6 +78,8 @@ Additionally, converting between protobuf bytes and Clojure data is trivial:
 #'protobuf.dev/b
 [protobuf.dev] λ=> b
 #object["[B" 0x7e3a40eb "[B@7e3a40eb"]
-[protobuf.dev] λ=> (protobuf/parse Person b)
-{:id 4, :name "Alice", :email "alice@example.com"}
+[protobuf.dev] λ=> (-> p
+                      (protobuf/bytes-> b)
+                      :instance)
+{:id 108, :name "Alice", :email "alice@example.com"}
 ```
diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index f704de6..3fa0a9e 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -263,21 +263,11 @@ protobuf.examples.tutorial.AddressBookProtos$AddressBook
 Note that for nested inner classes, we simply keep using the inner class
 separator `$` of Clojure's Java inter-op.
 
-Next we'll use a Java wrapper that let's us treat these like maps:
-
-```clj
-[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
-#'protobuf.dev/Person
-[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
-#'protobuf.dev/PhoneNumber
-[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
-#'protobuf.dev/AddressBook
-```
 
 We can view the full, nested data schema in Clojure data:
 
 ```clj
-[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
+[protobuf.dev] λ=> (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
  :name "tutorial.AddressBook",
  :fields
@@ -330,16 +320,19 @@ appropriate protocol buffer message. Here's how to create some `PhoneNumber`
 messages:
 
 ```clj
-[protobuf.dev] λ=> (def phones [(protobuf/create PhoneNumber :number "555-1212" :type "HOME")
-                                (protobuf/create PhoneNumber :number "555-1213" :type "MOBILE")
-                                (protobuf/create PhoneNumber :number "555-1214" :type "WORK")])
+[protobuf.dev] λ=> (def phones [(protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 :number "555-1212" :type "HOME")
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 :number "555-1213" :type "MOBILE")
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 :number "555-1214" :type "WORK")])
 #'protobuf.dev/phones
 ```
 
 Now we can use these when creating our `Person` message:
 
 ```clj
-[protobuf.dev] λ=> (def alice (protobuf/create Person
+[protobuf.dev] λ=> (def alice (protobuf/create AddressBookProtos$Person
                                                :id 108
                                                :name "Alice"
                                                :email "alice@example.com"
@@ -350,7 +343,8 @@ Now we can use these when creating our `Person` message:
 And then that can be used when creating (or updating) an `AddressBook` message:
 
 ```clj
-[protobuf.dev] λ=> (def addresses (protobuf/create AddressBook :people [alice]))
+[protobuf.dev] λ=> (def addresses (protobuf/create AddressBookProtos$AddressBook
+                                                   :people [alice]))
 #'protobuf.dev/addresses
 ```
 
diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
index d3d9639..169808e 100644
--- a/resources/docs/1100-extensions.md
+++ b/resources/docs/1100-extensions.md
@@ -59,14 +59,18 @@ Create our protobuf:
 [protobuf.dev] λ=> (def Tag (protobuf/mapdef Example$Photo$Tag))
 #'protobuf.dev/Tag
 [protobuf.dev] λ=> (def p (protobuf/create
-                            Photo
-                            :id 7
-                            :path "/photos/h2k3j4h9h23"
-                            :labels #{"hawaii" "family" "surfing"}
-                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-                            :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+                            Example$Photo
+                            {:id 7
+                             :path "/photos/h2k3j4h9h23"
+                             :labels #{"hawaii" "family" "surfing"}
+                             :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                             :tags  {4 {:person_id 4
+                                        :x_coord 607
+                                        :y_coord 813
+                                        :width 25
+                                        :height 27}}}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> p
+[protobuf.dev] λ=> (:instance p)
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},
@@ -82,7 +86,7 @@ Convert to and from bytes:
 #'protobuf.dev/b
 [protobuf.dev] λ=> b
 #object["[B" 0x4455bb6e "[B@4455bb6e"]
-[protobuf.dev] λ=> (protobuf/parse Photo b)
+[protobuf.dev] λ=> (:instance (protobuf/bytes-> p b))
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},

From b7f6616ba8617a9676b698ceea8955a906519fae Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:49:37 -0600
Subject: [PATCH 438/525] Removed old tutorial file.

---
 resources/docs/1200-tutorial.md | 348 --------------------------------
 1 file changed, 348 deletions(-)
 delete mode 100644 resources/docs/1200-tutorial.md

diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
deleted file mode 100644
index 3a97eaa..0000000
--- a/resources/docs/1200-tutorial.md
+++ /dev/null
@@ -1,348 +0,0 @@
-# Tutorial: Protocol Buffer Basics
-
-*Note: The content for this tutorial was taken from the
-[official Google protobuf Java tutorial][java-tut].*
-
-
-## Introduction
-
-This tutorial provides a basic Clojure programmer's introduction to working with
-protocol buffers. By walking through creating a simple example application, it
-shows you how to:
-
-* Define message formats in a `.proto` file.
-* Use the protocol buffer compiler.
-* Use the Clojure protocol buffer API to write and read messages.
-
-This isn't a comprehensive guide to using protocol buffers in Clojure. For more
-detailed reference information, see:
-
-* the [Protocol Buffer Language Guide][protobuf-guide]
-* the [Clojure API Reference][clojure-api-ref]
-* the [Encoding Reference][enc-ref]
-
-Additionally, you may find these useful:
-
-* the [Java API Reference][java-api-ref]
-* the [Java Generated Code Guide][java-generated]
-
-
-## Why Use Protocol Buffers?
-
-Protocol buffers solve the problem of efficiently serializing and
-deserializing structured data in a language-agnostic manner, accessible a vast
-array of applications (as long as the applications are written in a language
-that has a protobuf library). We'll illustrate this with an example.
-
-The example we're going to use is a very simple "address book" application
-that can read and write people's contact details to and from a file. Each
-person in the address book has a name, an ID, an email address, and a contact
-phone number.
-
-So, how might one serialize and retrieve structured data like this if protobuf
-wasn't around? There are a few ways to solve this problem:
-
-* Use Java Serialization. This is the default approach since it's built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn't work very well if you need to share data with applications written in C++ or Python.
-* You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as "12:3:-23:67". This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.
-* Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.
-
-To avoid the problems mentioned in each of the above (as well as many others),
-protocol buffers was created. They are the flexible, efficient, automated
-solution.
-
-With protocol buffers, you write a `.proto` description of the data structure
-you wish to store. From that, the protocol buffer compiler creates compilable
-source code that implements automatic encoding and parsing of the protocol
-buffer data with an efficient binary format. The generated code provides
-getters and setters for the fields that make up a protocol buffer and takes
-care of the details of reading and writing the protocol buffer as a unit.
-Importantly, the protocol buffer format supports the idea of extending the
-format over time in such a way that the code can still read data encoded with
-the old format.
-
-
-## Defining Your Protocol Format
-
-To create your address book application, you'll need to start with a `.proto`
-file. The definitions in a `.proto` file are simple: you add a message for each
-data structure you want to serialize, then specify a name and a type for each
-field in the message. Here is the `.proto` file that defines your messages,
-`addressbook.proto`:
-
-```proto
-syntax = "proto2";
-
-package tutorial;
-
-option java_package = "protobuf.examples.tutorial";
-option java_outer_classname = "AddressBookProtos";
-
-message Person {
-  required string name = 1;
-  required int32 id = 2;
-  optional string email = 3;
-
-  enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
-  }
-
-  message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
-  }
-
-  repeated PhoneNumber phones = 4;
-}
-
-message AddressBook {
-  repeated Person people = 1;
-}
-```
-
-(Additionally, this file has been made available for you in the
-`resources/proto/examples` directory of the Clojure protobuf project.)
-
-As you can see, the syntax is similar to C++ or Java. Let's go through each
-part of the file and see what it does.
-
-The `.proto` file starts with a package declaration, which helps to prevent
-naming conflicts between different projects. In Java, the package name is used
-as the Java package unless you have explicitly specified a `java_package`, as
-we have here. Even if you do provide a `java_package`, you should still define
-a normal package as well to avoid name collisions in the Protocol Buffers name
-space as well as in non-Java languages.
-
-<blockquote>
-After the package declaration, you can see two options that are Java-specific.
-Thanks to Clojure's Java inter-op, we can take advantage of this directly,
-without writing our own Clojure protobuf compiler or waiting for Google to
-support Clojure.
-</blockquote>
-
-`java_package` specifies in what Java package name your generated classes
-should live. If you don't specify this explicitly, it simply matches the
-package name given by the package declaration, but these names usually aren't
-appropriate Java package names (since they usually don't start with a domain
-name).
-
-The `java_outer_classname` option defines the class name which should contain
-all of the classes in this file. If you don't give a `java_outer_classname`
-explicitly, it will be generated by converting the file name to camel case.
-For example, `my_proto.proto` would, by default, use `MyProto` as the outer
-class name.
-
-Next, you have your message definitions. A message is just an aggregate
-containing a set of typed fields. Many standard simple data types are
-available as field types, including `bool`, `int32`, `float`, `double`, and
-`string.` You can also add further structure to your messages by using other
-message types as field types – in the above example the `Person` message
-contains `PhoneNumber` messages, while the `AddressBook` message contains
-`Person` messages. You can even define message types nested inside other
-messages – as you can see, the `PhoneNumber` type is defined inside `Person`. You
-can also define `enum` types if you want one of your fields to have one of a
-predefined list of values – here you want to specify that a phone number can
-be one of `MOBILE`, `HOME`, or `WORK`.
-
-The " = 1", " = 2" markers on each element identify the unique "tag" that
-field uses in the binary encoding. Tag numbers 1-15 require one less byte to
-encode than higher numbers, so as an optimization you can decide to use those
-tags for the commonly used or repeated elements, leaving tags 16 and higher
-for less-commonly used optional elements. Each element in a repeated field
-requires re-encoding the tag number, so repeated fields are particularly good
-candidates for this optimization.
-
-Each field must be annotated with one of the following modifiers:
-
-* `required`: a value for the field must be provided, otherwise the message will be considered "uninitialized". Trying to build an uninitialized message will throw a `RuntimeException`. Parsing an uninitialized message will throw an `IOException`. Other than this, a required field behaves exactly like an optional field.
-* `optional`: the field may or may not be set. If an optional field value isn't set, a default value is used. For simple types, you can specify your own default value, as we've done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, `false` for bools. For embedded messages, the default value is always the "default instance" or "prototype" of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field's default value.
-* `repeated`: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.
-
-<blockquote>
-**Required Is Forever**
-
-You should be very careful about marking fields as required. If at some point
-you wish to stop writing or sending a required field, it will be problematic
-to change the field to an optional field – old readers will consider messages
-without this field to be incomplete and may reject or drop them
-unintentionally. You should consider writing application-specific custom
-validation routines for your buffers instead. Some engineers at Google have
-come to the conclusion that using required does more harm than good; they
-prefer to use only optional and repeated. However, this view is not universal.
-</blockquote>
-
-You'll find a complete guide to writing `.proto` files – including all the
-possible field types – in the
-[Protocol Buffer Language Guide][protobuf-guide]. Don't go looking for
-facilities similar to class inheritance, though – protocol buffers don't do
-that.
-
-
-## Compiling Your Protocol Buffers
-
-Now that you have a `.proto`, the next thing you need to do is generate the
-classes you'll need to read and write `AddressBook` (and hence `Person` and
-`PhoneNumber`) messages. To do this, you need to run the protocol buffer
-compiler `protoc` on your `.proto`:
-
-1. If you haven't installed `protoc` yet, now is the time. Your operating system's
-   package manager very likely already provides a version for you -- search
-   there first. If not, you can [download it][download] from Google.
-1. Now run the compiler, specifying:
-   * the source directory (where your application's source code lives – the
-     current directory is used if you don't provide a value)
-   * the destination directory (where you want the generated code to go; often
-     the same as $SRC_DIR), and
-   * the path to your `.proto.`
-
-In this case:
-
-```bash
-$ protoc -I=resources --java_out=target/examples \
-  resources/protobuf/examples/tutorial.proto
-```
-
-This gives us:
-
-```bash
-$ ls -1 target/examples/protobuf/examples/tutorial/
-AddressBookProtos.java
-```
-
-To have `lein` compile protobuf `.java` source files to `.class` files that
-can be used from Clojure, we need to make sure that `lein` knows about our
-Java sources -- with do this with the `:java-source-paths` key in the
-`project.clj` file, either at the top-level or in an appropriate profile.
-
-For example, this is what the Clojure protobuf project has set, using the
-`:test` profile:
-
-```clj
-:test {
-  :java-source-paths [
-    "target/examples"
-    "target/testing"]}
-```
-
-<blockquote>
-Fore convenience, the Clojure protobuf project always compiles the examples
-and the tests before starting up the REPL, so they are always freshly available
-to developers.
-</blockquote>
-
-
-## The Protocol Buffer API
-
-Let's fire up the REPL and see how to use the compiled code from Clojure:
-
-```bash
-$ lein repl
-```
-
-### Setup
-
-First we'll pull in the Clojure API:
-
-```clj
-[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
-nil
-```
-
-Then we'll import the generated Java classes we want to use:
-
-```clj
-[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
-              #_=>                                      AddressBookProtos$Person$PhoneNumber
-              #_=>                                      AddressBookProtos$AddressBook))
-protobuf.examples.tutorial.AddressBookProtos$AddressBook
-```
-
-Note that for nested inner classes, we simply keep using the inner class
-separator `$` of Clojure's Java inter-op.
-
-Next we'll use a Java wrapper that let's us treat these like maps:
-
-```clj
-[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
-#'protobuf.dev/Person
-[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
-#'protobuf.dev/PhoneNumber
-[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
-#'protobuf.dev/AddressBook
-```
-
-We can view the full, nested data schema in Clojure data:
-
-```clj
-[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
-{:type :struct,
- :name "tutorial.AddressBook",
- :fields
- {:people
-  {:type :list,
-   :values
-   {:type :struct,
-    :name "tutorial.Person",
-    :fields
-    {:name {:type :string},
-     :id {:type :int},
-     :email {:type :string},
-     :phones
-     {:type :list,
-      :values
-      {:type :struct,
-       :name "tutorial.Person.PhoneNumber",
-       :fields
-       {:number {:type :string},
-        :type
-        {:type :enum,
-         :values #{:home :work :mobile},
-         :default
-         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
-nil
-```
-
-<blockquote>
-There's currently a bug/missing feature where the default value of an `enum` is
-not converted to Clojure data. For current status on this issue, see:
-<a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
-</blockquote>
-
-## Message Functions
-
-TBD
-
-## Parsing and Serialization
-
-* `protobuf/parse` - Given an array or stream of bytes, we can parse these
-  to a Clojure protobuf data structure
-* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
-  an array of raw bytes
-
-## Writing a Message
-
-TBD
-
-## Reading a Message
-
-TBD
-
-## Extending a Protocol
-
-TBD
-
-## Advanced Usage
-
-TBD
-
-
-<!-- Named page links below: /-->
-
-[java-tut]: https://developers.google.com/protocol-buffers/docs/javatutorial
-[protobuf-guide]: https://developers.google.com/protocol-buffers/docs/proto
-[clojure-api-ref]: https://clojusc.github.io/protobuf
-[java-api-ref]: https://developers.google.com/protocol-buffers/docs/reference/java/index.html
-[java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
-[enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
-[download]: https://developers.google.com/protocol-buffers/docs/downloads.html

From 1301d44e5969f8939f3b96f72b7616b94f5fae5b Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 09:17:51 -0600
Subject: [PATCH 439/525] Added general schema implementation.

---
 src/clj/protobuf/core.clj               | 11 ++++++++++-
 src/clj/protobuf/impl/flatland/core.clj |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 089e249..08d0433 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -15,9 +15,18 @@
         ProtoBufAPI
         flatland/behaviour)
 
+(def default-impl-name "flatland")
+
 (defn get-impl
   []
-  (keyword (System/getProperty "protobuf.impl")))
+  (keyword (or (System/getProperty "protobuf.impl")
+               default-impl-name)))
+
+(defn schema
+  [protobuf-class]
+  (let [impls {:flatland flatland/schema}
+        impl (get-impl)]
+    ((impl impls) protobuf-class)))
 
 (defn create
   [protobuf-class data]
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index 1e60a9a..39c025a 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -20,6 +20,11 @@
        :java-wrapper wrapper
        :instance (protobuf/create wrapper data)})))
 
+(defn schema
+  [protobuf-class]
+  (protobuf/mapdef->schema
+   (protobuf/mapdef protobuf-class)))
+
 (def behaviour
   {:->bytes (fn [this]
              (protobuf-map/->bytes (:instance this)))

From 0854f50bc41f02844942d4c5fffd42301740318d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:11:33 -0600
Subject: [PATCH 440/525] Massive refactor on API and impl.

---
 dev-resources/src/protobuf/dev.clj            |   4 +
 project.clj                                   |   1 +
 src/clj/protobuf/common.clj                   |  52 ++++++++
 src/clj/protobuf/core.clj                     |  21 ++-
 src/clj/protobuf/impl/flatland/core.clj       | 125 ++++++++++++++----
 .../protobuf/PersistentProtocolBufferMap.java |   4 +-
 6 files changed, 177 insertions(+), 30 deletions(-)
 create mode 100644 src/clj/protobuf/common.clj

diff --git a/dev-resources/src/protobuf/dev.clj b/dev-resources/src/protobuf/dev.clj
index 305e8fc..ba754f2 100644
--- a/dev-resources/src/protobuf/dev.clj
+++ b/dev-resources/src/protobuf/dev.clj
@@ -11,6 +11,10 @@
   (:import
     (protobuf.examples.person Example$Person)
     (protobuf.examples.photo Example$Photo)
+    (protobuf.examples.tutorial AddressBookProtos$Person
+                                AddressBookProtos$Person$PhoneNumber
+                                AddressBookProtos$AddressBook)
+    (protobuf.impl.flatland.core FlatlandProtoBuf)
     (protobuf.testing Codec$Foo)))
 
 (defn show-methods
diff --git a/project.clj b/project.clj
index 42f1763..be81205 100644
--- a/project.clj
+++ b/project.clj
@@ -14,6 +14,7 @@
   :source-paths ["src/clj"]
   :java-source-paths ["src/java"]
   :jvm-opts ["-Dprotobuf.impl=flatland"]
+  :aot [protobuf.impl.flatland.core]
   :profiles {
     :ubercompile {
       :aot :all}
diff --git a/src/clj/protobuf/common.clj b/src/clj/protobuf/common.clj
new file mode 100644
index 0000000..a1d3daf
--- /dev/null
+++ b/src/clj/protobuf/common.clj
@@ -0,0 +1,52 @@
+(ns protobuf.common)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn get-class
+  [this]
+  (:protobuf-class (.contents this)))
+
+(defn get-instance
+  [this]
+  (:instance (.contents this)))
+
+(defn get-wrapper
+  [this]
+  (:java-wrapper (.contents this)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def associative-behaviour
+  {:containsKey (fn [this data] (.containsKey (get-instance this) data))
+   :entryAt (fn [this data] (.entryAt (get-instance this) data))})
+
+(def iterable-behaviour
+  {:forEach (fn [this consumer] (.forEach (get-instance this) consumer))
+   :iterator (fn [this] (.iterator (get-instance this)))
+   :spliterator (fn [this] (.spliterator (get-instance this)))})
+
+(def lookup-behaviour
+  {:valAt (fn ([this k] (.valAt (get-instance this) k))
+              ([this k fallback] (.valAt (get-instance this) k fallback)))})
+
+(def persistent-collection-behaviour
+  {:cons (fn [this o] (.cons (get-instance this) o))
+   :count (fn [this] (.count (get-instance this)))
+   :empty (fn [this] (.empty (get-instance this)))
+   :equiv (fn [this o]
+           (and (= (get-class this) (get-class o))
+                (.equiv (get-instance this) (get-instance o))))})
+
+(def persistent-map-behaviour
+  {:assoc (fn [this k v] (.assoc (get-instance this) k v))
+   :without (fn [this k] (.without (get-instance this) k))})
+
+(def printable-behaviour
+  {:toString (fn [this] (.toString (get-instance this)))})
+
+(def seqable-behaviour
+  {:seq (fn [this] (.seq (get-instance this)))})
diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 08d0433..8585291 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -1,4 +1,5 @@
 (ns protobuf.core
+  "This is the public API for working with protocol buffers."
   (:require
     [protobuf.impl.flatland.core :as flatland])
   (:import
@@ -7,9 +8,10 @@
 
 (defprotocol ProtoBufAPI
   (->bytes [this])
+  (->schema [this])
   (bytes-> [this bytes])
   (read [this in])
-  (write [this out & args]))
+  (write [this out]))
 
 (extend FlatlandProtoBuf
         ProtoBufAPI
@@ -18,17 +20,26 @@
 (def default-impl-name "flatland")
 
 (defn get-impl
+  "Get the currently configured protobuf implementation. If not defined,
+  used the hard-coded default value (see `default-impl-name`).
+
+  Note that the protobuf backend implementation is configured using
+  JVM system properties (i.e., the `-D` option). Projects that use `lein`
+  may set this with `:jvm-opts`
+  (e.g, `:jvm-opts [\"-Dprotobuf.impl=flatland\"]`)."
   []
   (keyword (or (System/getProperty "protobuf.impl")
                default-impl-name)))
 
 (defn schema
+  "This function is designed to be called against compiled Java protocol
+  buffer classes. To get the schema of a Clojure protobuf instance, you'll
+  want to use the `->schema` method."
   [protobuf-class]
-  (let [impls {:flatland flatland/schema}
-        impl (get-impl)]
-    ((impl impls) protobuf-class)))
+  (case (get-impl)
+    :flatland (FlatlandProtoBuf/schema protobuf-class)))
 
 (defn create
   [protobuf-class data]
   (case (get-impl)
-    :flatland (flatland/create protobuf-class data)))
+    :flatland (new FlatlandProtoBuf protobuf-class data)))
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index 39c025a..e7f4b75 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -1,40 +1,119 @@
 (ns protobuf.impl.flatland.core
   "This implementation takes its name from the original code for this project
   that was done under the flatland Github org and which pulled in several
-  flatland libraries as dependencies."
+  flatland libraries as dependencies.
+
+  This namespace is an internal implementation detail not intended for
+  developers. The API for working with all implementations of protocol
+  buffer backends for this project is provided in the `protobuf.core`
+  namespace."
   (:require
+    [protobuf.common :as common]
     [protobuf.impl.flatland.map :as protobuf-map]
-    [protobuf.impl.flatland.mapdef :as protobuf]))
-
-(defrecord FlatlandProtoBuf
-  [protobuf-class
-   java-wrapper
-   init-data
-   instance])
+    [protobuf.impl.flatland.mapdef :as protobuf])
+  (:gen-class
+    :name protobuf.impl.flatland.core.FlatlandProtoBuf
+    :implements [clojure.lang.Associative
+                 clojure.lang.ILookup
+                 clojure.lang.IPersistentCollection
+                 clojure.lang.IPersistentMap
+                 clojure.lang.Seqable
+                 java.lang.Iterable]
+    :init init
+    :constructors {[java.lang.Class
+                    clojure.lang.APersistentMap]
+                   []}
+    :methods [^:static [schema [Object] Object]]
+    :state contents
+    :main false))
 
-(defn create
+(defn -init
   [protobuf-class data]
   (let [wrapper (protobuf/mapdef protobuf-class)]
-    (map->FlatlandProtoBuf
-      {:protobuf-class protobuf-class
-       :java-wrapper wrapper
-       :instance (protobuf/create wrapper data)})))
+    [[] {:instance (protobuf/create wrapper data)
+         :java-wrapper wrapper
+         :protobuf-class protobuf-class}]))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -containsKey (:containsKey common/associative-behaviour))
+(def -entryAt (:entryAt common/associative-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -valAt (:valAt common/lookup-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   clojure.lang.IPersistentCollection   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -cons (:cons common/persistent-collection-behaviour))
+(def -count (:count common/persistent-collection-behaviour))
+(def -empty (:empty common/persistent-collection-behaviour))
+(def -equiv (:equiv common/persistent-collection-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   clojure.lang.IPersistentMap   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn -assoc
+  [this k v]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:assoc common/persistent-map-behaviour) this k v)))
+
+(defn -without
+  [this k]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:without common/persistent-map-behaviour) this k)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   clojure.lang.Seqable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -seq (:seq common/seqable-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   java.lang.Iterable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -forEach (:forEach common/iterable-behaviour))
+(def -iterator (:iterator common/iterable-behaviour))
+(def -spliterator (:spliterator common/iterable-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   java.lang.Object   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def -toString (:toString common/printable-behaviour))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;   protobuf.core.ProtoBufAPI   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn schema
+(defn -schema
   [protobuf-class]
   (protobuf/mapdef->schema
    (protobuf/mapdef protobuf-class)))
 
 (def behaviour
   {:->bytes (fn [this]
-             (protobuf-map/->bytes (:instance this)))
-   :->schema (fn [this & args]
-              (apply protobuf/mapdef->schema args))
+             (protobuf-map/->bytes (common/get-instance this)))
+   :->schema (fn [this]
+             (protobuf/mapdef->schema (common/get-wrapper this)))
    :bytes-> (fn [this bytes]
-             (create
-              (:protobuf-class this)
-              (protobuf/parse (:java-wrapper this) bytes)))
+             (new protobuf.impl.flatland.core.FlatlandProtoBuf
+               (common/get-class this)
+               (protobuf/parse (common/get-wrapper this) bytes)))
    :read (fn [this in]
-          (protobuf/read (:java-wrapper this) in))
-   :write (fn [this out & protobufs]
-           (apply protobuf/write (concat [out] protobufs)))})
+          (new protobuf.impl.flatland.core.FlatlandProtoBuf
+            (common/get-class this)
+            (first
+              (protobuf/read (common/get-wrapper this) in))))
+   :write (fn [this out]
+           (protobuf/write out (common/get-instance this)))})
diff --git a/src/java/protobuf/PersistentProtocolBufferMap.java b/src/java/protobuf/PersistentProtocolBufferMap.java
index 80626a1..35530d1 100644
--- a/src/java/protobuf/PersistentProtocolBufferMap.java
+++ b/src/java/protobuf/PersistentProtocolBufferMap.java
@@ -520,7 +520,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
         Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByNumber((Integer)value);
         if (enum_value == null) {
           PrintWriter err = (PrintWriter)RT.ERR.deref();
-          err.format("invalid enum number %s for enum type %s\n", value, enum_type.getFullName());
+          err.format("ERROR: Invalid enum number %s for enum type %s\n", value, enum_type.getFullName());
         }
         return enum_value;
       }
@@ -541,7 +541,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
         Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
         if (enum_value == null) {
           PrintWriter err = (PrintWriter)RT.ERR.deref();
-          err.format("invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
+          err.format("ERROR: Invalid enum value %s for enum type %s\n", name, enum_type.getFullName());
         }
         return enum_value;
       case MESSAGE:

From d0ccd53db6b1c79a788256d907981e86428e43e8 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:12:29 -0600
Subject: [PATCH 441/525] Updated docs.

---
 README.md                                  | 14 +--
 resources/docs/1000-basic-usage.md         | 19 ++---
 resources/docs/1050-tutorial.md            | 99 ++++++++++++++--------
 resources/docs/1100-extensions.md          | 38 ++++++---
 resources/protobuf/examples/tutorial.proto |  8 +-
 5 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index f72aa9d..cea656a 100644
--- a/README.md
+++ b/README.md
@@ -64,30 +64,30 @@ Now you can use the protocol buffer in Clojure:
 (import (your.namespace.person Example$Person)
 
 (def alice (protobuf/create Example$Person
-                            {:id 4 :name "Alice" :email "alice@example.com"}))
+                            {:id 108
+                             :name "Alice"
+                             :email "alice@example.com"}))
 ```
 
 Makes some changes to the data and serialize to bytes:
 
 ```clj
 (def b (-> alice
-           (assoc-in [:instance :name] "Alice B. Carol")
-           (assoc-in [:instance :likes] ["climbing" "running" "jumping"])
+           (assoc :name "Alice B. Carol")
+           (assoc :likes ["climbing" "running" "jumping"])
            (protobuf/->bytes)))
 ```
 
 Round-trip the bytes back to a probuf object:
 
 ```clj
-(->> b
-     (protobuf/bytes-> alice)
-     :instance)
+(protobuf/bytes-> alice b)
 ```
 
 Which gives us:
 
 ```clj
-{:id 4,
+{:id 108,
  :name "Alice B. Carol",
  :email "alice@example.com",
  :likes ["climbing" "running" "jumping"]}
diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
index 9fcf4ed..78a5df4 100644
--- a/resources/docs/1000-basic-usage.md
+++ b/resources/docs/1000-basic-usage.md
@@ -54,21 +54,20 @@ Now we can create a protobuf:
                              :name "Alice"
                              :email "alice@example.com"}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> (:instance p)
+[protobuf.dev] λ=> p
 {:id 108, :name "Alice", :email "alice@example.com"}
 ```
 
 With our person data in place, we can now do the usual Clojure operations:
 
 ```clj
-[protobuf.dev] λ=> (-> p
-                       (assoc-in [:instance :name] "Alice B. Carol")
-                       :instance)
+[protobuf.dev] λ=> (assoc p :name "Alice B. Carol")
 {:id 108, :name "Alice B. Carol", :email "alice@example.com"}
-[protobuf.dev] λ=> (-> p
-                       (assoc-in [:instance :likes] ["climbing" "running" "jumping"])
-                       :instance)
-{:id 108, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+[protobuf.dev] λ=> (assoc p :likes ["climbing" "running" "jumping"])
+{:id 108,
+ :name "Alice",
+ :email "alice@example.com",
+ :likes ["climbing" "running" "jumping"]}
 ```
 
 Additionally, converting between protobuf bytes and Clojure data is trivial:
@@ -78,8 +77,6 @@ Additionally, converting between protobuf bytes and Clojure data is trivial:
 #'protobuf.dev/b
 [protobuf.dev] λ=> b
 #object["[B" 0x7e3a40eb "[B@7e3a40eb"]
-[protobuf.dev] λ=> (-> p
-                      (protobuf/bytes-> b)
-                      :instance)
+[protobuf.dev] λ=> (protobuf/bytes-> p b)
 {:id 108, :name "Alice", :email "alice@example.com"}
 ```
diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index 3fa0a9e..440cf50 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -254,9 +254,10 @@ nil
 Then we'll import the generated Java classes we want to use:
 
 ```clj
-[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
-                                                        AddressBookProtos$Person$PhoneNumber
-                                                        AddressBookProtos$AddressBook))
+[protobuf.dev] λ=> (import '(protobuf.examples.tutorial
+                             AddressBookProtos$Person
+                             AddressBookProtos$Person$PhoneNumber
+                             AddressBookProtos$AddressBook))
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 ```
 
@@ -301,42 +302,79 @@ not converted to Clojure data. For current status on this issue, see:
 <a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
 </blockquote>
 
-## Message Functions
 
-TBD
+## The `ProtoBufAPI`
 
-## Parsing and Serialization
+The following methods all take an instance of `protobuf.core.ProtoBufAPI` as
+their first argument. An example implementation is
+`protobuf.impl.flatland.core.FlatlandProtoBuf`.
 
-* `protobuf/parse` - Given an array or stream of bytes, we can parse these
-  to a Clojure protobuf data structure
-* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
-  an array of raw bytes
+Note that the constructor is not a method, and as such, does not take a
+`ProtoBufAPI` instance as its first arguement.
 
+### Instantiation
 
-## Creating Messages
+* `protobuf/create` - Takes a compiled protocol buffer class, as created by the
+  `protoc` compiler, as well as the data (fields) to use in creating the
+  protocol buffer message for the class. Returns a `protobuf.core.ProtoBufAPI`
+  implementation
 
-The once you have the wrapped objects, the `create` function can generate the
-appropriate protocol buffer message. Here's how to create some `PhoneNumber`
-messages:
+### Serialization and Deserialization
+
+* `protobuf/->bytes` - Given an instance of a Clojure ProtoBuf, convert its message to
+   an array of raw bytes; this is the serialization method.
+* `protobuf/bytes->` - Given an array or stream of bytes, convert it
+  to a Clojure ProtoBuf instance; this is the deserialization method.
+
+### Reading and Writing
+
+* `protobuf/read` - Given an instance of a Clojure ProtoBuf and an input
+  object (anthying that can be coerced to a `InputStream`), read from the input
+  and return a Clojure ProtoBuf.
+* `protobuf/write` - Given an instance of a Clojure ProtoBuf and an output
+  object (anthying that can be coerced to a `OutputStream`), write the
+  serialized bytes of the instance to the output.
+
+### Inspection
+
+* `protobuf/->schema` - Given an instance of a Clojure ProtoBuf, return the
+  data for its protocol buffer schema.
+
+
+## Example Usage
+
+### Creating Messages
+
+The `create` function generates the appropriate protocol buffer message.
+We'll use that now to create a list of `PhoneNumber` messages:
 
 ```clj
 [protobuf.dev] λ=> (def phones [(protobuf/create AddressBookProtos$Person$PhoneNumber
-                                                 :number "555-1212" :type "HOME")
+                                                 {:number "555-1212" :type :home})
                                 (protobuf/create AddressBookProtos$Person$PhoneNumber
-                                                 :number "555-1213" :type "MOBILE")
+                                                 {:number "555-1213" :type :mobile})
                                 (protobuf/create AddressBookProtos$Person$PhoneNumber
-                                                 :number "555-1214" :type "WORK")])
+                                                 {:number "555-1214" :type :work})])
 #'protobuf.dev/phones
 ```
 
+<blockquote>
+Note that currently only lower-case enum values are supported by Clojure
+protobuf; if you create `.proto` files with enum fields whose values contain
+any capital letters, your code will be unstable and likely eventually break.
+
+For current status on this issue, see
+<a href="https://github.com/clojusc/protobuf/issues/25">https://github.com/clojusc/protobuf/issues/25</a>
+</blockquote>
+
 Now we can use these when creating our `Person` message:
 
 ```clj
 [protobuf.dev] λ=> (def alice (protobuf/create AddressBookProtos$Person
-                                               :id 108
-                                               :name "Alice"
-                                               :email "alice@example.com"
-                                               :phones phones))
+                                               {:id 108
+                                                :name "Alice"
+                                                :email "alice@example.com"
+                                                :phones phones}))
 #'protobuf.dev/alice
 ```
 
@@ -344,7 +382,7 @@ And then that can be used when creating (or updating) an `AddressBook` message:
 
 ```clj
 [protobuf.dev] λ=> (def addresses (protobuf/create AddressBookProtos$AddressBook
-                                                   :people [alice]))
+                                                   {:people [alice]}))
 #'protobuf.dev/addresses
 ```
 
@@ -364,12 +402,12 @@ nil
 ```
 
 
-## Writing a Messages
+### Writing a Messages
 
 These can then be written to an output stream:
 
 ```clj
-[protobuf.dev] λ=> (protobuf/write "/tmp/address-book.db" addresses)
+[protobuf.dev] λ=> (protobuf/write addresses "/tmp/address-book.db")
 nil
 ```
 
@@ -381,21 +419,14 @@ Take a look at the contents of `/tmp/address-book.db` to convince yourself the
 the data was actually written there. Then, we'll try reading it back in ...
 
 
-## Reading a Message
+### Reading a Message
 
 Reading stored protobuf data is just as easy as writing it:
 
 ```clj
-[protobuf.dev] λ=> (def address-book (protobuf/read AddressBook "/tmp/address-book.db"))
+[protobuf.dev] λ=> (def address-book (protobuf/read addresses "/tmp/address-book.db"))
 #'protobuf.dev/address-book
-```
-
-Now, keep in mind that the read operation produces a lazy sequence, so if
-we're to compare the `addresses` data with the new `address-book` data, we need
-to realize the latter, e.g.:
-
-```clj
-[protobuf.dev] λ=> (= addresses (into {} address-book))
+[protobuf.dev] λ=> (= addresses address-book)
 true
 ```
 
diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
index 169808e..a288bb1 100644
--- a/resources/docs/1100-extensions.md
+++ b/resources/docs/1100-extensions.md
@@ -54,10 +54,6 @@ protobuf.examples.photo.Example$Photo$Tag
 Create our protobuf:
 
 ```clj
-[protobuf.dev] λ=> (def Photo (protobuf/mapdef Example$Photo))
-#'protobuf.dev/Photo
-[protobuf.dev] λ=> (def Tag (protobuf/mapdef Example$Photo$Tag))
-#'protobuf.dev/Tag
 [protobuf.dev] λ=> (def p (protobuf/create
                             Example$Photo
                             {:id 7
@@ -70,7 +66,7 @@ Create our protobuf:
                                         :width 25
                                         :height 27}}}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> (:instance p)
+[protobuf.dev] λ=> p
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},
@@ -86,7 +82,7 @@ Convert to and from bytes:
 #'protobuf.dev/b
 [protobuf.dev] λ=> b
 #object["[B" 0x4455bb6e "[B@4455bb6e"]
-[protobuf.dev] λ=> (:instance (protobuf/bytes-> p b))
+[protobuf.dev] λ=> (protobuf/bytes-> p b)
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},
@@ -98,14 +94,28 @@ Convert to and from bytes:
 Get the schema for a protobuf (or extract a part of it):
 
 ```clj
-[protobuf.dev] λ=> (protobuf/mapdef->schema Tag)
- :name "protobuf.examples.photo.Photo.Tag",
+[protobuf.dev] λ=> (protobuf/->schema p)
+{:type :struct,
+ :name "protobuf.examples.photo.Photo",
  :fields
- {:person-id {:type :int},
-  :x-coord {:type :int, :max 100.0, :min -100.0},
-  :y-coord {:type :int},
-  :width {:type :int},
-  :height {:type :int}}}
-[protobuf.dev] λ=> (get-in (protobuf/mapdef->schema Tag) [:fields :x-coord])
+ {:id {:type :int},
+  :path {:type :string},
+  :labels {:type :set, :values {:type :string}},
+  :attrs {:type :map, :keys {:type :string}, :values {:type :string}},
+  :tags
+  {:type :map,
+   :keys {:type :int},
+   :values
+   {:type :struct,
+    :name "protobuf.examples.photo.Photo.Tag",
+    :fields
+    {:person-id {:type :int},
+     :x-coord {:type :int, :max 100.0, :min -100.0},
+     :y-coord {:type :int},
+     :width {:type :int},
+     :height {:type :int}}}},
+  :image {:type :byte_string}}}
+[protobuf.dev] λ=> (get-in (protobuf/->schema p)
+                           [:fields :tags :values :fields :x-coord])
 {:type :int, :max 100.0, :min -100.0}
 ```
diff --git a/resources/protobuf/examples/tutorial.proto b/resources/protobuf/examples/tutorial.proto
index 9927720..a024afa 100644
--- a/resources/protobuf/examples/tutorial.proto
+++ b/resources/protobuf/examples/tutorial.proto
@@ -11,14 +11,14 @@ message Person {
   optional string email = 3;
 
   enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
+    mobile = 0;
+    home = 1;
+    work = 2;
   }
 
   message PhoneNumber {
     required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    optional PhoneType type = 2 [default = home];
   }
 
   repeated PhoneNumber phones = 4;

From 06fe89001fb0fb1b8c368450a3fb615666ae629d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:13:14 -0600
Subject: [PATCH 442/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html            |  29 +-
 docs/current/1050-tutorial.html               |  84 +-
 docs/current/1100-extensions.html             |  56 +-
 docs/current/9800-marginalia.html             |   2 +-
 docs/current/9900-javadoc.html                |   2 +-
 docs/current/9999-other-versions.html         |   2 +-
 docs/current/index.html                       |   2 +-
 docs/current/javadoc/allclasses-frame.html    |   4 +-
 docs/current/javadoc/allclasses-noframe.html  |   4 +-
 docs/current/javadoc/constant-values.html     |   4 +-
 docs/current/javadoc/deprecated-list.html     |   4 +-
 docs/current/javadoc/help-doc.html            |   4 +-
 docs/current/javadoc/index-all.html           |   4 +-
 docs/current/javadoc/index.html               |  13 +-
 docs/current/javadoc/overview-tree.html       |   4 +-
 docs/current/javadoc/protobuf/Extensions.html |   4 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |   4 +-
 .../PersistentProtocolBufferMap.Def.html      |   4 +-
 .../protobuf/PersistentProtocolBufferMap.html |   4 +-
 .../javadoc/protobuf/package-frame.html       |   4 +-
 .../javadoc/protobuf/package-summary.html     |   4 +-
 .../javadoc/protobuf/package-tree.html        |   4 +-
 docs/current/javadoc/serialized-form.html     |   4 +-
 docs/current/marginalia.html                  | 728 +++++++++++-------
 docs/current/protobuf.common.html             |   3 +
 docs/current/protobuf.core.html               |   4 +-
 .../current/protobuf.impl.flatland.codec.html |   3 +
 docs/current/protobuf.impl.flatland.core.html |   4 +
 docs/current/protobuf.impl.flatland.map.html  |   3 +
 .../protobuf.impl.flatland.mapdef.html        |   4 +
 .../protobuf.impl.flatland.schema.html        |   3 +
 docs/current/protobuf.util.html               |   2 +-
 32 files changed, 590 insertions(+), 414 deletions(-)
 create mode 100644 docs/current/protobuf.common.html
 create mode 100644 docs/current/protobuf.impl.flatland.codec.html
 create mode 100644 docs/current/protobuf.impl.flatland.core.html
 create mode 100644 docs/current/protobuf.impl.flatland.map.html
 create mode 100644 docs/current/protobuf.impl.flatland.mapdef.html
 create mode 100644 docs/current/protobuf.impl.flatland.schema.html

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index 3504f44..aa08f00 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
@@ -25,31 +25,30 @@ <h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the
 [protobuf.dev] λ=&gt; (import '(protobuf.examples.person Example$Person))
 protobuf.examples.person.Example$Person
 </code></pre>
-<p>Now we can create the Java wrapper for our protocol (see <code>protobuf.PersistentProtocolBufferMap</code> for more details):</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef Example$Person))
-#'protobuf.dev/Person
-</code></pre>
-<p>And with this in hand, we can finally create an instance of the protobuf:</p>
+<p>Now we can create a protobuf:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
-                            Person
-                            :id 4
-                            :name "Alice"
-                            :email "alice@example.com"))
+                            Example$Person
+                            {:id 108
+                             :name "Alice"
+                             :email "alice@example.com"}))
 #'protobuf.dev/p
 [protobuf.dev] λ=&gt; p
-{:id 4, :name "Alice", :email "alice@example.com"}
+{:id 108, :name "Alice", :email "alice@example.com"}
 </code></pre>
 <p>With our person data in place, we can now do the usual Clojure operations:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (assoc p :name "Alice B. Carol")
-{:id 4, :name "Alice B. Carol", :email "alice@example.com"}
+{:id 108, :name "Alice B. Carol", :email "alice@example.com"}
 [protobuf.dev] λ=&gt; (assoc p :likes ["climbing" "running" "jumping"])
-{:id 4, :name "Alice", :email "alice@example.com", :likes ["climbing" "running" "jumping"]}
+{:id 108,
+ :name "Alice",
+ :email "alice@example.com",
+ :likes ["climbing" "running" "jumping"]}
 </code></pre>
 <p>Additionally, converting between protobuf bytes and Clojure data is trivial:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
 #'protobuf.dev/b
 [protobuf.dev] λ=&gt; b
 #object["[B" 0x7e3a40eb "[B@7e3a40eb"]
-[protobuf.dev] λ=&gt; (protobuf/parse Person b)
-{:id 4, :name "Alice", :email "alice@example.com"}
+[protobuf.dev] λ=&gt; (protobuf/bytes-&gt; p b)
+{:id 108, :name "Alice", :email "alice@example.com"}
 </code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 82ff6be..7d3d16e 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
@@ -118,22 +118,15 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
 nil
 </code></pre>
 <p>Then we’ll import the generated Java classes we want to use:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial AddressBookProtos$Person
-                                                        AddressBookProtos$Person$PhoneNumber
-                                                        AddressBookProtos$AddressBook))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial
+                             AddressBookProtos$Person
+                             AddressBookProtos$Person$PhoneNumber
+                             AddressBookProtos$AddressBook))
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 </code></pre>
 <p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
-<p>Next we’ll use a Java wrapper that let’s us treat these like maps:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef AddressBookProtos$Person))
-#'protobuf.dev/Person
-[protobuf.dev] λ=&gt; (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
-#'protobuf.dev/PhoneNumber
-[protobuf.dev] λ=&gt; (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
-#'protobuf.dev/AddressBook
-</code></pre>
 <p>We can view the full, nested data schema in Clojure data:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/mapdef-&gt;schema AddressBook))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
  :name "tutorial.AddressBook",
  :fields
@@ -161,30 +154,51 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
 nil
 </code></pre>
 <p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
-<h2><a href="#message-functions" name="message-functions"></a>Message Functions</h2>
-<p>TBD</p>
-<h2><a href="#parsing-and-serialization" name="parsing-and-serialization"></a>Parsing and Serialization</h2>
+<h2><a href="#the" name="the"></a>The <code>ProtoBufAPI</code></h2>
+<p>The following methods all take an instance of <code>protobuf.core.ProtoBufAPI</code> as their first argument. An example implementation is <code>protobuf.impl.flatland.core.FlatlandProtoBuf</code>.</p>
+<p>Note that the constructor is not a method, and as such, does not take a <code>ProtoBufAPI</code> instance as its first arguement.</p>
+<h3><a href="#instantiation" name="instantiation"></a>Instantiation</h3>
+<ul>
+  <li><code>protobuf/create</code> - Takes a compiled protocol buffer class, as created by the  <code>protoc</code> compiler, as well as the data (fields) to use in creating the  protocol buffer message for the class. Returns a <code>protobuf.core.ProtoBufAPI</code>  implementation</li>
+</ul>
+<h3><a href="#serialization-and-deserialization" name="serialization-and-deserialization"></a>Serialization and Deserialization</h3>
+<ul>
+  <li><code>protobuf/-&gt;bytes</code> - Given an instance of a Clojure ProtoBuf, convert its message to  an array of raw bytes; this is the serialization method.</li>
+  <li><code>protobuf/bytes-&gt;</code> - Given an array or stream of bytes, convert it  to a Clojure ProtoBuf instance; this is the deserialization method.</li>
+</ul>
+<h3><a href="#reading-and-writing" name="reading-and-writing"></a>Reading and Writing</h3>
+<ul>
+  <li><code>protobuf/read</code> - Given an instance of a Clojure ProtoBuf and an input  object (anthying that can be coerced to a <code>InputStream</code>), read from the input  and return a Clojure ProtoBuf.</li>
+  <li><code>protobuf/write</code> - Given an instance of a Clojure ProtoBuf and an output  object (anthying that can be coerced to a <code>OutputStream</code>), write the  serialized bytes of the instance to the output.</li>
+</ul>
+<h3><a href="#inspection" name="inspection"></a>Inspection</h3>
 <ul>
-  <li><code>protobuf/parse</code> - Given an array or stream of bytes, we can parse these  to a Clojure protobuf data structure</li>
-  <li><code>protobuf/-&gt;bytes</code> - Given a Java protobuf wrapper, we can convert this to  an array of raw bytes</li>
+  <li><code>protobuf/-&gt;schema</code> - Given an instance of a Clojure ProtoBuf, return the  data for its protocol buffer schema.</li>
 </ul>
-<h2><a href="#creating-messages" name="creating-messages"></a>Creating Messages</h2>
-<p>The once you have the wrapped objects, the <code>create</code> function can generate the appropriate protocol buffer message. Here’s how to create some <code>PhoneNumber</code> messages:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def phones [(protobuf/create PhoneNumber :number "555-1212" :type "HOME")
-                                (protobuf/create PhoneNumber :number "555-1213" :type "MOBILE")
-                                (protobuf/create PhoneNumber :number "555-1214" :type "WORK")])
+<h2><a href="#example-usage" name="example-usage"></a>Example Usage</h2>
+<h3><a href="#creating-messages" name="creating-messages"></a>Creating Messages</h3>
+<p>The <code>create</code> function generates the appropriate protocol buffer message. We’ll use that now to create a list of <code>PhoneNumber</code> messages:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def phones [(protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1212" :type :home})
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1213" :type :mobile})
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1214" :type :work})])
 #'protobuf.dev/phones
 </code></pre>
+<p></p><blockquote> Note that currently only lower-case enum values are supported by Clojure protobuf; if you create <code>.proto</code> files with enum fields whose values contain any capital letters, your code will be unstable and likely eventually break.<p></p>
+<p>For current status on this issue, see <a href="https://github.com/clojusc/protobuf/issues/25"></a><a href="https://github.com/clojusc/protobuf/issues/25">https://github.com/clojusc/protobuf/issues/25</a> </p></blockquote><p></p>
 <p>Now we can use these when creating our <code>Person</code> message:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def alice (protobuf/create Person
-                                               :id 108
-                                               :name "Alice"
-                                               :email "alice@example.com"
-                                               :phones phones))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def alice (protobuf/create AddressBookProtos$Person
+                                               {:id 108
+                                                :name "Alice"
+                                                :email "alice@example.com"
+                                                :phones phones}))
 #'protobuf.dev/alice
 </code></pre>
 <p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def addresses (protobuf/create AddressBook :people [alice]))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def addresses (protobuf/create AddressBookProtos$AddressBook
+                                                   {:people [alice]}))
 #'protobuf.dev/addresses
 </code></pre>
 <p>Let’s take a quick look at the result:</p>
@@ -199,20 +213,18 @@ <h2><a href="#creating-messages" name="creating-messages"></a>Creating Messages<
     {:number "555-1214", :type :work}]}]}
 nil
 </code></pre>
-<h2><a href="#writing-a-messages" name="writing-a-messages"></a>Writing a Messages</h2>
+<h3><a href="#writing-a-messages" name="writing-a-messages"></a>Writing a Messages</h3>
 <p>These can then be written to an output stream:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write "/tmp/address-book.db" addresses)
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write addresses "/tmp/address-book.db")
 nil
 </code></pre>
 <p>Note that the first argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
 <p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself the the data was actually written there. Then, we’ll try reading it back in …</p>
-<h2><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h2>
+<h3><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h3>
 <p>Reading stored protobuf data is just as easy as writing it:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read AddressBook "/tmp/address-book.db"))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read addresses "/tmp/address-book.db"))
 #'protobuf.dev/address-book
-</code></pre>
-<p>Now, keep in mind that the read operation produces a lazy sequence, so if we’re to compare the <code>addresses</code> data with the new <code>address-book</code> data, we need to realize the latter, e.g.:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (= addresses (into {} address-book))
+[protobuf.dev] λ=&gt; (= addresses address-book)
 true
 </code></pre>
 <h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index 385cd08..c897be2 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
@@ -40,17 +40,17 @@
 protobuf.examples.photo.Example$Photo$Tag
 </code></pre>
 <p>Create our protobuf:</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (def Photo (protobuf/mapdef Example$Photo))
-#'protobuf.dev/Photo
-[protobuf.dev] λ=&gt; (def Tag (protobuf/mapdef Example$Photo$Tag))
-#'protobuf.dev/Tag
-[protobuf.dev] λ=&gt; (def p (protobuf/create
-                            Photo
-                            :id 7
-                            :path "/photos/h2k3j4h9h23"
-                            :labels #{"hawaii" "family" "surfing"}
-                            :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
-                            :tags  {4 {:person_id 4, :x_coord 607, :y_coord 813, :width 25, :height 27}}))
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Example$Photo
+                            {:id 7
+                             :path "/photos/h2k3j4h9h23"
+                             :labels #{"hawaii" "family" "surfing"}
+                             :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                             :tags  {4 {:person_id 4
+                                        :x_coord 607
+                                        :y_coord 813
+                                        :width 25
+                                        :height 27}}}))
 #'protobuf.dev/p
 [protobuf.dev] λ=&gt; p
 {:id 7,
@@ -65,7 +65,7 @@
 #'protobuf.dev/b
 [protobuf.dev] λ=&gt; b
 #object["[B" 0x4455bb6e "[B@4455bb6e"]
-[protobuf.dev] λ=&gt; (protobuf/parse Photo b)
+[protobuf.dev] λ=&gt; (protobuf/bytes-&gt; p b)
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},
@@ -74,14 +74,28 @@
  {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
 </code></pre>
 <p>Get the schema for a protobuf (or extract a part of it):</p>
-<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/mapdef-&gt;schema Tag)
- :name "protobuf.examples.photo.Photo.Tag",
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/-&gt;schema p)
+{:type :struct,
+ :name "protobuf.examples.photo.Photo",
  :fields
- {:person-id {:type :int},
-  :x-coord {:type :int, :max 100.0, :min -100.0},
-  :y-coord {:type :int},
-  :width {:type :int},
-  :height {:type :int}}}
-[protobuf.dev] λ=&gt; (get-in (protobuf/mapdef-&gt;schema Tag) [:fields :x-coord])
+ {:id {:type :int},
+  :path {:type :string},
+  :labels {:type :set, :values {:type :string}},
+  :attrs {:type :map, :keys {:type :string}, :values {:type :string}},
+  :tags
+  {:type :map,
+   :keys {:type :int},
+   :values
+   {:type :struct,
+    :name "protobuf.examples.photo.Photo.Tag",
+    :fields
+    {:person-id {:type :int},
+     :x-coord {:type :int, :max 100.0, :min -100.0},
+     :y-coord {:type :int},
+     :width {:type :int},
+     :height {:type :int}}}},
+  :image {:type :byte_string}}}
+[protobuf.dev] λ=&gt; (get-in (protobuf/-&gt;schema p)
+                           [:fields :tags :values :fields :x-coord])
 {:type :int, :max 100.0, :min -100.0}
 </code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 0345a51..65c834a 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index b02ffdb..207deaf 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index e3758b4..9ab170d 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index 785dfc5..0a44927 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.0</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.0"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.codec.html">protobuf.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.codec.html#var-create">create</a> </li><li> <a href="protobuf.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.core.html#var-combine">combine</a> </li><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.core.html#var-map.3F">map?</a> </li><li> <a href="protobuf.core.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.core.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.core.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.core.html#var-parse">parse</a> </li><li> <a href="protobuf.core.html#var-protobuf">protobuf</a> </li><li> <a href="protobuf.core.html#var-protobuf-dump">protobuf-dump</a> </li><li> <a href="protobuf.core.html#var-protobuf-load">protobuf-load</a> </li><li> <a href="protobuf.core.html#var-protobuf-load-stream">protobuf-load-stream</a> </li><li> <a href="protobuf.core.html#var-protobuf-schema">protobuf-schema</a> </li><li> <a href="protobuf.core.html#var-protobuf-seq">protobuf-seq</a> </li><li> <a href="protobuf.core.html#var-protobuf-write">protobuf-write</a> </li><li> <a href="protobuf.core.html#var-protobuf.3F">protobuf?</a> </li><li> <a href="protobuf.core.html#var-protodef">protodef</a> </li><li> <a href="protobuf.core.html#var-protodef.3F">protodef?</a> </li><li> <a href="protobuf.core.html#var-read">read</a> </li><li> <a href="protobuf.core.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.schema.html">protobuf.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 2c2b642..1f4d74d 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index 0c99b0f..5a585f5 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 456140c..04da98f 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index bd44fd3..6e6f8f8 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 5d8820b..4166b6e 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 4c4f081..f666a14 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index a50837d..930d91f 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,15 +2,14 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
-    tmpTargetPage = "" + window.location.search;
-    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
-        tmpTargetPage = tmpTargetPage.substring(1);
-    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
-        tmpTargetPage = "undefined";
-    targetPage = tmpTargetPage;
+    targetPage = "" + window.location.search;
+    if (targetPage != "" && targetPage != "undefined")
+        targetPage = targetPage.substring(1);
+    if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
+        targetPage = "undefined";
     function validURL(url) {
         try {
             url = decodeURIComponent(url);
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index b28bbb7..88cfedb 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 3ff40d9..2374e46 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 4f73bfc..9c93001 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 2ddce0f..4d15b41 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 4434462..43d4d29 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 32882cf..02d9677 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index ec29f86..335594a 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index db2c40f..ee8bf2f 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index ad380bc..009df5c 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Mon Dec 25 16:35:14 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-25">
+<meta name="date" content="2017-12-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 2b4940e..00606f3 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -2865,8 +2865,435 @@
     build_tree: build_tree
   };
 })(SyntaxHighlighter);
-</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.0</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
-</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.schema">protobuf.schema</a></li><li><a href="#protobuf.codec">protobuf.codec</a></li><li><a href="#protobuf.core">protobuf.core</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.1-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.common">protobuf.common</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.util">protobuf.util</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-class
+  [this]
+  (:protobuf-class (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-instance
+  [this]
+  (:instance (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-wrapper
+  [this]
+  (:java-wrapper (.contents this)))</pre></td></tr><tr><td class="docs"><p>  Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def associative-behaviour
+  {:containsKey (fn [this data] (.containsKey (get-instance this) data))
+   :entryAt (fn [this data] (.entryAt (get-instance this) data))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def iterable-behaviour
+  {:forEach (fn [this consumer] (.forEach (get-instance this) consumer))
+   :iterator (fn [this] (.iterator (get-instance this)))
+   :spliterator (fn [this] (.spliterator (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def lookup-behaviour
+  {:valAt (fn ([this k] (.valAt (get-instance this) k))
+              ([this k fallback] (.valAt (get-instance this) k fallback)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-collection-behaviour
+  {:cons (fn [this o] (.cons (get-instance this) o))
+   :count (fn [this] (.count (get-instance this)))
+   :empty (fn [this] (.empty (get-instance this)))
+   :equiv (fn [this o]
+           (and (= (get-class this) (get-class o))
+                (.equiv (get-instance this) (get-instance o))))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-map-behaviour
+  {:assoc (fn [this k v] (.assoc (get-instance this) k v))
+   :without (fn [this k] (.without (get-instance this) k))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def printable-behaviour
+  {:toString (fn [this] (.toString (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def seqable-behaviour
+  {:seq (fn [this] (.seq (get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This is the public API for working with protocol buffers.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
+  (:require
+    [protobuf.impl.flatland.core :as flatland])
+  (:import
+    (protobuf.impl.flatland.core FlatlandProtoBuf))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol ProtoBufAPI
+  (-&gt;bytes [this])
+  (-&gt;schema [this])
+  (bytes-&gt; [this bytes])
+  (read [this in])
+  (write [this out]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend FlatlandProtoBuf
+        ProtoBufAPI
+        flatland/behaviour)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def default-impl-name &quot;flatland&quot;)</pre></td></tr><tr><td class="docs"><p>Get the currently configured protobuf implementation. If not defined,
+  used the hard-coded default value (see <code>default-impl-name</code>).</p>
+
+<p>  Note that the protobuf backend implementation is configured using
+  JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code>
+  may set this with <code>:jvm-opts</code>
+  (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-impl
+  []
+  (keyword (or (System/getProperty &quot;protobuf.impl&quot;)
+               default-impl-name)))</pre></td></tr><tr><td class="docs"><p>This function is designed to be called against compiled Java protocol
+  buffer classes. To get the schema of a Clojure protobuf instance, you'll
+  want to use the <code>-&gt;schema</code> method.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn schema
+  [protobuf-class]
+  (case (get-impl)
+    :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [protobuf-class data]
+  (case (get-impl)
+    :flatland (new FlatlandProtoBuf protobuf-class data)))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.codec" name="protobuf.impl.flatland.codec"><h1 class="project-name">protobuf.impl.flatland.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.codec
+  (:require
+    [clojure.java.io :as io]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [gloss.core :as gloss]
+    [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
+  [proto]
+  (let [proto (protobuf/mapdef proto)
+        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
+        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format &quot;In %s: %s %s&quot;
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             &quot;field is required for repeated protobufs&quot;)
+      (check (= min max)
+             &quot;must be of type fixed32 or fixed64&quot;))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
+                         #(hash-map len-key %)
+                         len-key)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [proto &amp; {:keys [validator repeated]}]
+  (let [proto (protobuf/mapdef proto)]
+    (-&gt; (reify
+          ;; Reader method
+          gloss-protocols/Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException.
+                      &quot;Invalid value in #'protobuf.impl.flatland.codec/create&quot;)))
+            (gloss-formats/to-buf-seq
+              (protobuf-map/-&gt;bytes
+                (if (protobuf-map/map? val)
+                  val
+                  (protobuf/create proto val))))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
+</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
+  [proto]
+  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
+                      len-key
+                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.core" name="protobuf.impl.flatland.core"><h1 class="project-name">protobuf.impl.flatland.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This implementation takes its name from the original code for this project
+  that was done under the flatland Github org and which pulled in several
+  flatland libraries as dependencies.</p>
+
+<p>  This namespace is an internal implementation detail not intended for
+  developers. The API for working with all implementations of protocol
+  buffer backends for this project is provided in the <code>protobuf.core</code>
+  namespace.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.core
+  (:require
+    [protobuf.common :as common]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.mapdef :as protobuf])
+  (:gen-class
+    :name protobuf.impl.flatland.core.FlatlandProtoBuf
+    :implements [clojure.lang.Associative
+                 clojure.lang.ILookup
+                 clojure.lang.IPersistentCollection
+                 clojure.lang.IPersistentMap
+                 clojure.lang.Seqable
+                 java.lang.Iterable]
+    :init init
+    :constructors {[java.lang.Class
+                    clojure.lang.APersistentMap]
+                   []}
+    :methods [^:static [schema [Object] Object]]
+    :state contents
+    :main false))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -init
+  [protobuf-class data]
+  (let [wrapper (protobuf/mapdef protobuf-class)]
+    [[] {:instance (protobuf/create wrapper data)
+         :java-wrapper wrapper
+         :protobuf-class protobuf-class}]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -containsKey (:containsKey common/associative-behaviour))
+(def -entryAt (:entryAt common/associative-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -valAt (:valAt common/lookup-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentCollection   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -cons (:cons common/persistent-collection-behaviour))
+(def -count (:count common/persistent-collection-behaviour))
+(def -empty (:empty common/persistent-collection-behaviour))
+(def -equiv (:equiv common/persistent-collection-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentMap   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -assoc
+  [this k v]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:assoc common/persistent-map-behaviour) this k v)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -without
+  [this k]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:without common/persistent-map-behaviour) this k)))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Seqable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -seq (:seq common/seqable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Iterable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -forEach (:forEach common/iterable-behaviour))
+(def -iterator (:iterator common/iterable-behaviour))
+(def -spliterator (:spliterator common/iterable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Object   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -toString (:toString common/printable-behaviour))</pre></td></tr><tr><td class="docs"><p>  protobuf.core.ProtoBufAPI   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -schema
+  [protobuf-class]
+  (protobuf/mapdef-&gt;schema
+   (protobuf/mapdef protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def behaviour
+  {:-&gt;bytes (fn [this]
+             (protobuf-map/-&gt;bytes (common/get-instance this)))
+   :-&gt;schema (fn [this]
+             (protobuf/mapdef-&gt;schema (common/get-wrapper this)))
+   :bytes-&gt; (fn [this bytes]
+             (new protobuf.impl.flatland.core.FlatlandProtoBuf
+               (common/get-class this)
+               (protobuf/parse (common/get-wrapper this) bytes)))
+   :read (fn [this in]
+          (new protobuf.impl.flatland.core.FlatlandProtoBuf
+            (common/get-class this)
+            (first
+              (protobuf/read (common/get-wrapper this) in))))
+   :write (fn [this out]
+           (protobuf/write out (common/get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.map" name="protobuf.impl.flatland.map"><h1 class="project-name">protobuf.impl.flatland.map</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.map
+  (:import
+    (protobuf PersistentProtocolBufferMap))
+  (:refer-clojure :exclude [map?]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn map?
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap p]
+  (.toByteArray p))</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
+
+<p>TODO make this nil-safe? Or just delete it?</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-raw
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.mapdef" name="protobuf.impl.flatland.mapdef"><h1 class="project-name">protobuf.impl.flatland.mapdef</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.mapdef
+  (:require
+    [clojure.java.io :as io]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.schema :as protobuf-schema]
+    [protobuf.util :as util])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
+  [obj]
+  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (mapdef map-def {})))
+  ([map-def opts]
+     (when map-def
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
+  [&amp; args]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
+
+<p>  Supported data sources are either an array of bytes or an input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmulti parse
+  (fn [map-def data &amp; _]
+    (type data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
+  ([^PersistentProtocolBufferMap$Def map-def data]
+     (when data
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap$Def map-def m]
+  (protobuf-map/-&gt;bytes (PersistentProtocolBufferMap/construct map-def m)))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
+  from the given input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn read
+  [^PersistentProtocolBufferMap$Def map-def in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (io/input-stream in)]
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (read map-def in))
+        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn write
+  [out &amp; ps]
+  (io!
+   (let [^OutputStream out (io/output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
+  PersistentProtocolBufferMap
+  (combine-onto [^PersistentProtocolBufferMap this other]
+    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  combine #'util/combine)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.schema" name="protobuf.impl.flatland.schema"><h1 class="project-name">protobuf.impl.flatland.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.schema
+  (:require
+    [clojure.string :as string]
+    [protobuf.util :as util])
+  (:import
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def )
+    (com.google.protobuf Descriptors$Descriptor
+                         Descriptors$FieldDescriptor
+                         Descriptors$FieldDescriptor$Type)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn extension
+  [ext ^Descriptors$FieldDescriptor field]
+  (-&gt; (.getOptions field)
+      (.getExtension ext)
+      (util/fix string? not-empty)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn field-type
+  [field]
+  (condp instance? field
+    Descriptors$FieldDescriptor
+    (if (.isRepeated ^Descriptors$FieldDescriptor field)
+      (condp extension field
+        (Extensions/counter)    :counter
+        (Extensions/succession) :succession
+        (Extensions/map)        :map
+        (Extensions/mapBy)      :map-by
+        (Extensions/set)        :set
+        :list)
+      :basic)
+    Descriptors$Descriptor
+    :struct))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmulti field-schema
+  (fn [field _ &amp; _] (field-type field)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn struct-schema
+  [^Descriptors$Descriptor struct
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [struct-name (.getFullName struct)]
+    (into {:type :struct
+           :name struct-name}
+          (when (not-any? (partial = struct-name) parents)
+            {:fields (into {}
+                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
+                             [(.intern map-def (.getName field))
+                              (field-schema field map-def (conj parents struct-name))]))}))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn basic-schema
+  [^Descriptors$FieldDescriptor field
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
+        meta-string (extension (Extensions/meta) field)]
+    (merge (case java-type
+             :message (struct-schema (.getMessageType field) map-def parents)
+             :enum    {:type   :enum
+                       :values (set (map #(.clojureEnumValue map-def %)
+                                         (.. field getEnumType getValues)))}
+             {:type java-type})
+           (when (.hasDefaultValue field)
+             {:default (.getDefaultValue field)})
+           (when meta-string
+             (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn subfield
+  [^Descriptors$FieldDescriptor field field-name]
+  (.findFieldByName (.getMessageType field) (name field-name)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :basic
+  [field map-def &amp; [parents]]
+  (basic-schema field map-def parents))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :list
+  [field map-def &amp; [parents]]
+  {:type   :list
+   :values (basic-schema field map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :succession
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :succession true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :counter
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :counter true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :set
+  [field map-def &amp; [parents]]
+  {:type   :set
+   :values (field-schema (subfield field :item) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map
+  [field map-def &amp; [parents]]
+  {:type   :map
+   :keys   (field-schema (subfield field :key) map-def parents)
+   :values (field-schema (subfield field :val) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map-by
+  [field map-def &amp; [parents]]
+  (let [map-by (extension (Extensions/mapBy) field)]
+    {:type   :map
+     :keys   (field-schema (subfield field map-by) map-def parents)
+     :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
+  [field map-def &amp; [parents]]
+  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
   (:import
     (clojure.lang IDeref
@@ -3020,302 +3447,7 @@
   [schema &amp; fields]
   (prewalk (to-fix #(= :struct (:type %))
                    #(apply update % :fields dissoc fields))
-           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.schema" name="protobuf.schema"><h1 class="project-name">protobuf.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.schema
-  (:require
-    [clojure.string :as string]
-    [protobuf.util :as util])
-  (:import
-    (protobuf Extensions
-              PersistentProtocolBufferMap
-              PersistentProtocolBufferMap$Def )
-    (com.google.protobuf Descriptors$Descriptor
-                         Descriptors$FieldDescriptor
-                         Descriptors$FieldDescriptor$Type)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn extension
-  [ext ^Descriptors$FieldDescriptor field]
-  (-&gt; (.getOptions field)
-      (.getExtension ext)
-      (util/fix string? not-empty)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn field-type
-  [field]
-  (condp instance? field
-    Descriptors$FieldDescriptor
-    (if (.isRepeated ^Descriptors$FieldDescriptor field)
-      (condp extension field
-        (Extensions/counter)    :counter
-        (Extensions/succession) :succession
-        (Extensions/map)        :map
-        (Extensions/mapBy)      :map-by
-        (Extensions/set)        :set
-        :list)
-      :basic)
-    Descriptors$Descriptor
-    :struct))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmulti field-schema
-  (fn [field _ &amp; _] (field-type field)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn struct-schema
-  [^Descriptors$Descriptor struct
-   ^PersistentProtocolBufferMap$Def map-def
-   &amp; [parents]]
-  (let [struct-name (.getFullName struct)]
-    (into {:type :struct
-           :name struct-name}
-          (when (not-any? (partial = struct-name) parents)
-            {:fields (into {}
-                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
-                             [(.intern map-def (.getName field))
-                              (field-schema field map-def (conj parents struct-name))]))}))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn basic-schema
-  [^Descriptors$FieldDescriptor field
-   ^PersistentProtocolBufferMap$Def map-def
-   &amp; [parents]]
-  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
-        meta-string (extension (Extensions/meta) field)]
-    (merge (case java-type
-             :message (struct-schema (.getMessageType field) map-def parents)
-             :enum    {:type   :enum
-                       :values (set (map #(.clojureEnumValue map-def %)
-                                         (.. field getEnumType getValues)))}
-             {:type java-type})
-           (when (.hasDefaultValue field)
-             {:default (.getDefaultValue field)})
-           (when meta-string
-             (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn subfield
-  [^Descriptors$FieldDescriptor field field-name]
-  (.findFieldByName (.getMessageType field) (name field-name)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :basic
-  [field map-def &amp; [parents]]
-  (basic-schema field map-def parents))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :list
-  [field map-def &amp; [parents]]
-  {:type   :list
-   :values (basic-schema field map-def parents)})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :succession
-  [field map-def &amp; [parents]]
-  (assoc (basic-schema field map-def parents)
-    :succession true))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :counter
-  [field map-def &amp; [parents]]
-  (assoc (basic-schema field map-def parents)
-    :counter true))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :set
-  [field map-def &amp; [parents]]
-  {:type   :set
-   :values (field-schema (subfield field :item) map-def parents)})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map
-  [field map-def &amp; [parents]]
-  {:type   :map
-   :keys   (field-schema (subfield field :key) map-def parents)
-   :values (field-schema (subfield field :val) map-def parents)})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map-by
-  [field map-def &amp; [parents]]
-  (let [map-by (extension (Extensions/mapBy) field)]
-    {:type   :map
-     :keys   (field-schema (subfield field map-by) map-def parents)
-     :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
-  [field map-def &amp; [parents]]
-  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.codec" name="protobuf.codec"><h1 class="project-name">protobuf.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.codec
-  (:require
-    [clojure.java.io :as io]
-    ;; flatland.io extends Seqable so we can concat InputStream from
-    ;; ByteBuffer sequences.
-    [flatland.io.core]
-    [gloss.core :as gloss]
-    [gloss.core.formats :as gloss-formats]
-    [gloss.io :as gloss-io]
-    [gloss.core.protocols :as gloss-protocols]
-    [protobuf.core :as protobuf]
-    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
-(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
-  [proto]
-  (let [proto (protobuf/mapdef proto)
-        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
-        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
-    (letfn [(check [test msg]
-              (when-not test
-                (throw (Exception. (format &quot;In %s: %s %s&quot;
-                                           (.getFullName proto) (name len-key) msg)))))]
-      (check (pos? min)
-             &quot;field is required for repeated protobufs&quot;)
-      (check (= min max)
-             &quot;must be of type fixed32 or fixed64&quot;))
-    (gloss/compile-frame (gloss/finite-frame max (create proto))
-                         #(hash-map len-key %)
-                         len-key)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn create
-  [proto &amp; {:keys [validator repeated]}]
-  (let [proto (protobuf/mapdef proto)]
-    (-&gt; (reify
-          ;; Reader method
-          gloss-protocols/Reader
-          (read-bytes [this buf-seq]
-            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
-          ;; Writer method
-          gloss-protocols/Writer
-          (sizeof [this] nil)
-          (write-bytes [this _ val]
-            (when (and validator (not (validator val)))
-              (throw (IllegalStateException. &quot;Invalid value in #'protobuf.codec/create&quot;)))
-            (gloss-formats/to-buf-seq
-             (protobuf/-&gt;bytes
-              (if (protobuf/map? val)
-                val
-                (protobuf/create proto val))))))
-        (util/fix
-          repeated
-          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
-                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
-</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
-</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
-  [proto]
-  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
-                      len-key
-                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
-  (:require
-    [clojure.java.io :as io]
-    [protobuf.schema :as protobuf-schema]
-    [protobuf.util :as util])
-  (:import
-    (clojure.lang Reflector)
-    (com.google.protobuf CodedInputStream
-                         Descriptors$Descriptor
-                         GeneratedMessage)
-    (java.io InputStream OutputStream)
-    (protobuf Extensions
-              PersistentProtocolBufferMap
-              PersistentProtocolBufferMap$Def
-              PersistentProtocolBufferMap$Def$NamingStrategy))
-  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(defn map?
-  [obj]
-  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
-  [obj]
-  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
-  ([map-def]
-     (if (or (mapdef? map-def) (nil? map-def))
-       map-def
-       (mapdef map-def {})))
-  ([map-def opts]
-     (when map-def
-       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
-                     size-limit]
-              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
-                   size-limit 67108864}} opts ;; 64MiB
-             ^Descriptors$Descriptor descriptor
-             (if (instance? Descriptors$Descriptor map-def)
-               map-def
-               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
-         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn create
-  ([^PersistentProtocolBufferMap$Def map-def]
-     (PersistentProtocolBufferMap/construct map-def {}))
-  ([^PersistentProtocolBufferMap$Def map-def m]
-     (PersistentProtocolBufferMap/construct map-def m))
-  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
-     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
-  [&amp; args]
-  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
-    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
-
-<p>  Supported data sources are either an array of bytes or an input stream.</p>
-</td><td class="codes"><pre class="brush: clojure">(defmulti parse
-  (fn [map-def data &amp; _]
-    (type data)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
-  ([^PersistentProtocolBufferMap$Def map-def data]
-     (when data
-       (PersistentProtocolBufferMap/create map-def data)))
-  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
-     (when data
-       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
-         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
-  [^PersistentProtocolBufferMap$Def map-def stream]
-  (when stream
-    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
-      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
-  ([^PersistentProtocolBufferMap p]
-     (.toByteArray p))
-  ([^PersistentProtocolBufferMap$Def map-def m]
-     (-&gt;bytes (PersistentProtocolBufferMap/construct map-def m))))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
-  from the given input stream.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn read
-  [^PersistentProtocolBufferMap$Def map-def in]
-  (lazy-seq
-   (io!
-    (let [^InputStream in (io/input-stream in)]
-      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
-        (cons p (read map-def in))
-        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
-  its length to delimit them.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn write
-  [out &amp; ps]
-  (io!
-   (let [^OutputStream out (io/output-stream out)]
-     (doseq [^PersistentProtocolBufferMap p ps]
-       (.writeDelimitedTo p out))
-     (.flush out))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
-  PersistentProtocolBufferMap
-  (combine-onto [^PersistentProtocolBufferMap this other]
-    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  combine #'util/combine)</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
-
-<p>TODO make this nil-safe? Or just delete it?</p>
-</td><td class="codes"><pre class="brush: clojure">(defn get-raw
-  [^PersistentProtocolBufferMap p key]
-  (.getValAt p key false))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
-</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf? #'map?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protodef? #'mapdef?)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protodef #'mapdef)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf #'create)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>mapdef</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-schema #'mapdef-&gt;schema)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-load #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>parse</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-load-stream #'parse)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-dump #'-&gt;bytes)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>read</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-seq #'read)</pre></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>write</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-write #'write)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li><li class="floating-toc-li" id="floating-toc_protobuf.schema">protobuf.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.codec">protobuf.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
+           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.common">protobuf.common</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.core">protobuf.impl.flatland.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.map">protobuf.impl.flatland.map</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
 SyntaxHighlighter.all();
 
 // hackity hack
diff --git a/docs/current/protobuf.common.html b/docs/current/protobuf.common.html
new file mode 100644
index 0000000..bd97d67
--- /dev/null
+++ b/docs/current/protobuf.common.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index f70556c..80d2a7b 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf"><div class="inner"><span>protobuf</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-dump"><div class="inner"><span>protobuf-dump</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load"><div class="inner"><span>protobuf-load</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-load-stream"><div class="inner"><span>protobuf-load-stream</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-schema"><div class="inner"><span>protobuf-schema</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-seq"><div class="inner"><span>protobuf-seq</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf-write"><div class="inner"><span>protobuf-write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protobuf.3F"><div class="inner"><span>protobuf?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef"><div class="inner"><span>protodef</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-protodef.3F"><div class="inner"><span>protodef?</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
-<p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-protobuf"><h3>protobuf</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-dump"><h3>protobuf-dump</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>-&gt;bytes</code></p></div></div></div><div class="public anchor" id="var-protobuf-load"><h3>protobuf-load</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-load-stream"><h3>protobuf-load-stream</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>parse</code></p></div></div></div><div class="public anchor" id="var-protobuf-schema"><h3>protobuf-schema</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protobuf-seq"><h3>protobuf-seq</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>read</code></p></div></div></div><div class="public anchor" id="var-protobuf-write"><h3>protobuf-write</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>write</code></p></div></div></div><div class="public anchor" id="var-protobuf.3F"><h3>protobuf?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>protobuf.core/map?</code></p></div></div></div><div class="public anchor" id="var-protodef"><h3>protodef</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef</code></p></div></div></div><div class="public anchor" id="var-protodef.3F"><h3>protodef?</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>mapdef?</code></p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.codec.html b/docs/current/protobuf.impl.flatland.codec.html
new file mode 100644
index 0000000..f86f6a1
--- /dev/null
+++ b/docs/current/protobuf.impl.flatland.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.core.html b/docs/current/protobuf.impl.flatland.core.html
new file mode 100644
index 0000000..0e08544
--- /dev/null
+++ b/docs/current/protobuf.impl.flatland.core.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
+<p>This namespace is an internal implementation detail not intended for developers. The API for working with all implementations of protocol buffer backends for this project is provided in the <code>protobuf.core</code> namespace.</p></div></div><div class="public anchor" id="var-behaviour"><h3>behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.map.html b/docs/current/protobuf.impl.flatland.map.html
new file mode 100644
index 0000000..aac1748
--- /dev/null
+++ b/docs/current/protobuf.impl.flatland.map.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.mapdef.html b/docs/current/protobuf.impl.flatland.mapdef.html
new file mode 100644
index 0000000..8c0f30c
--- /dev/null
+++ b/docs/current/protobuf.impl.flatland.mapdef.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.schema.html b/docs/current/protobuf.impl.flatland.schema.html
new file mode 100644
index 0000000..94a337a
--- /dev/null
+++ b/docs/current/protobuf.impl.flatland.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index a2e797e..5f42ee3 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From c424157c308b506b50f4f766c0c3f5ad2a2e150c Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:00:28 -0600
Subject: [PATCH 443/525] Fixed old test; added new one.

---
 test/protobuf/examples/photo_test.clj | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index 71c38df..b6a21f7 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -22,6 +22,11 @@
           (byte-array
            (map unchecked-byte [1 2 3 4 -1])))})
 
-(deftest example-test
+(deftest example-as-map-test
   (is (= data
-         (:instance (protobuf/create Example$Photo data)))))
+         (into {} (protobuf/create Example$Photo data)))))
+
+(deftest example-round-trip-test
+  (let [p (protobuf/create Example$Photo data)
+        b (protobuf/->bytes p)]
+    (= p (protobuf/bytes-> p b))))

From 24c59034740aca185ee53ddc4514988785810d04 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:01:00 -0600
Subject: [PATCH 444/525] Added a profile for all protobuf compilations.

---
 project.clj | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index be81205..2d63b0e 100644
--- a/project.clj
+++ b/project.clj
@@ -102,6 +102,11 @@
        "+test"
        "shell"
        "bin/compile-example-protobufs"]
+    "protoc-all" [
+      "do"
+      ["protoc-extension"]
+      ["protoc-test"]
+      ["protoc-examples"]]
     ;; Deps, linting, and tests
     "check-deps" [
       "with-profile"
@@ -118,12 +123,15 @@
       "with-profile"
       "+1.5:+1.6:+1.7:+1.9:+default"
       "test"]
+    "clean-test" [
+      "do"
+      ["clean"]
+      ["protoc-all"]
+      ["test"]]
     "clean-test-all" [
       "do"
       ["clean"]
-      ["protoc-extension"]
-      ["protoc-test"]
-      ["protoc-examples"]
+      ["protoc-all"]
       ["test-all"]]
     "build-test" [
       "do"
@@ -131,7 +139,5 @@
       ["ubercompile"]
       ["clean"]
       ["lint"]
-      ["protoc-extension"]
-      ["protoc-test"]
-      ["protoc-examples"]
+      ["protoc-all"]
       ["test-all"]]})

From d97bff85fa50c94a75b9399fec8d2f2e855be384 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:18:31 -0600
Subject: [PATCH 445/525] For older Clojures, just in case.

---
 src/clj/protobuf/common.clj             | 1 +
 src/clj/protobuf/impl/flatland/core.clj | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/clj/protobuf/common.clj b/src/clj/protobuf/common.clj
index a1d3daf..689e934 100644
--- a/src/clj/protobuf/common.clj
+++ b/src/clj/protobuf/common.clj
@@ -43,6 +43,7 @@
 
 (def persistent-map-behaviour
   {:assoc (fn [this k v] (.assoc (get-instance this) k v))
+   :assocEx (fn [m k v] (throw (new Exception)))
    :without (fn [this k] (.without (get-instance this) k))})
 
 (def printable-behaviour
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index e7f4b75..d320640 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -66,6 +66,8 @@
     (common/get-class this)
     ((:assoc common/persistent-map-behaviour) this k v)))
 
+(def -assocEx (:assocEx common/persistent-map-behaviour))
+
 (defn -without
   [this k]
   (new protobuf.impl.flatland.core.FlatlandProtoBuf

From fd5184ca5632332c59fd8e5ec7602f9c2ef5f4a7 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:18:52 -0600
Subject: [PATCH 446/525] Fixed errors in build.

Also condensed another proco-chain.
---
 project.clj | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 2d63b0e..5cdf459 100644
--- a/project.clj
+++ b/project.clj
@@ -65,9 +65,7 @@
       "+test,+custom-repl"
       "do"
       ["clean"]
-      ["protoc-extension"]
-      ["protoc-test"]
-      ["protoc-examples"]
+      ["protoc-all"]
       ["repl"]]
     ;; Doc-generation
     "clojuredocs" [
@@ -138,6 +136,6 @@
       ["clean"]
       ["ubercompile"]
       ["clean"]
-      ["lint"]
       ["protoc-all"]
-      ["test-all"]]})
+      ["test-all"]
+      ["lint"]]})

From d1aa7c81ce31b3c76f9af6a113d22b13667472dd Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:26:36 -0600
Subject: [PATCH 447/525] Fixed up wording with new API.

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cea656a..3cb9292 100644
--- a/README.md
+++ b/README.md
@@ -93,10 +93,9 @@ Which gives us:
  :likes ["climbing" "running" "jumping"]}
 ```
 
-The data stored in the `:instance` key is a protocol buffer map and is
-immutable just like other clojure objects. It is similar to a struct-map,
-except that you cannot insert fields that aren't specified in the `.proto`
-file.
+The data stored in the instance is immutable just like other clojure objects.
+It is similar to a struct-map, except that you cannot insert fields that aren't
+specified in the `.proto` file.
 
 (For instance, if you do a round trip with the data like we did above, but use
 `:dislikes` -- not in the protobuf definition -- instead of `:likes`,

From 64a449e8c099bdd4b87eecd6ffab1dadb45c6986 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:54:45 -0600
Subject: [PATCH 448/525] Allow for the easy creation of empty protobufs.

---
 src/clj/protobuf/core.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 8585291..06da21d 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -40,6 +40,8 @@
     :flatland (FlatlandProtoBuf/schema protobuf-class)))
 
 (defn create
-  [protobuf-class data]
-  (case (get-impl)
-    :flatland (new FlatlandProtoBuf protobuf-class data)))
+  ([protobuf-class]
+    (create protobuf-class {}))
+  ([protobuf-class data]
+    (case (get-impl)
+      :flatland (new FlatlandProtoBuf protobuf-class data))))

From 0eb1174685631cb48cea342adfcf51d9d4bec913 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:55:06 -0600
Subject: [PATCH 449/525] Updated docs.

---
 README.md                          |  9 ++++-
 resources/docs/1000-basic-usage.md |  2 +-
 resources/docs/1050-tutorial.md    | 56 +++++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 3cb9292..30a751d 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,14 @@ converting from bytes back to the protobuf instance will result in the
 
 The above usage is a quick taste; for more examples as well as the current and
 previous reference documentation, visit the
-[Clojure protobuf documentation][docs].
+[Clojure protobuf documentation][docs]. These docs include the following:
+
+* Basic usage example
+* A Clojure port of Google's Java protobuf tutorial
+* An example for working with extensions
+* Clojure protobuf API Reference
+* Marginalia docs
+* Documentation for the two Java classes (see the "javadoc" link there)
 
 
 <!-- Named page links below: /-->
diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
index 78a5df4..4520ac7 100644
--- a/resources/docs/1000-basic-usage.md
+++ b/resources/docs/1000-basic-usage.md
@@ -58,7 +58,7 @@ Now we can create a protobuf:
 {:id 108, :name "Alice", :email "alice@example.com"}
 ```
 
-With our person data in place, we can now do the usual Clojure operations:
+The protocol buffer instance supports the usual Clojure operations:
 
 ```clj
 [protobuf.dev] λ=> (assoc p :name "Alice B. Carol")
diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index 440cf50..702d7d1 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -31,7 +31,7 @@ Additionally, you may find these useful:
 ## Why Use Protocol Buffers?
 
 Protocol buffers solve the problem of efficiently serializing and
-deserializing structured data in a language-agnostic manner, accessible a vast
+deserializing structured data in a language-agnostic manner, accessible to a vast
 array of applications (as long as the applications are written in a language
 that has a protobuf library). We'll illustrate this with an example.
 
@@ -84,9 +84,9 @@ message Person {
   optional string email = 3;
 
   enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
+    mobile = 0;
+    home = 1;
+    work = 2;
   }
 
   message PhoneNumber {
@@ -227,9 +227,10 @@ For example, this is what the Clojure protobuf project has set, using the
 ```
 
 <blockquote>
-Fore convenience, the Clojure protobuf project always compiles the examples
-and the tests before starting up the REPL, so they are always freshly available
-to developers.
+Fore convenience, the Clojure protobuf project itself always compiles the
+examples and the tests before starting up the REPL, so they are always freshly
+available to the project contributors. You can do the same thing in your own
+Clojure projects.
 </blockquote>
 
 
@@ -261,8 +262,8 @@ Then we'll import the generated Java classes we want to use:
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 ```
 
-Note that for nested inner classes, we simply keep using the inner class
-separator `$` of Clojure's Java inter-op.
+Note that for nested inner classes, we simply use the inner class separator
+`$` of Clojure's Java inter-op.
 
 
 We can view the full, nested data schema in Clojure data:
@@ -298,7 +299,9 @@ nil
 
 <blockquote>
 There's currently a bug/missing feature where the default value of an `enum` is
-not converted to Clojure data. For current status on this issue, see:
+not converted to Clojure data.
+
+For current status on this issue, see:
 <a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
 </blockquote>
 
@@ -402,7 +405,7 @@ nil
 ```
 
 
-### Writing a Messages
+### Writing a Message
 
 These can then be written to an output stream:
 
@@ -411,11 +414,11 @@ These can then be written to an output stream:
 nil
 ```
 
-Note that the first argument doesn't have to be a string representing a file
+Note that the second argument doesn't have to be a string representing a file
 name; it can be anything which `clojure.java.io/output-stream` can coerce to a
 stream (e.g., `OutputStream`, `File`, `URI`, `URL`, `Socket`, or `String`).
 
-Take a look at the contents of `/tmp/address-book.db` to convince yourself the
+Take a look at the contents of `/tmp/address-book.db` to convince yourself that
 the data was actually written there. Then, we'll try reading it back in ...
 
 
@@ -430,6 +433,29 @@ Reading stored protobuf data is just as easy as writing it:
 true
 ```
 
+It may seem a bit awkward to have need an instance already in order to read
+data to _create_ an instance, but the instance is what holds the underlying
+Java class, which is needed for the read operation. It's not that bad,
+really -- you can create an empty instance and use that for a `read`, for
+example:
+
+```clj
+[protobuf.dev] λ=> (def address-book (protobuf/read
+                                      (protobuf/create AddressBookProtos$AddressBook)
+                                                       "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+[protobuf.dev] λ=> (pprint address-book)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+```
+
 
 ## Extending a Protocol
 
@@ -457,6 +483,9 @@ default value is zero. Note also that if you added a new repeated field, your
 new code will not be able to tell whether it was left empty (by new code) or
 never set at all (by old code).
 
+Be sure to see our docs on [Extension usage][extension-usage] for Clojure
+protobuf.
+
 
 ## Advanced Usage
 
@@ -485,3 +514,4 @@ you might initially expect!
 [java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
 [enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
 [download]: https://developers.google.com/protocol-buffers/docs/downloads.html
+[extension-usage]: 1100-extensions.html

From fa722d51ac8fe1e64a8ef47f5ce4e45f63752155 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:55:39 -0600
Subject: [PATCH 450/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html            |   2 +-
 docs/current/1050-tutorial.html               |  38 +-
 docs/current/javadoc/allclasses-frame.html    |   4 +-
 docs/current/javadoc/allclasses-noframe.html  |   4 +-
 docs/current/javadoc/constant-values.html     |   4 +-
 docs/current/javadoc/deprecated-list.html     |   4 +-
 docs/current/javadoc/help-doc.html            |   4 +-
 docs/current/javadoc/index-all.html           |   4 +-
 docs/current/javadoc/index.html               |  13 +-
 docs/current/javadoc/overview-tree.html       |   4 +-
 docs/current/javadoc/protobuf/Extensions.html |   4 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |   4 +-
 .../PersistentProtocolBufferMap.Def.html      |   4 +-
 .../protobuf/PersistentProtocolBufferMap.html |   4 +-
 .../javadoc/protobuf/package-frame.html       |   4 +-
 .../javadoc/protobuf/package-summary.html     |   4 +-
 .../javadoc/protobuf/package-tree.html        |   4 +-
 docs/current/javadoc/serialized-form.html     |   4 +-
 docs/current/marginalia.html                  | 958 +++++++++---------
 docs/current/protobuf.core.html               |   2 +-
 20 files changed, 548 insertions(+), 525 deletions(-)

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index aa08f00..82c6c9c 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -35,7 +35,7 @@ <h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the
 [protobuf.dev] λ=&gt; p
 {:id 108, :name "Alice", :email "alice@example.com"}
 </code></pre>
-<p>With our person data in place, we can now do the usual Clojure operations:</p>
+<p>The protocol buffer instance supports the usual Clojure operations:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (assoc p :name "Alice B. Carol")
 {:id 108, :name "Alice B. Carol", :email "alice@example.com"}
 [protobuf.dev] λ=&gt; (assoc p :likes ["climbing" "running" "jumping"])
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 7d3d16e..334aef6 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -21,7 +21,7 @@ <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
   <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
 </ul>
 <h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
-<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible to a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
 <p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
 <p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
 <ul>
@@ -46,9 +46,9 @@ <h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format
   optional string email = 3;
 
   enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
+    mobile = 0;
+    home = 1;
+    work = 2;
   }
 
   message PhoneNumber {
@@ -106,7 +106,7 @@ <h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buf
     "target/examples"
     "target/testing"]}
 </code></pre>
-<p></p><blockquote> Fore convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project itself always compiles the examples and the tests before starting up the REPL, so they are always freshly available to the project contributors. You can do the same thing in your own Clojure projects. </blockquote><p></p>
 <h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
 <p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
 <pre><code class="bash">$ lein repl
@@ -124,7 +124,7 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
                              AddressBookProtos$AddressBook))
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 </code></pre>
-<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Note that for nested inner classes, we simply use the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
 <p>We can view the full, nested data schema in Clojure data:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
@@ -153,7 +153,8 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
          #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
 nil
 </code></pre>
-<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data.<p></p>
+<p>For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </p></blockquote><p></p>
 <h2><a href="#the" name="the"></a>The <code>ProtoBufAPI</code></h2>
 <p>The following methods all take an instance of <code>protobuf.core.ProtoBufAPI</code> as their first argument. An example implementation is <code>protobuf.impl.flatland.core.FlatlandProtoBuf</code>.</p>
 <p>Note that the constructor is not a method, and as such, does not take a <code>ProtoBufAPI</code> instance as its first arguement.</p>
@@ -213,13 +214,13 @@ <h3><a href="#creating-messages" name="creating-messages"></a>Creating Messages<
     {:number "555-1214", :type :work}]}]}
 nil
 </code></pre>
-<h3><a href="#writing-a-messages" name="writing-a-messages"></a>Writing a Messages</h3>
+<h3><a href="#writing-a-message" name="writing-a-message"></a>Writing a Message</h3>
 <p>These can then be written to an output stream:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write addresses "/tmp/address-book.db")
 nil
 </code></pre>
-<p>Note that the first argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
-<p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself the the data was actually written there. Then, we’ll try reading it back in …</p>
+<p>Note that the second argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
+<p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself that the data was actually written there. Then, we’ll try reading it back in …</p>
 <h3><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h3>
 <p>Reading stored protobuf data is just as easy as writing it:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read addresses "/tmp/address-book.db"))
@@ -227,6 +228,22 @@ <h3><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message<
 [protobuf.dev] λ=&gt; (= addresses address-book)
 true
 </code></pre>
+<p>It may seem a bit awkward to have need an instance already in order to read data to <em>create</em> an instance, but the instance is what holds the underlying Java class, which is needed for the read operation. It’s not that bad, really – you can create an empty instance and use that for a <code>read</code>, for example:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read
+                                      (protobuf/create AddressBookProtos$AddressBook)
+                                                       "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+[protobuf.dev] λ=&gt; (pprint address-book)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+</code></pre>
 <h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
 <p>Sooner or later after you release the code that uses your protocol buffer, you will undoubtedly want to “improve” the protocol buffer’s definition. If you want your new buffers to be backwards-compatible, and your old buffers to be forward-compatible – and you almost certainly do want this – then there are some rules you need to follow. In the new version of the protocol buffer:</p>
 <ul>
@@ -237,6 +254,7 @@ <h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a
 </ul>
 <p>If you follow these rules, old code will happily read new messages and simply ignore any new fields. To the old code, optional fields that were deleted will simply have their default value, and deleted repeated fields will be empty. New code will also transparently read old messages. However, keep in mind that new optional fields will not be present in old messages, so you will need to either check explicitly whether they’re set or provide a reasonable default value in your <code>.proto</code> file with <code>[default = value]</code> after the tag number.</p>
 <p>If the default value is not specified for an optional element, a type-specific default value is used instead: for strings, the default value is the empty string. For booleans, the default value is <code>false</code>. For numeric types, the default value is zero. Note also that if you added a new repeated field, your new code will not be able to tell whether it was left empty (by new code) or never set at all (by old code).</p>
+<p>Be sure to see our docs on <a href="1100-extensions.html">Extension usage</a> for Clojure protobuf.</p>
 <h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
 <p>Protocol buffers have uses that go beyond simple accessors and serialization. Be sure to explore the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API reference</a> to see what else you can do with them.</p>
 <p>One key feature provided by protocol message classes is <code>reflection</code>. You can iterate over the fields of a message and manipulate their values without writing your code against any specific message type. One very useful way to use reflection is for converting protocol messages to and from other encodings, such as XML or JSON. A more advanced use of reflection might be to find differences between two messages of the same type, or to develop a sort of “regular expressions for protocol messages” in which you can write expressions that match certain message contents. If you use your imagination, it’s possible to apply Protocol Buffers to a much wider range of problems than you might initially expect!</p>
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 1f4d74d..aad59ae 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index 5a585f5..b8405ac 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 04da98f..cda126c 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 6e6f8f8..3c92946 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 4166b6e..34b04b0 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index f666a14..7b62163 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 930d91f..00fd812 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,14 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
-    targetPage = "" + window.location.search;
-    if (targetPage != "" && targetPage != "undefined")
-        targetPage = targetPage.substring(1);
-    if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
-        targetPage = "undefined";
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
     function validURL(url) {
         try {
             url = decodeURIComponent(url);
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 88cfedb..d25e6bb 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:52 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 2374e46..63f224b 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:24 CST 2017 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 9c93001..243df16 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 4d15b41..da7dd99 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 43d4d29..cbd26bb 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 02d9677..d776d10 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 335594a..9633fdf 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index ee8bf2f..bd21877 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 009df5c..b64ab68 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60) on Wed Dec 27 17:12:51 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-27">
+<meta name="date" content="2017-12-28">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 00606f3..40d06ed 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -2866,337 +2866,161 @@
   };
 })(SyntaxHighlighter);
 </script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.1-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
-</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.common">protobuf.common</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.util">protobuf.util</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn get-class
-  [this]
-  (:protobuf-class (.contents this)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn get-instance
-  [this]
-  (:instance (.contents this)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn get-wrapper
-  [this]
-  (:java-wrapper (.contents this)))</pre></td></tr><tr><td class="docs"><p>  Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def associative-behaviour
-  {:containsKey (fn [this data] (.containsKey (get-instance this) data))
-   :entryAt (fn [this data] (.entryAt (get-instance this) data))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def iterable-behaviour
-  {:forEach (fn [this consumer] (.forEach (get-instance this) consumer))
-   :iterator (fn [this] (.iterator (get-instance this)))
-   :spliterator (fn [this] (.spliterator (get-instance this)))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def lookup-behaviour
-  {:valAt (fn ([this k] (.valAt (get-instance this) k))
-              ([this k fallback] (.valAt (get-instance this) k fallback)))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def persistent-collection-behaviour
-  {:cons (fn [this o] (.cons (get-instance this) o))
-   :count (fn [this] (.count (get-instance this)))
-   :empty (fn [this] (.empty (get-instance this)))
-   :equiv (fn [this o]
-           (and (= (get-class this) (get-class o))
-                (.equiv (get-instance this) (get-instance o))))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def persistent-map-behaviour
-  {:assoc (fn [this k v] (.assoc (get-instance this) k v))
-   :without (fn [this k] (.without (get-instance this) k))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def printable-behaviour
-  {:toString (fn [this] (.toString (get-instance this)))})</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def seqable-behaviour
-  {:seq (fn [this] (.seq (get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This is the public API for working with protocol buffers.</p>
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
-  (:require
-    [protobuf.impl.flatland.core :as flatland])
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
   (:import
-    (protobuf.impl.flatland.core FlatlandProtoBuf))
-  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defprotocol ProtoBufAPI
-  (-&gt;bytes [this])
-  (-&gt;schema [this])
-  (bytes-&gt; [this bytes])
-  (read [this in])
-  (write [this out]))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(extend FlatlandProtoBuf
-        ProtoBufAPI
-        flatland/behaviour)</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def default-impl-name &quot;flatland&quot;)</pre></td></tr><tr><td class="docs"><p>Get the currently configured protobuf implementation. If not defined,
-  used the hard-coded default value (see <code>default-impl-name</code>).</p>
+    (clojure.lang IDeref
+                  ISeq
+                  IPersistentMap
+                  IPersistentSet
+                  IPersistentCollection))
+  (:refer-clojure :exclude [update]))</pre></td></tr><tr><td class="docs"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn as-fn
+  [x]
+  (if (ifn? x) x, (constantly x)))</pre></td></tr><tr><td class="docs"><p>Update the given set using an existence map.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn into-set
+  [set map]
+  (if (map? map)
+    (reduce (fn [set [k v]] ((if v conj disj) set k))
+            set map)
+    (into set map)))</pre></td></tr><tr><td class="docs"><p>Walk through clauses, a series of predicate/transform pairs. The
+  first predicate that x satisfies has its transformation clause
+  called on x. Predicates or transforms may be values (eg true or nil)
+  rather than functions; these will be treated as functions that
+  return that value.
+  The last "pair" may be only a transform with no pred: in that case it
+  is unconditionally used to transform x, if nothing previously matched.
+  If no predicate matches, then x is returned unchanged.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn fix
+  [x &amp; clauses]
+  (let [call #((as-fn %) x)]
+    (first (or (seq (for [[pred &amp; [transform :as exists?]] (partition-all 2 clauses)
+                          :let [[pred transform] ;; handle odd number of clauses
+                                (if exists? [pred transform] [true pred])]
+                          :when (call pred)]
+                      (call transform)))
+               [x]))))</pre></td></tr><tr><td class="docs"><p>A "curried" version of fix, which sets the clauses once, yielding a
+  function that calls fix with the specified first argument.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn to-fix
+  [&amp; clauses]
+  (fn [x]
+    (apply fix x clauses)))</pre></td></tr><tr><td class="docs"><p>A macro combining the features of fix and fixing, by using parentheses to group the
+   additional arguments to each clause:
+   (-> x
+       (given string? read-string
+              map? (dissoc :x :y :z)
+              even? (/ 2)))</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro given
+  [x &amp; clauses]
+  (let [[clauses default] (if (even? (count clauses))
+                            [clauses `identity]
+                            [(butlast clauses) (last clauses)])]
+    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
+                     arg [pred `#(-&gt; % ~transform)]]
+                 arg)
+          ~default)))</pre></td></tr><tr><td class="docs"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
+  flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro map-entry
+  [a b]
+  `(clojure.lang.MapEntry. ~a ~b))</pre></td></tr><tr><td class="docs"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
+  function that will take the old value and any supplied args and return the new value, and returns
+  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
+  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
+  values are not re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update-in*
+  [m keys f &amp; args]
+  (if-let [[k &amp; ks] (seq keys)]
+    (let [old (get m k)
+          new (apply update-in* old ks f args)]
+      (if (identical? old new)
+        m
+        (assoc m k new)))
+     (apply f m args)))</pre></td></tr><tr><td class="docs"><p>Update a value for the given key in a map where f is a function that takes the previous value and
+  the supplied args and returns the new value. Like update-in*, unchanged values are not
+  re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update
+  [m key f &amp; args]
+  (apply update-in* m [key] f args))</pre></td></tr><tr><td class="docs"><p>Create a new map from m by calling function f on each value to get a new value.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn map-vals
+  [m f &amp; args]
+  (when m
+    (into {}
+          (for [[k v] m]
+            (map-entry k (apply f v args))))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol Combiner
+  (combine-onto [left right]
+  &quot;Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.&quot;))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol Combiner
+  IPersistentMap
+  (combine-onto [this other]
+    (merge-with combine-onto this other))
 
-<p>  Note that the protobuf backend implementation is configured using
-  JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code>
-  may set this with <code>:jvm-opts</code>
-  (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p>
-</td><td class="codes"><pre class="brush: clojure">(defn get-impl
-  []
-  (keyword (or (System/getProperty &quot;protobuf.impl&quot;)
-               default-impl-name)))</pre></td></tr><tr><td class="docs"><p>This function is designed to be called against compiled Java protocol
-  buffer classes. To get the schema of a Clojure protobuf instance, you'll
-  want to use the <code>-&gt;schema</code> method.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn schema
-  [protobuf-class]
-  (case (get-impl)
-    :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn create
-  [protobuf-class data]
-  (case (get-impl)
-    :flatland (new FlatlandProtoBuf protobuf-class data)))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.codec" name="protobuf.impl.flatland.codec"><h1 class="project-name">protobuf.impl.flatland.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.codec
-  (:require
-    [clojure.java.io :as io]
-    ;; flatland.io extends Seqable so we can concat InputStream from
-    ;; ByteBuffer sequences.
-    [flatland.io.core]
-    [gloss.core :as gloss]
-    [gloss.core.formats :as gloss-formats]
-    [gloss.io :as gloss-io]
-    [gloss.core.protocols :as gloss-protocols]
-    [protobuf.impl.flatland.mapdef :as protobuf]
-    [protobuf.impl.flatland.map :as protobuf-map]
-    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
-(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
-  [proto]
-  (let [proto (protobuf/mapdef proto)
-        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
-        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
-    (letfn [(check [test msg]
-              (when-not test
-                (throw (Exception. (format &quot;In %s: %s %s&quot;
-                                           (.getFullName proto) (name len-key) msg)))))]
-      (check (pos? min)
-             &quot;field is required for repeated protobufs&quot;)
-      (check (= min max)
-             &quot;must be of type fixed32 or fixed64&quot;))
-    (gloss/compile-frame (gloss/finite-frame max (create proto))
-                         #(hash-map len-key %)
-                         len-key)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn create
-  [proto &amp; {:keys [validator repeated]}]
-  (let [proto (protobuf/mapdef proto)]
-    (-&gt; (reify
-          ;; Reader method
-          gloss-protocols/Reader
-          (read-bytes [this buf-seq]
-            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
-          ;; Writer method
-          gloss-protocols/Writer
-          (sizeof [this] nil)
-          (write-bytes [this _ val]
-            (when (and validator (not (validator val)))
-              (throw (IllegalStateException.
-                      &quot;Invalid value in #'protobuf.impl.flatland.codec/create&quot;)))
-            (gloss-formats/to-buf-seq
-              (protobuf-map/-&gt;bytes
-                (if (protobuf-map/map? val)
-                  val
-                  (protobuf/create proto val))))))
-        (util/fix
-          repeated
-          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
-                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
-</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
-       :deprecated &quot;3.5.1-v1.0&quot;}
-  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
-</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
-  [proto]
-  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
-                      len-key
-                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.core" name="protobuf.impl.flatland.core"><h1 class="project-name">protobuf.impl.flatland.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This implementation takes its name from the original code for this project
-  that was done under the flatland Github org and which pulled in several
-  flatland libraries as dependencies.</p>
+  IPersistentSet
+  (combine-onto [this other]
+    (into-set this other))
 
-<p>  This namespace is an internal implementation detail not intended for
-  developers. The API for working with all implementations of protocol
-  buffer backends for this project is provided in the <code>protobuf.core</code>
-  namespace.</p>
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.core
-  (:require
-    [protobuf.common :as common]
-    [protobuf.impl.flatland.map :as protobuf-map]
-    [protobuf.impl.flatland.mapdef :as protobuf])
-  (:gen-class
-    :name protobuf.impl.flatland.core.FlatlandProtoBuf
-    :implements [clojure.lang.Associative
-                 clojure.lang.ILookup
-                 clojure.lang.IPersistentCollection
-                 clojure.lang.IPersistentMap
-                 clojure.lang.Seqable
-                 java.lang.Iterable]
-    :init init
-    :constructors {[java.lang.Class
-                    clojure.lang.APersistentMap]
-                   []}
-    :methods [^:static [schema [Object] Object]]
-    :state contents
-    :main false))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn -init
-  [protobuf-class data]
-  (let [wrapper (protobuf/mapdef protobuf-class)]
-    [[] {:instance (protobuf/create wrapper data)
-         :java-wrapper wrapper
-         :protobuf-class protobuf-class}]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -containsKey (:containsKey common/associative-behaviour))
-(def -entryAt (:entryAt common/associative-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -valAt (:valAt common/lookup-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentCollection   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -cons (:cons common/persistent-collection-behaviour))
-(def -count (:count common/persistent-collection-behaviour))
-(def -empty (:empty common/persistent-collection-behaviour))
-(def -equiv (:equiv common/persistent-collection-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentMap   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn -assoc
-  [this k v]
-  (new protobuf.impl.flatland.core.FlatlandProtoBuf
-    (common/get-class this)
-    ((:assoc common/persistent-map-behaviour) this k v)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn -without
-  [this k]
-  (new protobuf.impl.flatland.core.FlatlandProtoBuf
-    (common/get-class this)
-    ((:without common/persistent-map-behaviour) this k)))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Seqable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -seq (:seq common/seqable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Iterable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -forEach (:forEach common/iterable-behaviour))
-(def -iterator (:iterator common/iterable-behaviour))
-(def -spliterator (:spliterator common/iterable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Object   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def -toString (:toString common/printable-behaviour))</pre></td></tr><tr><td class="docs"><p>  protobuf.core.ProtoBufAPI   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
-</td><td class="codes"></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn -schema
-  [protobuf-class]
-  (protobuf/mapdef-&gt;schema
-   (protobuf/mapdef protobuf-class)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(def behaviour
-  {:-&gt;bytes (fn [this]
-             (protobuf-map/-&gt;bytes (common/get-instance this)))
-   :-&gt;schema (fn [this]
-             (protobuf/mapdef-&gt;schema (common/get-wrapper this)))
-   :bytes-&gt; (fn [this bytes]
-             (new protobuf.impl.flatland.core.FlatlandProtoBuf
-               (common/get-class this)
-               (protobuf/parse (common/get-wrapper this) bytes)))
-   :read (fn [this in]
-          (new protobuf.impl.flatland.core.FlatlandProtoBuf
-            (common/get-class this)
-            (first
-              (protobuf/read (common/get-wrapper this) in))))
-   :write (fn [this out]
-           (protobuf/write out (common/get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.map" name="protobuf.impl.flatland.map"><h1 class="project-name">protobuf.impl.flatland.map</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.map
-  (:import
-    (protobuf PersistentProtocolBufferMap))
-  (:refer-clojure :exclude [map?]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(defn map?
-  [obj]
-  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
-  [^PersistentProtocolBufferMap p]
-  (.toByteArray p))</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
+  ISeq
+  (combine-onto [this other]
+    (concat this other))
 
-<p>TODO make this nil-safe? Or just delete it?</p>
-</td><td class="codes"><pre class="brush: clojure">(defn get-raw
-  [^PersistentProtocolBufferMap p key]
-  (.getValAt p key false))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.mapdef" name="protobuf.impl.flatland.mapdef"><h1 class="project-name">protobuf.impl.flatland.mapdef</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.mapdef
-  (:require
-    [clojure.java.io :as io]
-    [protobuf.impl.flatland.map :as protobuf-map]
-    [protobuf.impl.flatland.schema :as protobuf-schema]
-    [protobuf.util :as util])
-  (:import
-    (clojure.lang Reflector)
-    (com.google.protobuf CodedInputStream
-                         Descriptors$Descriptor
-                         GeneratedMessage)
-    (java.io InputStream OutputStream)
-    (protobuf Extensions
-              PersistentProtocolBufferMap
-              PersistentProtocolBufferMap$Def
-              PersistentProtocolBufferMap$Def$NamingStrategy))
-  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
-</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
-  [obj]
-  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
-  ([map-def]
-     (if (or (mapdef? map-def) (nil? map-def))
-       map-def
-       (mapdef map-def {})))
-  ([map-def opts]
-     (when map-def
-       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
-                     size-limit]
-              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
-                   size-limit 67108864}} opts ;; 64MiB
-             ^Descriptors$Descriptor descriptor
-             (if (instance? Descriptors$Descriptor map-def)
-               map-def
-               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
-         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn create
-  ([^PersistentProtocolBufferMap$Def map-def]
-     (PersistentProtocolBufferMap/construct map-def {}))
-  ([^PersistentProtocolBufferMap$Def map-def m]
-     (PersistentProtocolBufferMap/construct map-def m))
-  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
-     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
-  [&amp; args]
-  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
-    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
+  IPersistentCollection
+  (combine-onto [this other]
+    (into this other))
 
-<p>  Supported data sources are either an array of bytes or an input stream.</p>
-</td><td class="codes"><pre class="brush: clojure">(defmulti parse
-  (fn [map-def data &amp; _]
-    (type data)))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
-  ([^PersistentProtocolBufferMap$Def map-def data]
-     (when data
-       (PersistentProtocolBufferMap/create map-def data)))
-  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
-     (when data
-       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
-         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
-  [^PersistentProtocolBufferMap$Def map-def stream]
-  (when stream
-    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
-      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
-  [^PersistentProtocolBufferMap$Def map-def m]
-  (protobuf-map/-&gt;bytes (PersistentProtocolBufferMap/construct map-def m)))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
-  from the given input stream.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn read
-  [^PersistentProtocolBufferMap$Def map-def in]
-  (lazy-seq
-   (io!
-    (let [^InputStream in (io/input-stream in)]
-      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
-        (cons p (read map-def in))
-        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
-  its length to delimit them.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn write
-  [out &amp; ps]
-  (io!
-   (let [^OutputStream out (io/output-stream out)]
-     (doseq [^PersistentProtocolBufferMap p ps]
-       (.writeDelimitedTo p out))
-     (.flush out))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
-  PersistentProtocolBufferMap
-  (combine-onto [^PersistentProtocolBufferMap this other]
-    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
-</td><td class="codes"><pre class="brush: clojure">(def 
-  combine #'util/combine)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.schema" name="protobuf.impl.flatland.schema"><h1 class="project-name">protobuf.impl.flatland.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+  Object
+  (combine-onto [this other]
+    other)
+
+  nil
+  (combine-onto [this other]
+    other))</pre></td></tr><tr><td class="docs"><p>Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn combine
+  [a b]
+  (combine-onto a b))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn catbytes
+  [&amp; args]
+  (let [out-buf (byte-array (loop [len 0, args (seq args)]
+                              (if-let [[arg &amp; args] args]
+                                (recur (+ len (alength ^bytes arg)) args)
+                                len)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array &amp; more] (seq args)]
+        (let [size (alength array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))</pre></td></tr><tr><td class="docs"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn walk
+  [inner outer schema]
+  (outer
+   (case (:type schema)
+     :struct           (update schema :fields map-vals inner)
+     (:set :list :map) (-&gt; schema
+                           (given :values (update :values inner))
+                           (given :keys   (update :keys   inner)))
+     schema)))</pre></td></tr><tr><td class="docs"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each
+  and type with the result of calling f on it.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn postwalk
+  [f schema]
+  (walk (partial postwalk f) f schema))</pre></td></tr><tr><td class="docs"><p>Like postwalk, but do a pre-order traversal.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn prewalk
+  [f schema]
+  (walk (partial prewalk f) identity (f schema)))</pre></td></tr><tr><td class="docs"><p>Traverse the given schema, removing the given fields at any level.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn dissoc-fields
+  [schema &amp; fields]
+  (prewalk (to-fix #(= :struct (:type %))
+                   #(apply update % :fields dissoc fields))
+           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.schema" name="protobuf.impl.flatland.schema"><h1 class="project-name">protobuf.impl.flatland.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.schema
   (:require
     [clojure.string :as string]
@@ -3293,161 +3117,341 @@
      :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
   [field map-def &amp; [parents]]
-  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
-  (:import
-    (clojure.lang IDeref
-                  ISeq
-                  IPersistentMap
-                  IPersistentSet
-                  IPersistentCollection))
-  (:refer-clojure :exclude [update]))</pre></td></tr><tr><td class="docs"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn as-fn
-  [x]
-  (if (ifn? x) x, (constantly x)))</pre></td></tr><tr><td class="docs"><p>Update the given set using an existence map.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn into-set
-  [set map]
-  (if (map? map)
-    (reduce (fn [set [k v]] ((if v conj disj) set k))
-            set map)
-    (into set map)))</pre></td></tr><tr><td class="docs"><p>Walk through clauses, a series of predicate/transform pairs. The
-  first predicate that x satisfies has its transformation clause
-  called on x. Predicates or transforms may be values (eg true or nil)
-  rather than functions; these will be treated as functions that
-  return that value.
-  The last "pair" may be only a transform with no pred: in that case it
-  is unconditionally used to transform x, if nothing previously matched.
-  If no predicate matches, then x is returned unchanged.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn fix
-  [x &amp; clauses]
-  (let [call #((as-fn %) x)]
-    (first (or (seq (for [[pred &amp; [transform :as exists?]] (partition-all 2 clauses)
-                          :let [[pred transform] ;; handle odd number of clauses
-                                (if exists? [pred transform] [true pred])]
-                          :when (call pred)]
-                      (call transform)))
-               [x]))))</pre></td></tr><tr><td class="docs"><p>A "curried" version of fix, which sets the clauses once, yielding a
-  function that calls fix with the specified first argument.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn to-fix
-  [&amp; clauses]
-  (fn [x]
-    (apply fix x clauses)))</pre></td></tr><tr><td class="docs"><p>A macro combining the features of fix and fixing, by using parentheses to group the
-   additional arguments to each clause:
-   (-> x
-       (given string? read-string
-              map? (dissoc :x :y :z)
-              even? (/ 2)))</p>
-</td><td class="codes"><pre class="brush: clojure">(defmacro given
-  [x &amp; clauses]
-  (let [[clauses default] (if (even? (count clauses))
-                            [clauses `identity]
-                            [(butlast clauses) (last clauses)])]
-    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
-                     arg [pred `#(-&gt; % ~transform)]]
-                 arg)
-          ~default)))</pre></td></tr><tr><td class="docs"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
-  flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p>
-</td><td class="codes"><pre class="brush: clojure">(defmacro map-entry
-  [a b]
-  `(clojure.lang.MapEntry. ~a ~b))</pre></td></tr><tr><td class="docs"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
-  function that will take the old value and any supplied args and return the new value, and returns
-  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
-  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
-  values are not re-assoc'd.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn update-in*
-  [m keys f &amp; args]
-  (if-let [[k &amp; ks] (seq keys)]
-    (let [old (get m k)
-          new (apply update-in* old ks f args)]
-      (if (identical? old new)
-        m
-        (assoc m k new)))
-     (apply f m args)))</pre></td></tr><tr><td class="docs"><p>Update a value for the given key in a map where f is a function that takes the previous value and
-  the supplied args and returns the new value. Like update-in*, unchanged values are not
-  re-assoc'd.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn update
-  [m key f &amp; args]
-  (apply update-in* m [key] f args))</pre></td></tr><tr><td class="docs"><p>Create a new map from m by calling function f on each value to get a new value.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn map-vals
-  [m f &amp; args]
-  (when m
-    (into {}
-          (for [[k v] m]
-            (map-entry k (apply f v args))))))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defprotocol Combiner
-  (combine-onto [left right]
-  &quot;Merge two data structures by combining the contents. For maps, merge recursively by
-  adjoining values with the same key. For collections, combine the right and left using
-  into or conj. If the left value is a set and the right value is a map, the right value
-  is assumed to be an existence map where the value determines whether the key is in the
-  merged set. This makes sets unique from other collections because items can be deleted
-  from them.&quot;))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(extend-protocol Combiner
-  IPersistentMap
-  (combine-onto [this other]
-    (merge-with combine-onto this other))
-
-  IPersistentSet
-  (combine-onto [this other]
-    (into-set this other))
+  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.codec" name="protobuf.impl.flatland.codec"><h1 class="project-name">protobuf.impl.flatland.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.codec
+  (:require
+    [clojure.java.io :as io]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [gloss.core :as gloss]
+    [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
+  [proto]
+  (let [proto (protobuf/mapdef proto)
+        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
+        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format &quot;In %s: %s %s&quot;
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             &quot;field is required for repeated protobufs&quot;)
+      (check (= min max)
+             &quot;must be of type fixed32 or fixed64&quot;))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
+                         #(hash-map len-key %)
+                         len-key)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [proto &amp; {:keys [validator repeated]}]
+  (let [proto (protobuf/mapdef proto)]
+    (-&gt; (reify
+          ;; Reader method
+          gloss-protocols/Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException.
+                      &quot;Invalid value in #'protobuf.impl.flatland.codec/create&quot;)))
+            (gloss-formats/to-buf-seq
+              (protobuf-map/-&gt;bytes
+                (if (protobuf-map/map? val)
+                  val
+                  (protobuf/create proto val))))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
+</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
+  [proto]
+  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
+                      len-key
+                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.core" name="protobuf.impl.flatland.core"><h1 class="project-name">protobuf.impl.flatland.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This implementation takes its name from the original code for this project
+  that was done under the flatland Github org and which pulled in several
+  flatland libraries as dependencies.</p>
 
-  ISeq
-  (combine-onto [this other]
-    (concat this other))
+<p>  This namespace is an internal implementation detail not intended for
+  developers. The API for working with all implementations of protocol
+  buffer backends for this project is provided in the <code>protobuf.core</code>
+  namespace.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.core
+  (:require
+    [protobuf.common :as common]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.mapdef :as protobuf])
+  (:gen-class
+    :name protobuf.impl.flatland.core.FlatlandProtoBuf
+    :implements [clojure.lang.Associative
+                 clojure.lang.ILookup
+                 clojure.lang.IPersistentCollection
+                 clojure.lang.IPersistentMap
+                 clojure.lang.Seqable
+                 java.lang.Iterable]
+    :init init
+    :constructors {[java.lang.Class
+                    clojure.lang.APersistentMap]
+                   []}
+    :methods [^:static [schema [Object] Object]]
+    :state contents
+    :main false))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -init
+  [protobuf-class data]
+  (let [wrapper (protobuf/mapdef protobuf-class)]
+    [[] {:instance (protobuf/create wrapper data)
+         :java-wrapper wrapper
+         :protobuf-class protobuf-class}]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -containsKey (:containsKey common/associative-behaviour))
+(def -entryAt (:entryAt common/associative-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -valAt (:valAt common/lookup-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentCollection   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -cons (:cons common/persistent-collection-behaviour))
+(def -count (:count common/persistent-collection-behaviour))
+(def -empty (:empty common/persistent-collection-behaviour))
+(def -equiv (:equiv common/persistent-collection-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentMap   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -assoc
+  [this k v]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:assoc common/persistent-map-behaviour) this k v)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -assocEx (:assocEx common/persistent-map-behaviour))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -without
+  [this k]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:without common/persistent-map-behaviour) this k)))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Seqable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -seq (:seq common/seqable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Iterable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -forEach (:forEach common/iterable-behaviour))
+(def -iterator (:iterator common/iterable-behaviour))
+(def -spliterator (:spliterator common/iterable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Object   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -toString (:toString common/printable-behaviour))</pre></td></tr><tr><td class="docs"><p>  protobuf.core.ProtoBufAPI   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -schema
+  [protobuf-class]
+  (protobuf/mapdef-&gt;schema
+   (protobuf/mapdef protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def behaviour
+  {:-&gt;bytes (fn [this]
+             (protobuf-map/-&gt;bytes (common/get-instance this)))
+   :-&gt;schema (fn [this]
+             (protobuf/mapdef-&gt;schema (common/get-wrapper this)))
+   :bytes-&gt; (fn [this bytes]
+             (new protobuf.impl.flatland.core.FlatlandProtoBuf
+               (common/get-class this)
+               (protobuf/parse (common/get-wrapper this) bytes)))
+   :read (fn [this in]
+          (new protobuf.impl.flatland.core.FlatlandProtoBuf
+            (common/get-class this)
+            (first
+              (protobuf/read (common/get-wrapper this) in))))
+   :write (fn [this out]
+           (protobuf/write out (common/get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.map" name="protobuf.impl.flatland.map"><h1 class="project-name">protobuf.impl.flatland.map</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.map
+  (:import
+    (protobuf PersistentProtocolBufferMap))
+  (:refer-clojure :exclude [map?]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn map?
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap p]
+  (.toByteArray p))</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
 
-  IPersistentCollection
-  (combine-onto [this other]
-    (into this other))
+<p>TODO make this nil-safe? Or just delete it?</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-raw
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.mapdef" name="protobuf.impl.flatland.mapdef"><h1 class="project-name">protobuf.impl.flatland.mapdef</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.mapdef
+  (:require
+    [clojure.java.io :as io]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.schema :as protobuf-schema]
+    [protobuf.util :as util])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
+  [obj]
+  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (mapdef map-def {})))
+  ([map-def opts]
+     (when map-def
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
+  [&amp; args]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
 
-  Object
-  (combine-onto [this other]
-    other)
+<p>  Supported data sources are either an array of bytes or an input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmulti parse
+  (fn [map-def data &amp; _]
+    (type data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
+  ([^PersistentProtocolBufferMap$Def map-def data]
+     (when data
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap$Def map-def m]
+  (protobuf-map/-&gt;bytes (PersistentProtocolBufferMap/construct map-def m)))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
+  from the given input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn read
+  [^PersistentProtocolBufferMap$Def map-def in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (io/input-stream in)]
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (read map-def in))
+        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn write
+  [out &amp; ps]
+  (io!
+   (let [^OutputStream out (io/output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
+  PersistentProtocolBufferMap
+  (combine-onto [^PersistentProtocolBufferMap this other]
+    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  combine #'util/combine)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This is the public API for working with protocol buffers.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
+  (:require
+    [protobuf.impl.flatland.core :as flatland])
+  (:import
+    (protobuf.impl.flatland.core FlatlandProtoBuf))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol ProtoBufAPI
+  (-&gt;bytes [this])
+  (-&gt;schema [this])
+  (bytes-&gt; [this bytes])
+  (read [this in])
+  (write [this out]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend FlatlandProtoBuf
+        ProtoBufAPI
+        flatland/behaviour)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def default-impl-name &quot;flatland&quot;)</pre></td></tr><tr><td class="docs"><p>Get the currently configured protobuf implementation. If not defined,
+  used the hard-coded default value (see <code>default-impl-name</code>).</p>
 
-  nil
-  (combine-onto [this other]
-    other))</pre></td></tr><tr><td class="docs"><p>Merge two data structures by combining the contents. For maps, merge recursively by
-  adjoining values with the same key. For collections, combine the right and left using
-  into or conj. If the left value is a set and the right value is a map, the right value
-  is assumed to be an existence map where the value determines whether the key is in the
-  merged set. This makes sets unique from other collections because items can be deleted
-  from them.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn combine
-  [a b]
-  (combine-onto a b))</pre></td></tr><tr><td class="docs">
-</td><td class="codes"><pre class="brush: clojure">(defn catbytes
-  [&amp; args]
-  (let [out-buf (byte-array (loop [len 0, args (seq args)]
-                              (if-let [[arg &amp; args] args]
-                                (recur (+ len (alength ^bytes arg)) args)
-                                len)))]
-    (loop [offset 0, args args]
-      (if-let [[^bytes array &amp; more] (seq args)]
-        (let [size (alength array)]
-          (System/arraycopy array 0
-                            out-buf offset size)
-          (recur (+ size offset) more))
-        out-buf))))</pre></td></tr><tr><td class="docs"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn walk
-  [inner outer schema]
-  (outer
-   (case (:type schema)
-     :struct           (update schema :fields map-vals inner)
-     (:set :list :map) (-&gt; schema
-                           (given :values (update :values inner))
-                           (given :keys   (update :keys   inner)))
-     schema)))</pre></td></tr><tr><td class="docs"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each
-  and type with the result of calling f on it.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn postwalk
-  [f schema]
-  (walk (partial postwalk f) f schema))</pre></td></tr><tr><td class="docs"><p>Like postwalk, but do a pre-order traversal.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn prewalk
-  [f schema]
-  (walk (partial prewalk f) identity (f schema)))</pre></td></tr><tr><td class="docs"><p>Traverse the given schema, removing the given fields at any level.</p>
-</td><td class="codes"><pre class="brush: clojure">(defn dissoc-fields
-  [schema &amp; fields]
-  (prewalk (to-fix #(= :struct (:type %))
-                   #(apply update % :fields dissoc fields))
-           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.common">protobuf.common</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.core">protobuf.impl.flatland.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.map">protobuf.impl.flatland.map</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
+<p>  Note that the protobuf backend implementation is configured using
+  JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code>
+  may set this with <code>:jvm-opts</code>
+  (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-impl
+  []
+  (keyword (or (System/getProperty &quot;protobuf.impl&quot;)
+               default-impl-name)))</pre></td></tr><tr><td class="docs"><p>This function is designed to be called against compiled Java protocol
+  buffer classes. To get the schema of a Clojure protobuf instance, you'll
+  want to use the <code>-&gt;schema</code> method.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn schema
+  [protobuf-class]
+  (case (get-impl)
+    :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([protobuf-class]
+    (create protobuf-class {}))
+  ([protobuf-class data]
+    (case (get-impl)
+      :flatland (new FlatlandProtoBuf protobuf-class data))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-class
+  [this]
+  (:protobuf-class (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-instance
+  [this]
+  (:instance (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-wrapper
+  [this]
+  (:java-wrapper (.contents this)))</pre></td></tr><tr><td class="docs"><p>  Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def associative-behaviour
+  {:containsKey (fn [this data] (.containsKey (get-instance this) data))
+   :entryAt (fn [this data] (.entryAt (get-instance this) data))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def iterable-behaviour
+  {:forEach (fn [this consumer] (.forEach (get-instance this) consumer))
+   :iterator (fn [this] (.iterator (get-instance this)))
+   :spliterator (fn [this] (.spliterator (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def lookup-behaviour
+  {:valAt (fn ([this k] (.valAt (get-instance this) k))
+              ([this k fallback] (.valAt (get-instance this) k fallback)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-collection-behaviour
+  {:cons (fn [this o] (.cons (get-instance this) o))
+   :count (fn [this] (.count (get-instance this)))
+   :empty (fn [this] (.empty (get-instance this)))
+   :equiv (fn [this o]
+           (and (= (get-class this) (get-class o))
+                (.equiv (get-instance this) (get-instance o))))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-map-behaviour
+  {:assoc (fn [this k v] (.assoc (get-instance this) k v))
+   :assocEx (fn [m k v] (throw (new Exception)))
+   :without (fn [this k] (.without (get-instance this) k))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def printable-behaviour
+  {:toString (fn [this] (.toString (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def seqable-behaviour
+  {:seq (fn [this] (.seq (get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.core">protobuf.impl.flatland.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.map">protobuf.impl.flatland.map</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li><li class="floating-toc-li" id="floating-toc_protobuf.common">protobuf.common</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
 SyntaxHighlighter.all();
 
 // hackity hack
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 80d2a7b..24786c1 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file

From e3bd612a46907c4cba09e96a197e22833445c3c9 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Sun, 24 Dec 2017 22:06:49 -0600
Subject: [PATCH 451/525] Added a Clojure port of the official Google Java
 tutorial.

---
 resources/docs/1050-tutorial.md |  13 +-
 resources/docs/1200-tutorial.md | 348 ++++++++++++++++++++++++++++++++
 2 files changed, 352 insertions(+), 9 deletions(-)
 create mode 100644 resources/docs/1200-tutorial.md

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index 702d7d1..ddba589 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -31,7 +31,7 @@ Additionally, you may find these useful:
 ## Why Use Protocol Buffers?
 
 Protocol buffers solve the problem of efficiently serializing and
-deserializing structured data in a language-agnostic manner, accessible to a vast
+deserializing structured data in a language-agnostic manner, accessible a vast
 array of applications (as long as the applications are written in a language
 that has a protobuf library). We'll illustrate this with an example.
 
@@ -227,10 +227,9 @@ For example, this is what the Clojure protobuf project has set, using the
 ```
 
 <blockquote>
-Fore convenience, the Clojure protobuf project itself always compiles the
-examples and the tests before starting up the REPL, so they are always freshly
-available to the project contributors. You can do the same thing in your own
-Clojure projects.
+For convenience, the Clojure protobuf project always compiles the examples
+and the tests before starting up the REPL, so they are always freshly available
+to developers.
 </blockquote>
 
 
@@ -265,9 +264,6 @@ protobuf.examples.tutorial.AddressBookProtos$AddressBook
 Note that for nested inner classes, we simply use the inner class separator
 `$` of Clojure's Java inter-op.
 
-
-We can view the full, nested data schema in Clojure data:
-
 ```clj
 [protobuf.dev] λ=> (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
@@ -377,7 +373,6 @@ Now we can use these when creating our `Person` message:
                                                {:id 108
                                                 :name "Alice"
                                                 :email "alice@example.com"
-                                                :phones phones}))
 #'protobuf.dev/alice
 ```
 
diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
new file mode 100644
index 0000000..1dccdd8
--- /dev/null
+++ b/resources/docs/1200-tutorial.md
@@ -0,0 +1,348 @@
+# Tutorial: Protocol Buffer Basics
+
+*Note: The content for this tutorial was taken from the
+[official Google protobuf Java tutorial][java-tut].*
+
+
+## Introduction
+
+This tutorial provides a basic Clojure programmer's introduction to working with
+protocol buffers. By walking through creating a simple example application, it
+shows you how to:
+
+* Define message formats in a `.proto` file.
+* Use the protocol buffer compiler.
+* Use the Clojure protocol buffer API to write and read messages.
+
+This isn't a comprehensive guide to using protocol buffers in Clojure. For more
+detailed reference information, see:
+
+* the [Protocol Buffer Language Guide][protobuf-guide]
+* the [Clojure API Reference][clojure-api-ref]
+* the [Encoding Reference][enc-ref]
+
+Additionally, you may find these useful:
+
+* the [Java API Reference][java-api-ref]
+* the [Java Generated Code Guide][java-generated]
+
+
+## Why Use Protocol Buffers?
+
+Protocol buffers solve the problem of efficiently serializing and
+deserializing structured data in a language-agnostic manner, accessible a vast
+array of applications (as long as the applications are written in a language
+that has a protobuf library). We'll illustrate this with an example.
+
+The example we're going to use is a very simple "address book" application
+that can read and write people's contact details to and from a file. Each
+person in the address book has a name, an ID, an email address, and a contact
+phone number.
+
+So, how might one serialize and retrieve structured data like this if protobuf
+wasn't around? There are a few ways to solve this problem:
+
+* Use Java Serialization. This is the default approach since it's built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn't work very well if you need to share data with applications written in C++ or Python.
+* You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as "12:3:-23:67". This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.
+* Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.
+
+To avoid the problems mentioned in each of the above (as well as many others),
+protocol buffers was created. They are the flexible, efficient, automated
+solution.
+
+With protocol buffers, you write a `.proto` description of the data structure
+you wish to store. From that, the protocol buffer compiler creates compilable
+source code that implements automatic encoding and parsing of the protocol
+buffer data with an efficient binary format. The generated code provides
+getters and setters for the fields that make up a protocol buffer and takes
+care of the details of reading and writing the protocol buffer as a unit.
+Importantly, the protocol buffer format supports the idea of extending the
+format over time in such a way that the code can still read data encoded with
+the old format.
+
+
+## Defining Your Protocol Format
+
+To create your address book application, you'll need to start with a `.proto`
+file. The definitions in a `.proto` file are simple: you add a message for each
+data structure you want to serialize, then specify a name and a type for each
+field in the message. Here is the `.proto` file that defines your messages,
+`addressbook.proto`:
+
+```proto
+syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+```
+
+(Additionally, this file has been made available for you in the
+`resources/proto/examples` directory of the Clojure protobuf project.)
+
+As you can see, the syntax is similar to C++ or Java. Let's go through each
+part of the file and see what it does.
+
+The `.proto` file starts with a package declaration, which helps to prevent
+naming conflicts between different projects. In Java, the package name is used
+as the Java package unless you have explicitly specified a `java_package`, as
+we have here. Even if you do provide a `java_package`, you should still define
+a normal package as well to avoid name collisions in the Protocol Buffers name
+space as well as in non-Java languages.
+
+<blockquote>
+After the package declaration, you can see two options that are Java-specific.
+Thanks to Clojure's Java inter-op, we can take advantage of this directly,
+without writing our own Clojure protobuf compiler or waiting for Google to
+support Clojure.
+</blockquote>
+
+`java_package` specifies in what Java package name your generated classes
+should live. If you don't specify this explicitly, it simply matches the
+package name given by the package declaration, but these names usually aren't
+appropriate Java package names (since they usually don't start with a domain
+name).
+
+The `java_outer_classname` option defines the class name which should contain
+all of the classes in this file. If you don't give a `java_outer_classname`
+explicitly, it will be generated by converting the file name to camel case.
+For example, `my_proto.proto` would, by default, use `MyProto` as the outer
+class name.
+
+Next, you have your message definitions. A message is just an aggregate
+containing a set of typed fields. Many standard simple data types are
+available as field types, including `bool`, `int32`, `float`, `double`, and
+`string.` You can also add further structure to your messages by using other
+message types as field types – in the above example the `Person` message
+contains `PhoneNumber` messages, while the `AddressBook` message contains
+`Person` messages. You can even define message types nested inside other
+messages – as you can see, the `PhoneNumber` type is defined inside `Person`. You
+can also define `enum` types if you want one of your fields to have one of a
+predefined list of values – here you want to specify that a phone number can
+be one of `MOBILE`, `HOME`, or `WORK`.
+
+The " = 1", " = 2" markers on each element identify the unique "tag" that
+field uses in the binary encoding. Tag numbers 1-15 require one less byte to
+encode than higher numbers, so as an optimization you can decide to use those
+tags for the commonly used or repeated elements, leaving tags 16 and higher
+for less-commonly used optional elements. Each element in a repeated field
+requires re-encoding the tag number, so repeated fields are particularly good
+candidates for this optimization.
+
+Each field must be annotated with one of the following modifiers:
+
+* `required`: a value for the field must be provided, otherwise the message will be considered "uninitialized". Trying to build an uninitialized message will throw a `RuntimeException`. Parsing an uninitialized message will throw an `IOException`. Other than this, a required field behaves exactly like an optional field.
+* `optional`: the field may or may not be set. If an optional field value isn't set, a default value is used. For simple types, you can specify your own default value, as we've done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, `false` for bools. For embedded messages, the default value is always the "default instance" or "prototype" of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field's default value.
+* `repeated`: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.
+
+<blockquote>
+**Required Is Forever**
+
+You should be very careful about marking fields as required. If at some point
+you wish to stop writing or sending a required field, it will be problematic
+to change the field to an optional field – old readers will consider messages
+without this field to be incomplete and may reject or drop them
+unintentionally. You should consider writing application-specific custom
+validation routines for your buffers instead. Some engineers at Google have
+come to the conclusion that using required does more harm than good; they
+prefer to use only optional and repeated. However, this view is not universal.
+</blockquote>
+
+You'll find a complete guide to writing `.proto` files – including all the
+possible field types – in the
+[Protocol Buffer Language Guide][protobuf-guide]. Don't go looking for
+facilities similar to class inheritance, though – protocol buffers don't do
+that.
+
+
+## Compiling Your Protocol Buffers
+
+Now that you have a `.proto`, the next thing you need to do is generate the
+classes you'll need to read and write `AddressBook` (and hence `Person` and
+`PhoneNumber`) messages. To do this, you need to run the protocol buffer
+compiler `protoc` on your `.proto`:
+
+1. If you haven't installed this yet, now is the time. Your operating system's
+   package manager very likely already provides a version for you -- search
+   there first. If not, you can [download it][download] from Google.
+1. Now run the compiler, specifying:
+   * the source directory (where your application's source code lives – the
+     current directory is used if you don't provide a value)
+   * the destination directory (where you want the generated code to go; often
+     the same as $SRC_DIR), and
+   * the path to your `.proto.`
+
+In this case:
+
+```bash
+$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+```
+
+This gives us:
+
+```bash
+$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+```
+
+To have `lein` compile protobuf `.java` source files to `.class` that can be
+used from Clojure, we need to make sure that `lein` knows about our Java
+sources -- with do this with the `:java-source-paths` key in the `project.clj`
+file, either at the top-level or in an appropriate profile.
+
+For example, this is what the Clojure protobuf project has set, using the
+`:test` profile:
+
+```clj
+:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+```
+
+<blockquote>
+Fore convenience, the Clojure protobuf project always compiles the examples
+and the tests before starting up the REPL, so they are always freshly available
+to developers.
+</blockquote>
+
+
+## The Protocol Buffer API
+
+Let's fire up the REPL and see how to use the compiled code from Clojure:
+
+```bash
+$ lein repl
+```
+
+### Setup
+
+First we'll pull in the Clojure API:
+
+```clj
+[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
+nil
+```
+
+Then we'll import the generated Java classes we want to use:
+
+```clj
+[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
+              #_=>                                      AddressBookProtos$Person$PhoneNumber
+              #_=>                                      AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+```
+
+Note that for nested inner classes, we simply keep using the inner class
+separator `$` of Clojure's Java inter-op.
+
+Next we'll use a Java wrapper that let's us treat these like maps:
+
+```clj
+[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+```
+
+We can view the full, nested data schema in Clojure data:
+
+```clj
+[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+```
+
+<blockquote>
+There's currently a bug/missing feature where the default value of an `enum` is
+not converted to Clojure data. For current status on this issue, see:
+<a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
+</blockquote>
+
+## Message Functions
+
+TBD
+
+## Parsing and Serialization
+
+* `protobuf/parse` - Given an array or stream of bytes, we can parse these
+  to a Clojure protobuf data structure
+* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
+  an array of raw bytes
+
+## Writing a Message
+
+TBD
+
+## Reading a Message
+
+TBD
+
+## Extending a Protocol
+
+TBD
+
+## Advanced Usage
+
+TBD
+
+
+<!-- Named page links below: /-->
+
+[java-tut]: https://developers.google.com/protocol-buffers/docs/javatutorial
+[protobuf-guide]: https://developers.google.com/protocol-buffers/docs/proto
+[clojure-api-ref]: https://clojusc.github.io/protobuf
+[java-api-ref]: https://developers.google.com/protocol-buffers/docs/reference/java/index.html
+[java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
+[enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
+[download]: https://developers.google.com/protocol-buffers/docs/downloads.html

From 0fa4f83b32d060fb0da436d498931ebd1962b91c Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 11:04:45 -0600
Subject: [PATCH 452/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html                        | 2 +-
 docs/current/1050-tutorial.html                           | 8 +++-----
 docs/current/1100-extensions.html                         | 2 +-
 docs/current/1200-tutorial.html                           | 2 +-
 docs/current/9800-marginalia.html                         | 2 +-
 docs/current/9900-javadoc.html                            | 2 +-
 docs/current/9999-other-versions.html                     | 2 +-
 docs/current/index.html                                   | 2 +-
 docs/current/javadoc/allclasses-frame.html                | 4 ++--
 docs/current/javadoc/allclasses-noframe.html              | 4 ++--
 docs/current/javadoc/constant-values.html                 | 4 ++--
 docs/current/javadoc/deprecated-list.html                 | 4 ++--
 docs/current/javadoc/help-doc.html                        | 4 ++--
 docs/current/javadoc/index-all.html                       | 4 ++--
 docs/current/javadoc/index.html                           | 2 +-
 docs/current/javadoc/overview-tree.html                   | 4 ++--
 docs/current/javadoc/protobuf/Extensions.html             | 4 ++--
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html   | 4 ++--
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html | 4 ++--
 .../javadoc/protobuf/PersistentProtocolBufferMap.html     | 4 ++--
 docs/current/javadoc/protobuf/package-frame.html          | 4 ++--
 docs/current/javadoc/protobuf/package-summary.html        | 4 ++--
 docs/current/javadoc/protobuf/package-tree.html           | 4 ++--
 docs/current/javadoc/serialized-form.html                 | 4 ++--
 docs/current/protobuf.codec.html                          | 6 +++++-
 docs/current/protobuf.common.html                         | 2 +-
 docs/current/protobuf.core.html                           | 2 +-
 docs/current/protobuf.impl.flatland.codec.html            | 2 +-
 docs/current/protobuf.impl.flatland.core.html             | 2 +-
 docs/current/protobuf.impl.flatland.map.html              | 2 +-
 docs/current/protobuf.impl.flatland.mapdef.html           | 2 +-
 docs/current/protobuf.impl.flatland.schema.html           | 2 +-
 docs/current/protobuf.schema.html                         | 6 +++++-
 docs/current/protobuf.util.html                           | 2 +-
 34 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index 82c6c9c..b9e591e 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 334aef6..12ade9a 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
@@ -21,7 +21,7 @@ <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
   <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
 </ul>
 <h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
-<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible to a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
 <p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
 <p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
 <ul>
@@ -106,7 +106,7 @@ <h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buf
     "target/examples"
     "target/testing"]}
 </code></pre>
-<p></p><blockquote> Fore convenience, the Clojure protobuf project itself always compiles the examples and the tests before starting up the REPL, so they are always freshly available to the project contributors. You can do the same thing in your own Clojure projects. </blockquote><p></p>
+<p></p><blockquote> For convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
 <h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
 <p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
 <pre><code class="bash">$ lein repl
@@ -125,7 +125,6 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 </code></pre>
 <p>Note that for nested inner classes, we simply use the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
-<p>We can view the full, nested data schema in Clojure data:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
  :name "tutorial.AddressBook",
@@ -194,7 +193,6 @@ <h3><a href="#creating-messages" name="creating-messages"></a>Creating Messages<
                                                {:id 108
                                                 :name "Alice"
                                                 :email "alice@example.com"
-                                                :phones phones}))
 #'protobuf.dev/alice
 </code></pre>
 <p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index c897be2..50cd910 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
diff --git a/docs/current/1200-tutorial.html b/docs/current/1200-tutorial.html
index bb425bc..e3dbde0 100644
--- a/docs/current/1200-tutorial.html
+++ b/docs/current/1200-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 65c834a..897c2b4 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 207deaf..30fa642 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 9ab170d..38aa2db 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index 0a44927..625415b 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index aad59ae..e1c1613 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index b8405ac..c41ce35 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index cda126c..e3a9a3f 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 3c92946..06e51a1 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 34b04b0..7253a63 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 7b62163..1447f26 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 00fd812..150dfd7 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index d25e6bb..10f7d22 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 63f224b..4fcd2ac 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:24 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 243df16..2d299a3 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index da7dd99..f36f2fd 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index cbd26bb..212a10d 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index d776d10..ce40df7 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 9633fdf..75fee3e 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index bd21877..15ee4f6 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index b64ab68..33a6b3a 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_151) on Thu Dec 28 09:55:25 CST 2017 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2017-12-28">
+<meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index a2dee29..b4387e0 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,3 +1,7 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<<<<<<< HEAD
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
+=======
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
+>>>>>>> 3dc5e8c... Regen'ed docs.
diff --git a/docs/current/protobuf.common.html b/docs/current/protobuf.common.html
index bd97d67..2d3c219 100644
--- a/docs/current/protobuf.common.html
+++ b/docs/current/protobuf.common.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 24786c1..9c2c345 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.codec.html b/docs/current/protobuf.impl.flatland.codec.html
index f86f6a1..d5e7c9f 100644
--- a/docs/current/protobuf.impl.flatland.codec.html
+++ b/docs/current/protobuf.impl.flatland.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.core.html b/docs/current/protobuf.impl.flatland.core.html
index 0e08544..253c5b3 100644
--- a/docs/current/protobuf.impl.flatland.core.html
+++ b/docs/current/protobuf.impl.flatland.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
 <p>This namespace is an internal implementation detail not intended for developers. The API for working with all implementations of protocol buffer backends for this project is provided in the <code>protobuf.core</code> namespace.</p></div></div><div class="public anchor" id="var-behaviour"><h3>behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.map.html b/docs/current/protobuf.impl.flatland.map.html
index aac1748..75c0c38 100644
--- a/docs/current/protobuf.impl.flatland.map.html
+++ b/docs/current/protobuf.impl.flatland.map.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.mapdef.html b/docs/current/protobuf.impl.flatland.mapdef.html
index 8c0f30c..bc26fd5 100644
--- a/docs/current/protobuf.impl.flatland.mapdef.html
+++ b/docs/current/protobuf.impl.flatland.mapdef.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.schema.html b/docs/current/protobuf.impl.flatland.schema.html
index 94a337a..88f9bf7 100644
--- a/docs/current/protobuf.impl.flatland.schema.html
+++ b/docs/current/protobuf.impl.flatland.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index a06daac..fcf6e5d 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,3 +1,7 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<<<<<<< HEAD
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
+=======
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
+>>>>>>> 3dc5e8c... Regen'ed docs.
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index 5f42ee3..a19b455 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From 9e413936e825e294a864c739791ddd46a80a6146 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:32:11 -0600
Subject: [PATCH 453/525] Generated docs for release.

---
 docs/current/javadoc/allclasses-frame.html                    | 2 +-
 docs/current/javadoc/allclasses-noframe.html                  | 2 +-
 docs/current/javadoc/constant-values.html                     | 2 +-
 docs/current/javadoc/deprecated-list.html                     | 2 +-
 docs/current/javadoc/help-doc.html                            | 2 +-
 docs/current/javadoc/index-all.html                           | 2 +-
 docs/current/javadoc/index.html                               | 2 +-
 docs/current/javadoc/overview-tree.html                       | 2 +-
 docs/current/javadoc/protobuf/Extensions.html                 | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html       | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html     | 2 +-
 .../current/javadoc/protobuf/PersistentProtocolBufferMap.html | 2 +-
 docs/current/javadoc/protobuf/package-frame.html              | 2 +-
 docs/current/javadoc/protobuf/package-summary.html            | 2 +-
 docs/current/javadoc/protobuf/package-tree.html               | 2 +-
 docs/current/javadoc/serialized-form.html                     | 2 +-
 docs/current/protobuf.codec.html                              | 4 ++++
 docs/current/protobuf.schema.html                             | 4 ++++
 18 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index e1c1613..7ed8493 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index c41ce35..a129122 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index e3a9a3f..fce4794 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 06e51a1..3cc3713 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 7253a63..cd6f9ca 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 1447f26..74eca36 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 150dfd7..5fe6166 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 10f7d22..45aba8b 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 4fcd2ac..cab9c47 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 2d299a3..d7bc0d5 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index f36f2fd..c328b1e 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 212a10d..3612da7 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index ce40df7..b829d4c 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 75fee3e..ec87617 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 15ee4f6..6281421 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 33a6b3a..3ef326b 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:22:41 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/protobuf.codec.html b/docs/current/protobuf.codec.html
index b4387e0..1c5ccf5 100644
--- a/docs/current/protobuf.codec.html
+++ b/docs/current/protobuf.codec.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html PUBLIC ""
     "">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
 =======
 <html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
 >>>>>>> 3dc5e8c... Regen'ed docs.
+=======
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
+>>>>>>> f4c6e7f... Generated docs for release.
diff --git a/docs/current/protobuf.schema.html b/docs/current/protobuf.schema.html
index fcf6e5d..534ef22 100644
--- a/docs/current/protobuf.schema.html
+++ b/docs/current/protobuf.schema.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html PUBLIC ""
     "">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
 =======
 <html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
 >>>>>>> 3dc5e8c... Regen'ed docs.
+=======
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
+>>>>>>> f4c6e7f... Generated docs for release.

From 27e3a88ec8c030b2ea2840498cdc6c5c950818c5 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:37:10 -0600
Subject: [PATCH 454/525] Bumped version for next release cycle.


From d33fb4b1b923cb447c676168eae5dfd9e4768175 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 16:39:34 -0600
Subject: [PATCH 455/525] More alias headings/comments.


From 3a93f647cdca94b77ba483c242e23cbf99b10d9d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 25 Dec 2017 22:34:14 -0600
Subject: [PATCH 456/525] Moved implementation code to new home.

---
 resources/docs/1200-tutorial.md       | 10 +++---
 src/clj/protobuf/core.clj             | 47 ---------------------------
 test/protobuf/examples/photo_test.clj |  2 +-
 3 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 src/clj/protobuf/core.clj

diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
index 1dccdd8..3a97eaa 100644
--- a/resources/docs/1200-tutorial.md
+++ b/resources/docs/1200-tutorial.md
@@ -186,7 +186,7 @@ classes you'll need to read and write `AddressBook` (and hence `Person` and
 `PhoneNumber`) messages. To do this, you need to run the protocol buffer
 compiler `protoc` on your `.proto`:
 
-1. If you haven't installed this yet, now is the time. Your operating system's
+1. If you haven't installed `protoc` yet, now is the time. Your operating system's
    package manager very likely already provides a version for you -- search
    there first. If not, you can [download it][download] from Google.
 1. Now run the compiler, specifying:
@@ -210,10 +210,10 @@ $ ls -1 target/examples/protobuf/examples/tutorial/
 AddressBookProtos.java
 ```
 
-To have `lein` compile protobuf `.java` source files to `.class` that can be
-used from Clojure, we need to make sure that `lein` knows about our Java
-sources -- with do this with the `:java-source-paths` key in the `project.clj`
-file, either at the top-level or in an appropriate profile.
+To have `lein` compile protobuf `.java` source files to `.class` files that
+can be used from Clojure, we need to make sure that `lein` knows about our
+Java sources -- with do this with the `:java-source-paths` key in the
+`project.clj` file, either at the top-level or in an appropriate profile.
 
 For example, this is what the Clojure protobuf project has set, using the
 `:test` profile:
diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
deleted file mode 100644
index 06da21d..0000000
--- a/src/clj/protobuf/core.clj
+++ /dev/null
@@ -1,47 +0,0 @@
-(ns protobuf.core
-  "This is the public API for working with protocol buffers."
-  (:require
-    [protobuf.impl.flatland.core :as flatland])
-  (:import
-    (protobuf.impl.flatland.core FlatlandProtoBuf))
-  (:refer-clojure :exclude [map? read]))
-
-(defprotocol ProtoBufAPI
-  (->bytes [this])
-  (->schema [this])
-  (bytes-> [this bytes])
-  (read [this in])
-  (write [this out]))
-
-(extend FlatlandProtoBuf
-        ProtoBufAPI
-        flatland/behaviour)
-
-(def default-impl-name "flatland")
-
-(defn get-impl
-  "Get the currently configured protobuf implementation. If not defined,
-  used the hard-coded default value (see `default-impl-name`).
-
-  Note that the protobuf backend implementation is configured using
-  JVM system properties (i.e., the `-D` option). Projects that use `lein`
-  may set this with `:jvm-opts`
-  (e.g, `:jvm-opts [\"-Dprotobuf.impl=flatland\"]`)."
-  []
-  (keyword (or (System/getProperty "protobuf.impl")
-               default-impl-name)))
-
-(defn schema
-  "This function is designed to be called against compiled Java protocol
-  buffer classes. To get the schema of a Clojure protobuf instance, you'll
-  want to use the `->schema` method."
-  [protobuf-class]
-  (case (get-impl)
-    :flatland (FlatlandProtoBuf/schema protobuf-class)))
-
-(defn create
-  ([protobuf-class]
-    (create protobuf-class {}))
-  ([protobuf-class data]
-    (case (get-impl)
-      :flatland (new FlatlandProtoBuf protobuf-class data))))
diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index b6a21f7..7ae4d09 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -1,7 +1,7 @@
 (ns protobuf.examples.photo-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.core :as protobuf])
+    [protobuf.impl.flatland.mapdef :as protobuf])
   (:import
     (com.google.protobuf ByteString)
     (protobuf.examples.photo Example$Photo)))

From 4de29adfa5429f67a567d9ee095fa4e2e64d9545 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:19:33 -0600
Subject: [PATCH 457/525] Added initial protocol definition.

---
 src/clj/protobuf/core.clj | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/clj/protobuf/core.clj

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
new file mode 100644
index 0000000..089e249
--- /dev/null
+++ b/src/clj/protobuf/core.clj
@@ -0,0 +1,25 @@
+(ns protobuf.core
+  (:require
+    [protobuf.impl.flatland.core :as flatland])
+  (:import
+    (protobuf.impl.flatland.core FlatlandProtoBuf))
+  (:refer-clojure :exclude [map? read]))
+
+(defprotocol ProtoBufAPI
+  (->bytes [this])
+  (bytes-> [this bytes])
+  (read [this in])
+  (write [this out & args]))
+
+(extend FlatlandProtoBuf
+        ProtoBufAPI
+        flatland/behaviour)
+
+(defn get-impl
+  []
+  (keyword (System/getProperty "protobuf.impl")))
+
+(defn create
+  [protobuf-class data]
+  (case (get-impl)
+    :flatland (flatland/create protobuf-class data)))

From 807b3e96ff51f3068166dc5661f647f1877ea6cc Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:20:15 -0600
Subject: [PATCH 458/525] Updated test to use new protocol.

---
 test/protobuf/examples/photo_test.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index 7ae4d09..b6a21f7 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -1,7 +1,7 @@
 (ns protobuf.examples.photo-test
   (:require
     [clojure.test :refer :all]
-    [protobuf.impl.flatland.mapdef :as protobuf])
+    [protobuf.core :as protobuf])
   (:import
     (com.google.protobuf ByteString)
     (protobuf.examples.photo Example$Photo)))

From eb2cdc819e97a7b3068adfabcd7b90630bce7f84 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:23:14 -0600
Subject: [PATCH 459/525] Updated docs.

---
 resources/docs/1050-tutorial.md   | 14 +++++++++-----
 resources/docs/1100-extensions.md |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index ddba589..43816f4 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -261,8 +261,11 @@ Then we'll import the generated Java classes we want to use:
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 ```
 
-Note that for nested inner classes, we simply use the inner class separator
-`$` of Clojure's Java inter-op.
+Note that for nested inner classes, we simply keep using the inner class
+separator `$` of Clojure's Java inter-op.
+
+
+We can view the full, nested data schema in Clojure data:
 
 ```clj
 [protobuf.dev] λ=> (pprint (protobuf/schema AddressBookProtos$AddressBook))
@@ -370,9 +373,10 @@ Now we can use these when creating our `Person` message:
 
 ```clj
 [protobuf.dev] λ=> (def alice (protobuf/create AddressBookProtos$Person
-                                               {:id 108
-                                                :name "Alice"
-                                                :email "alice@example.com"
+                                               :id 108
+                                               :name "Alice"
+                                               :email "alice@example.com"
+                                               :phones phones))
 #'protobuf.dev/alice
 ```
 
diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
index a288bb1..de5f11b 100644
--- a/resources/docs/1100-extensions.md
+++ b/resources/docs/1100-extensions.md
@@ -66,7 +66,7 @@ Create our protobuf:
                                         :width 25
                                         :height 27}}}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> p
+[protobuf.dev] λ=> (:instance p)
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},

From 8c06d05b276be2b147a7b4d64639122546317ad1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 08:49:37 -0600
Subject: [PATCH 460/525] Removed old tutorial file.

---
 resources/docs/1200-tutorial.md | 348 --------------------------------
 1 file changed, 348 deletions(-)
 delete mode 100644 resources/docs/1200-tutorial.md

diff --git a/resources/docs/1200-tutorial.md b/resources/docs/1200-tutorial.md
deleted file mode 100644
index 3a97eaa..0000000
--- a/resources/docs/1200-tutorial.md
+++ /dev/null
@@ -1,348 +0,0 @@
-# Tutorial: Protocol Buffer Basics
-
-*Note: The content for this tutorial was taken from the
-[official Google protobuf Java tutorial][java-tut].*
-
-
-## Introduction
-
-This tutorial provides a basic Clojure programmer's introduction to working with
-protocol buffers. By walking through creating a simple example application, it
-shows you how to:
-
-* Define message formats in a `.proto` file.
-* Use the protocol buffer compiler.
-* Use the Clojure protocol buffer API to write and read messages.
-
-This isn't a comprehensive guide to using protocol buffers in Clojure. For more
-detailed reference information, see:
-
-* the [Protocol Buffer Language Guide][protobuf-guide]
-* the [Clojure API Reference][clojure-api-ref]
-* the [Encoding Reference][enc-ref]
-
-Additionally, you may find these useful:
-
-* the [Java API Reference][java-api-ref]
-* the [Java Generated Code Guide][java-generated]
-
-
-## Why Use Protocol Buffers?
-
-Protocol buffers solve the problem of efficiently serializing and
-deserializing structured data in a language-agnostic manner, accessible a vast
-array of applications (as long as the applications are written in a language
-that has a protobuf library). We'll illustrate this with an example.
-
-The example we're going to use is a very simple "address book" application
-that can read and write people's contact details to and from a file. Each
-person in the address book has a name, an ID, an email address, and a contact
-phone number.
-
-So, how might one serialize and retrieve structured data like this if protobuf
-wasn't around? There are a few ways to solve this problem:
-
-* Use Java Serialization. This is the default approach since it's built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn't work very well if you need to share data with applications written in C++ or Python.
-* You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as "12:3:-23:67". This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.
-* Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.
-
-To avoid the problems mentioned in each of the above (as well as many others),
-protocol buffers was created. They are the flexible, efficient, automated
-solution.
-
-With protocol buffers, you write a `.proto` description of the data structure
-you wish to store. From that, the protocol buffer compiler creates compilable
-source code that implements automatic encoding and parsing of the protocol
-buffer data with an efficient binary format. The generated code provides
-getters and setters for the fields that make up a protocol buffer and takes
-care of the details of reading and writing the protocol buffer as a unit.
-Importantly, the protocol buffer format supports the idea of extending the
-format over time in such a way that the code can still read data encoded with
-the old format.
-
-
-## Defining Your Protocol Format
-
-To create your address book application, you'll need to start with a `.proto`
-file. The definitions in a `.proto` file are simple: you add a message for each
-data structure you want to serialize, then specify a name and a type for each
-field in the message. Here is the `.proto` file that defines your messages,
-`addressbook.proto`:
-
-```proto
-syntax = "proto2";
-
-package tutorial;
-
-option java_package = "protobuf.examples.tutorial";
-option java_outer_classname = "AddressBookProtos";
-
-message Person {
-  required string name = 1;
-  required int32 id = 2;
-  optional string email = 3;
-
-  enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
-  }
-
-  message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
-  }
-
-  repeated PhoneNumber phones = 4;
-}
-
-message AddressBook {
-  repeated Person people = 1;
-}
-```
-
-(Additionally, this file has been made available for you in the
-`resources/proto/examples` directory of the Clojure protobuf project.)
-
-As you can see, the syntax is similar to C++ or Java. Let's go through each
-part of the file and see what it does.
-
-The `.proto` file starts with a package declaration, which helps to prevent
-naming conflicts between different projects. In Java, the package name is used
-as the Java package unless you have explicitly specified a `java_package`, as
-we have here. Even if you do provide a `java_package`, you should still define
-a normal package as well to avoid name collisions in the Protocol Buffers name
-space as well as in non-Java languages.
-
-<blockquote>
-After the package declaration, you can see two options that are Java-specific.
-Thanks to Clojure's Java inter-op, we can take advantage of this directly,
-without writing our own Clojure protobuf compiler or waiting for Google to
-support Clojure.
-</blockquote>
-
-`java_package` specifies in what Java package name your generated classes
-should live. If you don't specify this explicitly, it simply matches the
-package name given by the package declaration, but these names usually aren't
-appropriate Java package names (since they usually don't start with a domain
-name).
-
-The `java_outer_classname` option defines the class name which should contain
-all of the classes in this file. If you don't give a `java_outer_classname`
-explicitly, it will be generated by converting the file name to camel case.
-For example, `my_proto.proto` would, by default, use `MyProto` as the outer
-class name.
-
-Next, you have your message definitions. A message is just an aggregate
-containing a set of typed fields. Many standard simple data types are
-available as field types, including `bool`, `int32`, `float`, `double`, and
-`string.` You can also add further structure to your messages by using other
-message types as field types – in the above example the `Person` message
-contains `PhoneNumber` messages, while the `AddressBook` message contains
-`Person` messages. You can even define message types nested inside other
-messages – as you can see, the `PhoneNumber` type is defined inside `Person`. You
-can also define `enum` types if you want one of your fields to have one of a
-predefined list of values – here you want to specify that a phone number can
-be one of `MOBILE`, `HOME`, or `WORK`.
-
-The " = 1", " = 2" markers on each element identify the unique "tag" that
-field uses in the binary encoding. Tag numbers 1-15 require one less byte to
-encode than higher numbers, so as an optimization you can decide to use those
-tags for the commonly used or repeated elements, leaving tags 16 and higher
-for less-commonly used optional elements. Each element in a repeated field
-requires re-encoding the tag number, so repeated fields are particularly good
-candidates for this optimization.
-
-Each field must be annotated with one of the following modifiers:
-
-* `required`: a value for the field must be provided, otherwise the message will be considered "uninitialized". Trying to build an uninitialized message will throw a `RuntimeException`. Parsing an uninitialized message will throw an `IOException`. Other than this, a required field behaves exactly like an optional field.
-* `optional`: the field may or may not be set. If an optional field value isn't set, a default value is used. For simple types, you can specify your own default value, as we've done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, `false` for bools. For embedded messages, the default value is always the "default instance" or "prototype" of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field's default value.
-* `repeated`: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.
-
-<blockquote>
-**Required Is Forever**
-
-You should be very careful about marking fields as required. If at some point
-you wish to stop writing or sending a required field, it will be problematic
-to change the field to an optional field – old readers will consider messages
-without this field to be incomplete and may reject or drop them
-unintentionally. You should consider writing application-specific custom
-validation routines for your buffers instead. Some engineers at Google have
-come to the conclusion that using required does more harm than good; they
-prefer to use only optional and repeated. However, this view is not universal.
-</blockquote>
-
-You'll find a complete guide to writing `.proto` files – including all the
-possible field types – in the
-[Protocol Buffer Language Guide][protobuf-guide]. Don't go looking for
-facilities similar to class inheritance, though – protocol buffers don't do
-that.
-
-
-## Compiling Your Protocol Buffers
-
-Now that you have a `.proto`, the next thing you need to do is generate the
-classes you'll need to read and write `AddressBook` (and hence `Person` and
-`PhoneNumber`) messages. To do this, you need to run the protocol buffer
-compiler `protoc` on your `.proto`:
-
-1. If you haven't installed `protoc` yet, now is the time. Your operating system's
-   package manager very likely already provides a version for you -- search
-   there first. If not, you can [download it][download] from Google.
-1. Now run the compiler, specifying:
-   * the source directory (where your application's source code lives – the
-     current directory is used if you don't provide a value)
-   * the destination directory (where you want the generated code to go; often
-     the same as $SRC_DIR), and
-   * the path to your `.proto.`
-
-In this case:
-
-```bash
-$ protoc -I=resources --java_out=target/examples \
-  resources/protobuf/examples/tutorial.proto
-```
-
-This gives us:
-
-```bash
-$ ls -1 target/examples/protobuf/examples/tutorial/
-AddressBookProtos.java
-```
-
-To have `lein` compile protobuf `.java` source files to `.class` files that
-can be used from Clojure, we need to make sure that `lein` knows about our
-Java sources -- with do this with the `:java-source-paths` key in the
-`project.clj` file, either at the top-level or in an appropriate profile.
-
-For example, this is what the Clojure protobuf project has set, using the
-`:test` profile:
-
-```clj
-:test {
-  :java-source-paths [
-    "target/examples"
-    "target/testing"]}
-```
-
-<blockquote>
-Fore convenience, the Clojure protobuf project always compiles the examples
-and the tests before starting up the REPL, so they are always freshly available
-to developers.
-</blockquote>
-
-
-## The Protocol Buffer API
-
-Let's fire up the REPL and see how to use the compiled code from Clojure:
-
-```bash
-$ lein repl
-```
-
-### Setup
-
-First we'll pull in the Clojure API:
-
-```clj
-[protobuf.dev] λ=> (require '[protobuf.core :as protobuf])
-nil
-```
-
-Then we'll import the generated Java classes we want to use:
-
-```clj
-[protobuf.dev] λ=> (import '(protobuf.examples.tutorial AddressBookProtos$Person
-              #_=>                                      AddressBookProtos$Person$PhoneNumber
-              #_=>                                      AddressBookProtos$AddressBook))
-protobuf.examples.tutorial.AddressBookProtos$AddressBook
-```
-
-Note that for nested inner classes, we simply keep using the inner class
-separator `$` of Clojure's Java inter-op.
-
-Next we'll use a Java wrapper that let's us treat these like maps:
-
-```clj
-[protobuf.dev] λ=> (def Person (protobuf/mapdef AddressBookProtos$Person))
-#'protobuf.dev/Person
-[protobuf.dev] λ=> (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
-#'protobuf.dev/PhoneNumber
-[protobuf.dev] λ=> (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
-#'protobuf.dev/AddressBook
-```
-
-We can view the full, nested data schema in Clojure data:
-
-```clj
-[protobuf.dev] λ=> (pprint (protobuf/mapdef->schema AddressBook))
-{:type :struct,
- :name "tutorial.AddressBook",
- :fields
- {:people
-  {:type :list,
-   :values
-   {:type :struct,
-    :name "tutorial.Person",
-    :fields
-    {:name {:type :string},
-     :id {:type :int},
-     :email {:type :string},
-     :phones
-     {:type :list,
-      :values
-      {:type :struct,
-       :name "tutorial.Person.PhoneNumber",
-       :fields
-       {:number {:type :string},
-        :type
-        {:type :enum,
-         :values #{:home :work :mobile},
-         :default
-         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
-nil
-```
-
-<blockquote>
-There's currently a bug/missing feature where the default value of an `enum` is
-not converted to Clojure data. For current status on this issue, see:
-<a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a>
-</blockquote>
-
-## Message Functions
-
-TBD
-
-## Parsing and Serialization
-
-* `protobuf/parse` - Given an array or stream of bytes, we can parse these
-  to a Clojure protobuf data structure
-* `protobuf/->bytes` - Given a Java protobuf wrapper, we can convert this to
-  an array of raw bytes
-
-## Writing a Message
-
-TBD
-
-## Reading a Message
-
-TBD
-
-## Extending a Protocol
-
-TBD
-
-## Advanced Usage
-
-TBD
-
-
-<!-- Named page links below: /-->
-
-[java-tut]: https://developers.google.com/protocol-buffers/docs/javatutorial
-[protobuf-guide]: https://developers.google.com/protocol-buffers/docs/proto
-[clojure-api-ref]: https://clojusc.github.io/protobuf
-[java-api-ref]: https://developers.google.com/protocol-buffers/docs/reference/java/index.html
-[java-generated]: https://developers.google.com/protocol-buffers/docs/reference/java-generated
-[enc-ref]: https://developers.google.com/protocol-buffers/docs/encoding
-[download]: https://developers.google.com/protocol-buffers/docs/downloads.html

From 4c64fc297d99dff03649f77d83f20775a18539cb Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 09:17:51 -0600
Subject: [PATCH 461/525] Added general schema implementation.

---
 src/clj/protobuf/core.clj               | 11 ++++++++++-
 src/clj/protobuf/impl/flatland/core.clj |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 089e249..08d0433 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -15,9 +15,18 @@
         ProtoBufAPI
         flatland/behaviour)
 
+(def default-impl-name "flatland")
+
 (defn get-impl
   []
-  (keyword (System/getProperty "protobuf.impl")))
+  (keyword (or (System/getProperty "protobuf.impl")
+               default-impl-name)))
+
+(defn schema
+  [protobuf-class]
+  (let [impls {:flatland flatland/schema}
+        impl (get-impl)]
+    ((impl impls) protobuf-class)))
 
 (defn create
   [protobuf-class data]
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index d320640..c624738 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -103,6 +103,11 @@
   (protobuf/mapdef->schema
    (protobuf/mapdef protobuf-class)))
 
+(defn schema
+  [protobuf-class]
+  (protobuf/mapdef->schema
+   (protobuf/mapdef protobuf-class)))
+
 (def behaviour
   {:->bytes (fn [this]
              (protobuf-map/->bytes (common/get-instance this)))

From 179f07f6bab2e50401c581c276034daaf6d2230e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:11:33 -0600
Subject: [PATCH 462/525] Massive refactor on API and impl.

---
 src/clj/protobuf/core.clj               | 21 ++++++++++++++++-----
 src/clj/protobuf/impl/flatland/core.clj |  5 -----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 08d0433..8585291 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -1,4 +1,5 @@
 (ns protobuf.core
+  "This is the public API for working with protocol buffers."
   (:require
     [protobuf.impl.flatland.core :as flatland])
   (:import
@@ -7,9 +8,10 @@
 
 (defprotocol ProtoBufAPI
   (->bytes [this])
+  (->schema [this])
   (bytes-> [this bytes])
   (read [this in])
-  (write [this out & args]))
+  (write [this out]))
 
 (extend FlatlandProtoBuf
         ProtoBufAPI
@@ -18,17 +20,26 @@
 (def default-impl-name "flatland")
 
 (defn get-impl
+  "Get the currently configured protobuf implementation. If not defined,
+  used the hard-coded default value (see `default-impl-name`).
+
+  Note that the protobuf backend implementation is configured using
+  JVM system properties (i.e., the `-D` option). Projects that use `lein`
+  may set this with `:jvm-opts`
+  (e.g, `:jvm-opts [\"-Dprotobuf.impl=flatland\"]`)."
   []
   (keyword (or (System/getProperty "protobuf.impl")
                default-impl-name)))
 
 (defn schema
+  "This function is designed to be called against compiled Java protocol
+  buffer classes. To get the schema of a Clojure protobuf instance, you'll
+  want to use the `->schema` method."
   [protobuf-class]
-  (let [impls {:flatland flatland/schema}
-        impl (get-impl)]
-    ((impl impls) protobuf-class)))
+  (case (get-impl)
+    :flatland (FlatlandProtoBuf/schema protobuf-class)))
 
 (defn create
   [protobuf-class data]
   (case (get-impl)
-    :flatland (flatland/create protobuf-class data)))
+    :flatland (new FlatlandProtoBuf protobuf-class data)))
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index c624738..d320640 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -103,11 +103,6 @@
   (protobuf/mapdef->schema
    (protobuf/mapdef protobuf-class)))
 
-(defn schema
-  [protobuf-class]
-  (protobuf/mapdef->schema
-   (protobuf/mapdef protobuf-class)))
-
 (def behaviour
   {:->bytes (fn [this]
              (protobuf-map/->bytes (common/get-instance this)))

From 698c1555df9dcb070de29ca17578cf832d105b4b Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:12:29 -0600
Subject: [PATCH 463/525] Updated docs.

---
 resources/docs/1050-tutorial.md   | 8 ++++----
 resources/docs/1100-extensions.md | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index 43816f4..0782775 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -373,10 +373,10 @@ Now we can use these when creating our `Person` message:
 
 ```clj
 [protobuf.dev] λ=> (def alice (protobuf/create AddressBookProtos$Person
-                                               :id 108
-                                               :name "Alice"
-                                               :email "alice@example.com"
-                                               :phones phones))
+                                               {:id 108
+                                                :name "Alice"
+                                                :email "alice@example.com"
+                                                :phones phones}))
 #'protobuf.dev/alice
 ```
 
diff --git a/resources/docs/1100-extensions.md b/resources/docs/1100-extensions.md
index de5f11b..a288bb1 100644
--- a/resources/docs/1100-extensions.md
+++ b/resources/docs/1100-extensions.md
@@ -66,7 +66,7 @@ Create our protobuf:
                                         :width 25
                                         :height 27}}}))
 #'protobuf.dev/p
-[protobuf.dev] λ=> (:instance p)
+[protobuf.dev] λ=> p
 {:id 7,
  :path "/photos/h2k3j4h9h23",
  :labels #{"family" "hawaii" "surfing"},

From 3ae86dff45650af7a22628c5003c09472f38c578 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 17:13:14 -0600
Subject: [PATCH 464/525] Regen'ed docs.

---
 docs/current/1000-basic-usage.html                        | 2 +-
 docs/current/1050-tutorial.html                           | 6 ++++--
 docs/current/1100-extensions.html                         | 2 +-
 docs/current/9800-marginalia.html                         | 2 +-
 docs/current/9900-javadoc.html                            | 2 +-
 docs/current/9999-other-versions.html                     | 2 +-
 docs/current/index.html                                   | 2 +-
 docs/current/javadoc/allclasses-frame.html                | 2 +-
 docs/current/javadoc/allclasses-noframe.html              | 2 +-
 docs/current/javadoc/constant-values.html                 | 2 +-
 docs/current/javadoc/deprecated-list.html                 | 2 +-
 docs/current/javadoc/help-doc.html                        | 2 +-
 docs/current/javadoc/index-all.html                       | 2 +-
 docs/current/javadoc/index.html                           | 2 +-
 docs/current/javadoc/overview-tree.html                   | 2 +-
 docs/current/javadoc/protobuf/Extensions.html             | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html   | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.html     | 2 +-
 docs/current/javadoc/protobuf/package-frame.html          | 2 +-
 docs/current/javadoc/protobuf/package-summary.html        | 2 +-
 docs/current/javadoc/protobuf/package-tree.html           | 2 +-
 docs/current/javadoc/serialized-form.html                 | 2 +-
 docs/current/marginalia.html                              | 8 +++-----
 docs/current/protobuf.common.html                         | 2 +-
 docs/current/protobuf.core.html                           | 2 +-
 docs/current/protobuf.impl.flatland.codec.html            | 2 +-
 docs/current/protobuf.impl.flatland.core.html             | 2 +-
 docs/current/protobuf.impl.flatland.map.html              | 2 +-
 docs/current/protobuf.impl.flatland.mapdef.html           | 2 +-
 docs/current/protobuf.impl.flatland.schema.html           | 2 +-
 docs/current/protobuf.util.html                           | 2 +-
 32 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index b9e591e..82c6c9c 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 12ade9a..3052d8b 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
@@ -124,7 +124,8 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
                              AddressBookProtos$AddressBook))
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 </code></pre>
-<p>Note that for nested inner classes, we simply use the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>We can view the full, nested data schema in Clojure data:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
  :name "tutorial.AddressBook",
@@ -193,6 +194,7 @@ <h3><a href="#creating-messages" name="creating-messages"></a>Creating Messages<
                                                {:id 108
                                                 :name "Alice"
                                                 :email "alice@example.com"
+                                                :phones phones}))
 #'protobuf.dev/alice
 </code></pre>
 <p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index 50cd910..c897be2 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 897c2b4..65c834a 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 30fa642..207deaf 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 38aa2db..9ab170d 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
diff --git a/docs/current/index.html b/docs/current/index.html
index 625415b..0a44927 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="1200-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 7ed8493..42e847b 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index a129122..bca7521 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index fce4794..2bbfd23 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 3cc3713..b1cb7a8 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index cd6f9ca..4d05123 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 74eca36..24a0caa 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 5fe6166..caeeb75 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 45aba8b..5fc424a 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index cab9c47..118cce1 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:21 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index d7bc0d5..83e9ab9 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index c328b1e..2c48819 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 3612da7..f9d2beb 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index b829d4c..2c94322 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index ec87617..c627f11 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 6281421..cd1f5b5 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 3ef326b..646268f 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:24:16 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 40d06ed..865c12d 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -3410,11 +3410,9 @@
   (case (get-impl)
     :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn create
-  ([protobuf-class]
-    (create protobuf-class {}))
-  ([protobuf-class data]
-    (case (get-impl)
-      :flatland (new FlatlandProtoBuf protobuf-class data))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+  [protobuf-class data]
+  (case (get-impl)
+    :flatland (new FlatlandProtoBuf protobuf-class data)))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
 </td><td class="codes"></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn get-class
diff --git a/docs/current/protobuf.common.html b/docs/current/protobuf.common.html
index 2d3c219..bd97d67 100644
--- a/docs/current/protobuf.common.html
+++ b/docs/current/protobuf.common.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 9c2c345..80d2a7b 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.codec.html b/docs/current/protobuf.impl.flatland.codec.html
index d5e7c9f..f86f6a1 100644
--- a/docs/current/protobuf.impl.flatland.codec.html
+++ b/docs/current/protobuf.impl.flatland.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.core.html b/docs/current/protobuf.impl.flatland.core.html
index 253c5b3..0e08544 100644
--- a/docs/current/protobuf.impl.flatland.core.html
+++ b/docs/current/protobuf.impl.flatland.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
 <p>This namespace is an internal implementation detail not intended for developers. The API for working with all implementations of protocol buffer backends for this project is provided in the <code>protobuf.core</code> namespace.</p></div></div><div class="public anchor" id="var-behaviour"><h3>behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.map.html b/docs/current/protobuf.impl.flatland.map.html
index 75c0c38..aac1748 100644
--- a/docs/current/protobuf.impl.flatland.map.html
+++ b/docs/current/protobuf.impl.flatland.map.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.mapdef.html b/docs/current/protobuf.impl.flatland.mapdef.html
index bc26fd5..8c0f30c 100644
--- a/docs/current/protobuf.impl.flatland.mapdef.html
+++ b/docs/current/protobuf.impl.flatland.mapdef.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.schema.html b/docs/current/protobuf.impl.flatland.schema.html
index 88f9bf7..94a337a 100644
--- a/docs/current/protobuf.impl.flatland.schema.html
+++ b/docs/current/protobuf.impl.flatland.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index a19b455..5f42ee3 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file

From 2cbf4b16e423808b9c395af5eba8f673496d8223 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:00:28 -0600
Subject: [PATCH 465/525] Fixed old test; added new one.


From 261fd776935ebc4a62aee352a3964ed487d182da Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:18:31 -0600
Subject: [PATCH 466/525] For older Clojures, just in case.


From ec23b0495e80fad430301a98189a7a9fac85279b Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:18:52 -0600
Subject: [PATCH 467/525] Fixed errors in build.

Also condensed another proco-chain.

From 832bcaa4beb404fd8766c3e2a393183a4d22bea4 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 27 Dec 2017 22:26:36 -0600
Subject: [PATCH 468/525] Fixed up wording with new API.


From 89d8822b02bac7e58d8d7ee229b6b86c72380b4f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:54:45 -0600
Subject: [PATCH 469/525] Allow for the easy creation of empty protobufs.

---
 src/clj/protobuf/core.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 8585291..06da21d 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -40,6 +40,8 @@
     :flatland (FlatlandProtoBuf/schema protobuf-class)))
 
 (defn create
-  [protobuf-class data]
-  (case (get-impl)
-    :flatland (new FlatlandProtoBuf protobuf-class data)))
+  ([protobuf-class]
+    (create protobuf-class {}))
+  ([protobuf-class data]
+    (case (get-impl)
+      :flatland (new FlatlandProtoBuf protobuf-class data))))

From 12430cb921faf2ee22123f8047188f617d80f348 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:55:06 -0600
Subject: [PATCH 470/525] Updated docs.

---
 resources/docs/1050-tutorial.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index 0782775..b4914e3 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -31,7 +31,7 @@ Additionally, you may find these useful:
 ## Why Use Protocol Buffers?
 
 Protocol buffers solve the problem of efficiently serializing and
-deserializing structured data in a language-agnostic manner, accessible a vast
+deserializing structured data in a language-agnostic manner, accessible to a vast
 array of applications (as long as the applications are written in a language
 that has a protobuf library). We'll illustrate this with an example.
 
@@ -227,9 +227,9 @@ For example, this is what the Clojure protobuf project has set, using the
 ```
 
 <blockquote>
-For convenience, the Clojure protobuf project always compiles the examples
-and the tests before starting up the REPL, so they are always freshly available
-to developers.
+For convenience, the Clojure protobuf project itself always compiles the
+examples and the tests before starting up the REPL, so they are always freshly
+available to the project contributors.
 </blockquote>
 
 
@@ -261,8 +261,8 @@ Then we'll import the generated Java classes we want to use:
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 ```
 
-Note that for nested inner classes, we simply keep using the inner class
-separator `$` of Clojure's Java inter-op.
+Note that for nested inner classes, we simply use the inner class separator
+`$` of Clojure's Java inter-op.
 
 
 We can view the full, nested data schema in Clojure data:

From 4d75efddaa3cd529e5f391368ea52b08b0622f96 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 28 Dec 2017 09:55:39 -0600
Subject: [PATCH 471/525] Regen'ed docs.

---
 docs/current/1050-tutorial.html                           | 6 +++---
 docs/current/javadoc/allclasses-frame.html                | 2 +-
 docs/current/javadoc/allclasses-noframe.html              | 2 +-
 docs/current/javadoc/constant-values.html                 | 2 +-
 docs/current/javadoc/deprecated-list.html                 | 2 +-
 docs/current/javadoc/help-doc.html                        | 2 +-
 docs/current/javadoc/index-all.html                       | 2 +-
 docs/current/javadoc/index.html                           | 2 +-
 docs/current/javadoc/overview-tree.html                   | 2 +-
 docs/current/javadoc/protobuf/Extensions.html             | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html   | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.html     | 2 +-
 docs/current/javadoc/protobuf/package-frame.html          | 2 +-
 docs/current/javadoc/protobuf/package-summary.html        | 2 +-
 docs/current/javadoc/protobuf/package-tree.html           | 2 +-
 docs/current/javadoc/serialized-form.html                 | 2 +-
 docs/current/marginalia.html                              | 8 +++++---
 docs/current/protobuf.core.html                           | 2 +-
 19 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 3052d8b..74187c0 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -21,7 +21,7 @@ <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
   <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
 </ul>
 <h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
-<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible to a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
 <p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
 <p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
 <ul>
@@ -106,7 +106,7 @@ <h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buf
     "target/examples"
     "target/testing"]}
 </code></pre>
-<p></p><blockquote> For convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<p></p><blockquote> For convenience, the Clojure protobuf project itself always compiles the examples and the tests before starting up the REPL, so they are always freshly available to the project contributors. </blockquote><p></p>
 <h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
 <p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
 <pre><code class="bash">$ lein repl
@@ -124,7 +124,7 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
                              AddressBookProtos$AddressBook))
 protobuf.examples.tutorial.AddressBookProtos$AddressBook
 </code></pre>
-<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Note that for nested inner classes, we simply use the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
 <p>We can view the full, nested data schema in Clojure data:</p>
 <pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
 {:type :struct,
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 42e847b..45951e7 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index bca7521..885aad7 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 2bbfd23..e86f8c2 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index b1cb7a8..56ceb9c 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 4d05123..19f9b10 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 24a0caa..dcec254 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index caeeb75..2a7d105 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 5fc424a..de0e7f4 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 118cce1..86d5382 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:21 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:19 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 83e9ab9..ff29d0e 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 2c48819..52ccc72 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index f9d2beb..2f98895 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:19 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 2c94322..e78197f 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index c627f11..baf1ab6 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index cd1f5b5..e6046e2 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 646268f..fc7f9be 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:41:22 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 865c12d..40d06ed 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -3410,9 +3410,11 @@
   (case (get-impl)
     :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn create
-  [protobuf-class data]
-  (case (get-impl)
-    :flatland (new FlatlandProtoBuf protobuf-class data)))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+  ([protobuf-class]
+    (create protobuf-class {}))
+  ([protobuf-class data]
+    (case (get-impl)
+      :flatland (new FlatlandProtoBuf protobuf-class data))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
 </td><td class="codes"></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn get-class
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 80d2a7b..24786c1 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file

From 7a4b74f7b53a6444b33a546892e6c732a09223cf Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <duncan.mcgreggor@nasa.gov>
Date: Tue, 2 Jan 2018 21:19:47 -0500
Subject: [PATCH 472/525] Added versions notes.

---
 README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/README.md b/README.md
index 30a751d..e0f002e 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,25 @@ previous reference documentation, visit the
 * Documentation for the two Java classes (see the "javadoc" link there)
 
 
+## Versions
+
+(AKA "mini" ChangeLog)
+
+
+| Version             | Notes
+|---------------------|------------------------------------------------------
+| 3.5.1-v1.1-SNAPSHOT | Added docs, more func renames, new abstraction layer, improved DevEx of API
+| 3.5.1-v1.0          | Droped extra deps, renamed functions
+| 3.5.1-v0.3          | Bumped to use the latest Google Protocol Buffer release, re-added tests, Travis CI support
+| 3.4.0-v0.2          | Transition release; identical to the ghaskins clojure-protobuf at version  3.4.0-2-SNAPSHOT
+
+A note on the history: This project picked up the Clojure protobuf code base
+from the [ghaskins fork](https://github.com/ghaskins/clojure-protobuf); its
+last significant update was 2 years prior. The work at that point had been
+given the version "3.4.0-2-SNAPSHOT", tracking the Protocol Buffer release of
+3.4.0. We created a branch and tag for that release with no changes other than
+the org/artifact id.
+
 <!-- Named page links below: /-->
 
 [travis]: https://travis-ci.org/clojusc/protobuf

From a934218a96a6aa5ee530d2fb39da0e30c837fde0 Mon Sep 17 00:00:00 2001
From: Jeremiah Via <jeremiah.via@nytimes.com>
Date: Fri, 29 Jun 2018 13:52:58 -0600
Subject: [PATCH 473/525] [#25] Handle enum round-trip with bimap

---
 resources/protobuf/examples/photo.proto       |  8 +++
 .../protobuf/PersistentProtocolBufferMap.java | 68 +++++++++++++++----
 test/protobuf/examples/photo_test.clj         |  1 +
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/resources/protobuf/examples/photo.proto b/resources/protobuf/examples/photo.proto
index 7b81c09..095add6 100644
--- a/resources/protobuf/examples/photo.proto
+++ b/resources/protobuf/examples/photo.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 package protobuf.examples.photo;
 
 import "protobuf/extensions.proto";
@@ -11,6 +12,13 @@ message Photo {
   repeated Attr   attrs  = 4 [(map)    = true];
   repeated Tag    tags   = 5 [(map_by) = "person_id"];
   optional bytes  image  = 6;
+  optional Type   type   = 7;
+
+  enum Type {
+    JPEG = 0;
+    PNG = 1;
+    GIF = 2;
+  }
 
   message Label {
     required string item   = 1;
diff --git a/src/java/protobuf/PersistentProtocolBufferMap.java b/src/java/protobuf/PersistentProtocolBufferMap.java
index 35530d1..eef2669 100644
--- a/src/java/protobuf/PersistentProtocolBufferMap.java
+++ b/src/java/protobuf/PersistentProtocolBufferMap.java
@@ -16,6 +16,7 @@
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -61,12 +62,12 @@ public static interface NamingStrategy {
       /**
        * Given a Clojure map key, return the string to be used as the protobuf message field name.
        */
-      String protoName(Object clojureName);
+      String protoName(Descriptors.FieldDescriptor fieldDescriptor, Object clojureName);
 
       /**
        * Given a protobuf message field name, return a Clojure object suitable for use as a map key.
        */
-      Object clojureName(String protoName);
+      Object clojureName(Descriptors.FieldDescriptor fieldDescriptor, String protoName);
     }
 
     // we want this to work for anything Named, so use clojure.core/name
@@ -82,13 +83,13 @@ public static final String nameStr(Object named) {
 
     public static final NamingStrategy protobufNames = new NamingStrategy() {
       @Override
-      public String protoName(Object name) {
+      public String protoName(Descriptors.FieldDescriptor fieldDescriptor, Object name) {
         return nameStr(name);
       }
 
       @Override
-      public Object clojureName(String name) {
-        return Keyword.intern(name.toLowerCase());
+      public Object clojureName(Descriptors.FieldDescriptor fieldDescriptor, String name) {
+        return Keyword.intern(name);
       }
 
       @Override
@@ -97,14 +98,57 @@ public String toString() {
       }
     };
     public static final NamingStrategy convertUnderscores = new NamingStrategy() {
+      // FieldDescriptor -> (ProtoName, ClojureName)
+      Map<Descriptors.FieldDescriptor, Map<String, Keyword>> enumMappingsByProtoName = new HashMap<>();
+      // FieldDescriptor -> (CloureName, ProtoName)
+      Map<Descriptors.FieldDescriptor, Map<Keyword, String>> enumMappingsByClojureName = new HashMap<>();
+
+      private void buildEnumMapping(Descriptors.FieldDescriptor descriptor) {
+        Map<String, Keyword> protoClojureMapping = new HashMap<>();
+        Map<Keyword, String> clojureProtoMapping = new HashMap<>();
+
+        for (Descriptors.EnumValueDescriptor value : descriptor.getEnumType().getValues()) {
+          String protoName = nameStr(value.getName());
+          Keyword clojureName = Keyword.intern(protoName.replaceAll("_", "-").toLowerCase());
+          protoClojureMapping.put(protoName, clojureName);
+          clojureProtoMapping.put(clojureName, protoName);
+        }
+
+        enumMappingsByProtoName.put(descriptor, protoClojureMapping);
+        enumMappingsByClojureName.put(descriptor, clojureProtoMapping);
+      }
+
+      /**
+       * Since enum values can be keywords or strings, we must coerce to keyword
+       */
+      private Object asKeyword(Object name) {
+        if (name instanceof Keyword) {
+          return name;
+        } else {
+          return Keyword.intern(nameStr(name));
+        }
+      }
+
       @Override
-      public String protoName(Object name) {
+      public String protoName(Descriptors.FieldDescriptor fieldDescriptor, Object name) {
+         if (fieldDescriptor != null && fieldDescriptor.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
+           if (!enumMappingsByClojureName.containsKey(fieldDescriptor)) {
+             buildEnumMapping(fieldDescriptor);
+           }
+           return enumMappingsByClojureName.get(fieldDescriptor).get(asKeyword(name));
+         }
         return nameStr(name).replaceAll("-", "_");
       }
 
       @Override
-      public Object clojureName(String name) {
-        return Keyword.intern(name.replaceAll("_", "-").toLowerCase());
+      public Object clojureName(Descriptors.FieldDescriptor fieldDescriptor, String name) {
+        if (fieldDescriptor != null && fieldDescriptor.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
+          if (!enumMappingsByProtoName.containsKey(fieldDescriptor)) {
+            buildEnumMapping(fieldDescriptor);
+          }
+          return enumMappingsByProtoName.get(fieldDescriptor).get(name);
+        }
+        return  Keyword.intern(name.replaceAll("_", "-").toLowerCase());
       }
 
       @Override
@@ -200,7 +244,7 @@ public Descriptors.FieldDescriptor fieldDescriptor(Object key) {
           }
           return (Descriptors.FieldDescriptor)field;
         } else {
-          field = type.findFieldByName(namingStrategy.protoName(key));
+          field = type.findFieldByName(namingStrategy.protoName(null, key));
           key_to_field.putIfAbsent(key, field == null ? NULL : field);
         }
         return (Descriptors.FieldDescriptor)field;
@@ -236,7 +280,7 @@ public Object intern(String name) {
         if (name == "") {
           clojureName = nullv;
         } else {
-          clojureName = namingStrategy.clojureName(name);
+          clojureName = namingStrategy.clojureName(null, name);
           if (clojureName == null) {
             clojureName = nullv;
           }
@@ -536,7 +580,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
       case DOUBLE:
         return ((Number)value).doubleValue();
       case ENUM:
-        String name = def.namingStrategy.protoName(value);
+        String name = def.namingStrategy.protoName(field, value);
         Descriptors.EnumDescriptor enum_type = field.getEnumType();
         Descriptors.EnumValueDescriptor enum_value = enum_type.findValueByName(name);
         if (enum_value == null) {
@@ -626,7 +670,7 @@ protected boolean addField(DynamicMessage.Builder builder, Object key, Object va
       } else {
         Object map_field_by = def.mapFieldBy(field);
         if (map_field_by != null) {
-          String field_name = def.namingStrategy.protoName(map_field_by);
+          String field_name = def.namingStrategy.protoName(field, map_field_by);
           for (ISeq s = RT.seq(value); s != null; s = s.next()) {
             Map.Entry<?, ?> e = (Map.Entry<?, ?>)s.first();
             IPersistentMap map = (IPersistentMap)e.getValue();
diff --git a/test/protobuf/examples/photo_test.clj b/test/protobuf/examples/photo_test.clj
index b6a21f7..6a05a7f 100644
--- a/test/protobuf/examples/photo_test.clj
+++ b/test/protobuf/examples/photo_test.clj
@@ -11,6 +11,7 @@
   :path "/photos/h2k3j4h9h23"
   :labels #{"hawaii" "family" "surfing"},
   :attrs {"color space" "RGB" "dimensions" "1632x1224" "alpha" "no"},
+  :type :jpeg
   :tags {
     4 {
       :person-id 4

From cad9491d5e611072e1f3404c8d394e1ca329e5a8 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 21:51:44 -0500
Subject: [PATCH 474/525] Fixed typo.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e0f002e..346a081 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Now you can use the protocol buffer in Clojure:
 
 ```clojure
 (require '[protobuf.core :as protobuf])
-(import (your.namespace.person Example$Person)
+(import '(your.namespace.person Example$Person)
 
 (def alice (protobuf/create Example$Person
                             {:id 108

From fb99d921d1097d3067aa66452688bdf6295e9e4f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 21:54:31 -0500
Subject: [PATCH 475/525] Regen'ed docs.

---
 docs/current/javadoc/allclasses-frame.html     |  2 +-
 docs/current/javadoc/allclasses-noframe.html   |  2 +-
 docs/current/javadoc/constant-values.html      |  2 +-
 docs/current/javadoc/deprecated-list.html      |  2 +-
 docs/current/javadoc/help-doc.html             |  2 +-
 docs/current/javadoc/index-all.html            | 10 +++++-----
 docs/current/javadoc/index.html                |  2 +-
 docs/current/javadoc/overview-tree.html        |  2 +-
 docs/current/javadoc/protobuf/Extensions.html  |  2 +-
 ...ntProtocolBufferMap.Def.NamingStrategy.html | 18 +++++++++++-------
 .../PersistentProtocolBufferMap.Def.html       |  2 +-
 .../protobuf/PersistentProtocolBufferMap.html  |  2 +-
 .../javadoc/protobuf/package-frame.html        |  2 +-
 .../javadoc/protobuf/package-summary.html      |  2 +-
 .../current/javadoc/protobuf/package-tree.html |  2 +-
 docs/current/javadoc/serialized-form.html      |  2 +-
 16 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 45951e7..75c059e 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index 885aad7..d73e3bd 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index e86f8c2..c8c633e 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 56ceb9c..0de3806 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 19f9b10..cc03827 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index dcec254..2eb48dc 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -104,11 +104,11 @@ <h2 class="title">C</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName(Descriptors.FieldDescriptor, String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
 <dd>
 <div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName(String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName(Descriptors.FieldDescriptor, String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
 <dd>
 <div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
 </dd>
@@ -466,11 +466,11 @@ <h2 class="title">P</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName(Descriptors.FieldDescriptor, Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
 <dd>
 <div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName(Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName(Descriptors.FieldDescriptor, Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
 <dd>
 <div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
 </dd>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 2a7d105..2d9fd7f 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index de0e7f4..e451581 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 86d5382..88607ae 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:19 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index ff29d0e..e1c930b 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -124,13 +124,15 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-java.lang.String-">clojureName</a></span>(java.lang.String&nbsp;protoName)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName</a></span>(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+           java.lang.String&nbsp;protoName)</code>
 <div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-java.lang.Object-">protoName</a></span>(java.lang.Object&nbsp;clojureName)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName</a></span>(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+         java.lang.Object&nbsp;clojureName)</code>
 <div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
 </td>
 </tr>
@@ -149,23 +151,25 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="protoName-java.lang.Object-">
+<a name="protoName-Descriptors.FieldDescriptor-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>protoName</h4>
-<pre>java.lang.String&nbsp;protoName(java.lang.Object&nbsp;clojureName)</pre>
+<pre>java.lang.String&nbsp;protoName(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+                           java.lang.Object&nbsp;clojureName)</pre>
 <div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
 </li>
 </ul>
-<a name="clojureName-java.lang.String-">
+<a name="clojureName-Descriptors.FieldDescriptor-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>clojureName</h4>
-<pre>java.lang.Object&nbsp;clojureName(java.lang.String&nbsp;protoName)</pre>
+<pre>java.lang.Object&nbsp;clojureName(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+                             java.lang.String&nbsp;protoName)</pre>
 <div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
 </li>
 </ul>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 52ccc72..547f339 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 2f98895..06d8ff1 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:19 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index e78197f..a500e81 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index baf1ab6..71a7b3c 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index e6046e2..25dc5ee 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index fc7f9be..d17dcc7 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:45:20 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

From 261481f6e2a82bd6cd5410be2feb582b8d8282ae Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 21:57:25 -0500
Subject: [PATCH 476/525] Cut new release.

---
 README.md   | 2 +-
 project.clj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 346a081..5315c77 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
-| 3.5.1-v1.1-SNAPSHOT | Added docs, more func renames, new abstraction layer, improved DevEx of API
+| 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
 | 3.5.1-v0.3          | Bumped to use the latest Google Protocol Buffer release, re-added tests, Travis CI support
 | 3.4.0-v0.2          | Transition release; identical to the ghaskins clojure-protobuf at version  3.4.0-2-SNAPSHOT
diff --git a/project.clj b/project.clj
index 5cdf459..3f9c63d 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"
+(defproject clojusc/protobuf "3.5.1-v1.1"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {

From 59657f7a148a64b264e572e3bbaccf49511670ca Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 22:14:56 -0500
Subject: [PATCH 477/525] Updated to latest protobuf.

Also:
* Updated deps
* Bumped dev version
---
 README.md   | 3 ++-
 project.clj | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5315c77..87cf68c 100644
--- a/README.md
+++ b/README.md
@@ -124,9 +124,10 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
+| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java
 | 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
-| 3.5.1-v0.3          | Bumped to use the latest Google Protocol Buffer release, re-added tests, Travis CI support
+| 3.5.1-v0.3          | Bumped to latest release of protobuf-java, re-added tests, Travis CI support
 | 3.4.0-v0.2          | Transition release; identical to the ghaskins clojure-protobuf at version  3.4.0-2-SNAPSHOT
 
 A note on the history: This project picked up the Clojure protobuf code base
diff --git a/project.clj b/project.clj
index 3f9c63d..0087b67 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojusc/protobuf "3.5.1-v1.1"
+(defproject clojusc/protobuf "3.6.0-v1.2-SNAPSHOT"
   :description "A Clojure interface to Google's protocol buffers"
   :url "https://github.com/clojusc/protobuf"
   :license {
@@ -7,7 +7,7 @@
   :exclusions [
     [org.clojure/clojure]]
   :dependencies [
-    [com.google.protobuf/protobuf-java "3.5.1"]
+    [com.google.protobuf/protobuf-java "3.6.0"]
     [gloss "0.2.6"]
     [org.clojure/clojure "1.8.0"]
     [org.flatland/io "0.3.0"]]
@@ -27,7 +27,7 @@
                        "\u001B[35m]\u001B[33m λ\u001B[m=> ")}}
     :test {
       :plugins [
-        [jonase/eastwood "0.2.5"]
+        [jonase/eastwood "0.2.6"]
         [lein-ancient "0.6.15"]
         [lein-shell "0.5.0"]]
       :java-source-paths [
@@ -37,7 +37,7 @@
       :dependencies [
         [clojang/codox-theme "0.2.0-SNAPSHOT"]]
       :plugins [
-        [lein-codox "0.10.3"]
+        [lein-codox "0.10.4"]
         [lein-marginalia "0.9.1"]]
       :codox {
         :project {

From 4dd0c79c26a9a62c98003346593640dae38ecd9b Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 22:26:43 -0500
Subject: [PATCH 478/525] Released version 3.5.1-v1.1 of the docs.

---
 docs/3.5.1-v1.1/1000-basic-usage.html         |   54 +
 docs/3.5.1-v1.1/1050-tutorial.html            |  261 ++
 docs/3.5.1-v1.1/1100-extensions.html          |  101 +
 docs/3.5.1-v1.1/1200-tutorial.html            |  178 +
 docs/3.5.1-v1.1/9800-marginalia.html          |    8 +
 docs/3.5.1-v1.1/9900-javadoc.html             |    8 +
 docs/3.5.1-v1.1/9999-other-versions.html      |    9 +
 docs/3.5.1-v1.1/css/default.css               |  638 +++
 docs/3.5.1-v1.1/highlight/atom-one-dark.css   |   96 +
 docs/3.5.1-v1.1/highlight/highlight.pack.js   |    2 +
 docs/3.5.1-v1.1/index.html                    |    3 +
 docs/3.5.1-v1.1/javadoc/allclasses-frame.html |   26 +
 .../javadoc/allclasses-noframe.html           |   26 +
 docs/3.5.1-v1.1/javadoc/constant-values.html  |  247 ++
 docs/3.5.1-v1.1/javadoc/deprecated-list.html  |  120 +
 docs/3.5.1-v1.1/javadoc/help-doc.html         |  217 +
 docs/3.5.1-v1.1/javadoc/index-all.html        |  623 +++
 docs/3.5.1-v1.1/javadoc/index.html            |   72 +
 docs/3.5.1-v1.1/javadoc/overview-tree.html    |  147 +
 docs/3.5.1-v1.1/javadoc/package-list          |    1 +
 .../javadoc/protobuf/Extensions.html          |  764 ++++
 ...tProtocolBufferMap.Def.NamingStrategy.html |  244 ++
 .../PersistentProtocolBufferMap.Def.html      |  532 +++
 .../protobuf/PersistentProtocolBufferMap.html |  803 ++++
 .../javadoc/protobuf/package-frame.html       |   26 +
 .../javadoc/protobuf/package-summary.html     |  161 +
 .../javadoc/protobuf/package-tree.html        |  143 +
 docs/3.5.1-v1.1/javadoc/script.js             |   30 +
 docs/3.5.1-v1.1/javadoc/serialized-form.html  |  156 +
 docs/3.5.1-v1.1/javadoc/stylesheet.css        |  574 +++
 docs/3.5.1-v1.1/js/jquery.min.js              |    4 +
 docs/3.5.1-v1.1/js/page_effects.js            |  113 +
 docs/3.5.1-v1.1/marginalia.html               | 3531 +++++++++++++++++
 docs/3.5.1-v1.1/protobuf.codec.html           |    3 +
 docs/3.5.1-v1.1/protobuf.common.html          |    3 +
 docs/3.5.1-v1.1/protobuf.core.html            |    4 +
 .../protobuf.impl.flatland.codec.html         |    3 +
 .../protobuf.impl.flatland.core.html          |    3 +
 .../protobuf.impl.flatland.map.html           |    3 +
 .../protobuf.impl.flatland.mapdef.html        |    4 +
 .../protobuf.impl.flatland.schema.html        |    3 +
 docs/3.5.1-v1.1/protobuf.schema.html          |    3 +
 docs/3.5.1-v1.1/protobuf.util.html            |    3 +
 docs/current/1000-basic-usage.html            |    2 +-
 docs/current/1050-tutorial.html               |    2 +-
 docs/current/1100-extensions.html             |    2 +-
 docs/current/9800-marginalia.html             |    2 +-
 docs/current/9900-javadoc.html                |    2 +-
 docs/current/9999-other-versions.html         |    3 +-
 docs/current/index.html                       |    2 +-
 docs/current/javadoc/allclasses-frame.html    |    2 +-
 docs/current/javadoc/allclasses-noframe.html  |    2 +-
 docs/current/javadoc/constant-values.html     |    2 +-
 docs/current/javadoc/deprecated-list.html     |    2 +-
 docs/current/javadoc/help-doc.html            |    2 +-
 docs/current/javadoc/index-all.html           |    2 +-
 docs/current/javadoc/index.html               |    2 +-
 docs/current/javadoc/overview-tree.html       |    2 +-
 docs/current/javadoc/protobuf/Extensions.html |    2 +-
 ...tProtocolBufferMap.Def.NamingStrategy.html |    2 +-
 .../PersistentProtocolBufferMap.Def.html      |    2 +-
 .../protobuf/PersistentProtocolBufferMap.html |    2 +-
 .../javadoc/protobuf/package-frame.html       |    2 +-
 .../javadoc/protobuf/package-summary.html     |    2 +-
 .../javadoc/protobuf/package-tree.html        |    2 +-
 docs/current/javadoc/serialized-form.html     |    2 +-
 docs/current/marginalia.html                  |    4 +-
 docs/current/protobuf.common.html             |    2 +-
 docs/current/protobuf.core.html               |    2 +-
 .../current/protobuf.impl.flatland.codec.html |    2 +-
 docs/current/protobuf.impl.flatland.core.html |    2 +-
 docs/current/protobuf.impl.flatland.map.html  |    2 +-
 .../protobuf.impl.flatland.mapdef.html        |    2 +-
 .../protobuf.impl.flatland.schema.html        |    2 +-
 docs/current/protobuf.util.html               |    2 +-
 resources/docs/9999-other-versions.md         |    1 +
 76 files changed, 9985 insertions(+), 33 deletions(-)
 create mode 100644 docs/3.5.1-v1.1/1000-basic-usage.html
 create mode 100644 docs/3.5.1-v1.1/1050-tutorial.html
 create mode 100644 docs/3.5.1-v1.1/1100-extensions.html
 create mode 100644 docs/3.5.1-v1.1/1200-tutorial.html
 create mode 100644 docs/3.5.1-v1.1/9800-marginalia.html
 create mode 100644 docs/3.5.1-v1.1/9900-javadoc.html
 create mode 100644 docs/3.5.1-v1.1/9999-other-versions.html
 create mode 100644 docs/3.5.1-v1.1/css/default.css
 create mode 100644 docs/3.5.1-v1.1/highlight/atom-one-dark.css
 create mode 100644 docs/3.5.1-v1.1/highlight/highlight.pack.js
 create mode 100644 docs/3.5.1-v1.1/index.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/allclasses-frame.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/allclasses-noframe.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/constant-values.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/deprecated-list.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/help-doc.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/index-all.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/index.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/overview-tree.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/package-list
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/Extensions.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/package-frame.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/package-summary.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/protobuf/package-tree.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/script.js
 create mode 100644 docs/3.5.1-v1.1/javadoc/serialized-form.html
 create mode 100644 docs/3.5.1-v1.1/javadoc/stylesheet.css
 create mode 100644 docs/3.5.1-v1.1/js/jquery.min.js
 create mode 100644 docs/3.5.1-v1.1/js/page_effects.js
 create mode 100644 docs/3.5.1-v1.1/marginalia.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.codec.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.common.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.core.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.impl.flatland.codec.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.impl.flatland.core.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.impl.flatland.map.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.impl.flatland.mapdef.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.impl.flatland.schema.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.schema.html
 create mode 100644 docs/3.5.1-v1.1/protobuf.util.html

diff --git a/docs/3.5.1-v1.1/1000-basic-usage.html b/docs/3.5.1-v1.1/1000-basic-usage.html
new file mode 100644
index 0000000..383d52f
--- /dev/null
+++ b/docs/3.5.1-v1.1/1000-basic-usage.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
+<p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
+<pre><code class="proto">package protobuf.examples.person;
+
+option java_outer_classname = "Example";
+
+message Person {
+  required int32 id = 1;
+  required string name = 2;
+  optional string email = 3;
+  repeated string likes = 4;
+}
+</code></pre>
+<h2><a href="#compiling-to-and-then-to" name="compiling-to-and-then-to"></a>Compiling <code>.proto</code> to <code>.java</code> and then to <code>.class</code></h2>
+<p>A convenience script is provided to compile this: <code>bin/compile-example-protobufs</code>. This will create a <code>.java</code> file which will be saved in <code>target/examples</code>.</p>
+<p>The <code>:test</code> profile in the <code>project.clj</code> file has added <code>target/examples</code> as one of its <code>:java-source-paths</code> – as such, lein will compile the <code>.java</code> files in <code>target/examples</code> to <code>.class</code> so that they can be called from Clojure.</p>
+<p>If you started the project REPL with the command <code>lein repl</code>, then all of this has already been done for you.</p>
+<h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the Clojure API</h2>
+<p>From the dev REPL, pull in the core API and the compiled protobuf code:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import '(protobuf.examples.person Example$Person))
+protobuf.examples.person.Example$Person
+</code></pre>
+<p>Now we can create a protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Example$Person
+                            {:id 108
+                             :name "Alice"
+                             :email "alice@example.com"}))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 108, :name "Alice", :email "alice@example.com"}
+</code></pre>
+<p>The protocol buffer instance supports the usual Clojure operations:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (assoc p :name "Alice B. Carol")
+{:id 108, :name "Alice B. Carol", :email "alice@example.com"}
+[protobuf.dev] λ=&gt; (assoc p :likes ["climbing" "running" "jumping"])
+{:id 108,
+ :name "Alice",
+ :email "alice@example.com",
+ :likes ["climbing" "running" "jumping"]}
+</code></pre>
+<p>Additionally, converting between protobuf bytes and Clojure data is trivial:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x7e3a40eb "[B@7e3a40eb"]
+[protobuf.dev] λ=&gt; (protobuf/bytes-&gt; p b)
+{:id 108, :name "Alice", :email "alice@example.com"}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/1050-tutorial.html b/docs/3.5.1-v1.1/1050-tutorial.html
new file mode 100644
index 0000000..3ba46b3
--- /dev/null
+++ b/docs/3.5.1-v1.1/1050-tutorial.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
+<h2><a href="#introduction" name="introduction"></a>Introduction</h2>
+<p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
+<ul>
+  <li>Define message formats in a <code>.proto</code> file.</li>
+  <li>Use the protocol buffer compiler.</li>
+  <li>Use the Clojure protocol buffer API to write and read messages.</li>
+</ul>
+<p>This isn’t a comprehensive guide to using protocol buffers in Clojure. For more detailed reference information, see:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a></li>
+  <li>the <a href="https://clojusc.github.io/protobuf">Clojure API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/encoding">Encoding Reference</a></li>
+</ul>
+<p>Additionally, you may find these useful:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
+</ul>
+<h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible to a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
+<p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
+<ul>
+  <li>Use Java Serialization. This is the default approach since it’s built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn’t work very well if you need to share data with applications written in C++ or Python.</li>
+  <li>You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as “12:3:-23:67”. This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.</li>
+  <li>Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.</li>
+</ul>
+<p>To avoid the problems mentioned in each of the above (as well as many others), protocol buffers was created. They are the flexible, efficient, automated solution.</p>
+<p>With protocol buffers, you write a <code>.proto</code> description of the data structure you wish to store. From that, the protocol buffer compiler creates compilable source code that implements automatic encoding and parsing of the protocol buffer data with an efficient binary format. The generated code provides getters and setters for the fields that make up a protocol buffer and takes care of the details of reading and writing the protocol buffer as a unit. Importantly, the protocol buffer format supports the idea of extending the format over time in such a way that the code can still read data encoded with the old format.</p>
+<h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format"></a>Defining Your Protocol Format</h2>
+<p>To create your address book application, you’ll need to start with a <code>.proto</code> file. The definitions in a <code>.proto</code> file are simple: you add a message for each data structure you want to serialize, then specify a name and a type for each field in the message. Here is the <code>.proto</code> file that defines your messages, <code>addressbook.proto</code>:</p>
+<pre><code class="proto">syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    mobile = 0;
+    home = 1;
+    work = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+</code></pre>
+<p>(Additionally, this file has been made available for you in the <code>resources/proto/examples</code> directory of the Clojure protobuf project.)</p>
+<p>As you can see, the syntax is similar to C++ or Java. Let’s go through each part of the file and see what it does.</p>
+<p>The <code>.proto</code> file starts with a package declaration, which helps to prevent naming conflicts between different projects. In Java, the package name is used as the Java package unless you have explicitly specified a <code>java_package</code>, as we have here. Even if you do provide a <code>java_package</code>, you should still define a normal package as well to avoid name collisions in the Protocol Buffers name space as well as in non-Java languages.</p>
+<p></p><blockquote> After the package declaration, you can see two options that are Java-specific. Thanks to Clojure’s Java inter-op, we can take advantage of this directly, without writing our own Clojure protobuf compiler or waiting for Google to support Clojure. </blockquote><p></p>
+<p><code>java_package</code> specifies in what Java package name your generated classes should live. If you don’t specify this explicitly, it simply matches the package name given by the package declaration, but these names usually aren’t appropriate Java package names (since they usually don’t start with a domain name).</p>
+<p>The <code>java_outer_classname</code> option defines the class name which should contain all of the classes in this file. If you don’t give a <code>java_outer_classname</code> explicitly, it will be generated by converting the file name to camel case. For example, <code>my_proto.proto</code> would, by default, use <code>MyProto</code> as the outer class name.</p>
+<p>Next, you have your message definitions. A message is just an aggregate containing a set of typed fields. Many standard simple data types are available as field types, including <code>bool</code>, <code>int32</code>, <code>float</code>, <code>double</code>, and <code>string.</code> You can also add further structure to your messages by using other message types as field types – in the above example the <code>Person</code> message contains <code>PhoneNumber</code> messages, while the <code>AddressBook</code> message contains <code>Person</code> messages. You can even define message types nested inside other messages – as you can see, the <code>PhoneNumber</code> type is defined inside <code>Person</code>. You can also define <code>enum</code> types if you want one of your fields to have one of a predefined list of values – here you want to specify that a phone number can be one of <code>MOBILE</code>, <code>HOME</code>, or <code>WORK</code>.</p>
+<p>The “ = 1”, “ = 2” markers on each element identify the unique “tag” that field uses in the binary encoding. Tag numbers 1-15 require one less byte to encode than higher numbers, so as an optimization you can decide to use those tags for the commonly used or repeated elements, leaving tags 16 and higher for less-commonly used optional elements. Each element in a repeated field requires re-encoding the tag number, so repeated fields are particularly good candidates for this optimization.</p>
+<p>Each field must be annotated with one of the following modifiers:</p>
+<ul>
+  <li><code>required</code>: a value for the field must be provided, otherwise the message will be considered “uninitialized”. Trying to build an uninitialized message will throw a <code>RuntimeException</code>. Parsing an uninitialized message will throw an <code>IOException</code>. Other than this, a required field behaves exactly like an optional field.</li>
+  <li><code>optional</code>: the field may or may not be set. If an optional field value isn’t set, a default value is used. For simple types, you can specify your own default value, as we’ve done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, <code>false</code> for bools. For embedded messages, the default value is always the “default instance” or “prototype” of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field’s default value.</li>
+  <li><code>repeated</code>: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.</li>
+</ul>
+<p></p><blockquote> <strong>Required Is Forever</strong><p></p>
+<p>You should be very careful about marking fields as required. If at some point you wish to stop writing or sending a required field, it will be problematic to change the field to an optional field – old readers will consider messages without this field to be incomplete and may reject or drop them unintentionally. You should consider writing application-specific custom validation routines for your buffers instead. Some engineers at Google have come to the conclusion that using required does more harm than good; they prefer to use only optional and repeated. However, this view is not universal. </p></blockquote><p></p>
+<p>You’ll find a complete guide to writing <code>.proto</code> files – including all the possible field types – in the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a>. Don’t go looking for facilities similar to class inheritance, though – protocol buffers don’t do that.</p>
+<h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buffers"></a>Compiling Your Protocol Buffers</h2>
+<p>Now that you have a <code>.proto</code>, the next thing you need to do is generate the classes you’ll need to read and write <code>AddressBook</code> (and hence <code>Person</code> and <code>PhoneNumber</code>) messages. To do this, you need to run the protocol buffer compiler <code>protoc</code> on your <code>.proto</code>:</p>
+<ol>
+  <li>If you haven’t installed this yet, now is the time. Your operating system’s  package manager very likely already provides a version for you – search  there first. If not, you can <a href="https://developers.google.com/protocol-buffers/docs/downloads.html">download it</a> from Google.</li>
+  <li>Now run the compiler, specifying:</li>
+</ol>
+<ul>
+  <li>the source directory (where your application’s source code lives – the  current directory is used if you don’t provide a value)</li>
+  <li>the destination directory (where you want the generated code to go; often  the same as $SRC_DIR), and</li>
+  <li>the path to your <code>.proto.</code></li>
+</ul>
+<p>In this case:</p>
+<pre><code class="bash">$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+</code></pre>
+<p>This gives us:</p>
+<pre><code class="bash">$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+</code></pre>
+<p>To have <code>lein</code> compile protobuf <code>.java</code> source files to <code>.class</code> that can be used from Clojure, we need to make sure that <code>lein</code> knows about our Java sources – with do this with the <code>:java-source-paths</code> key in the <code>project.clj</code> file, either at the top-level or in an appropriate profile.</p>
+<p>For example, this is what the Clojure protobuf project has set, using the <code>:test</code> profile:</p>
+<pre><code class="clj">:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+</code></pre>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project itself always compiles the examples and the tests before starting up the REPL, so they are always freshly available to the project contributors. You can do the same thing in your own Clojure projects. </blockquote><p></p>
+<h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
+<p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
+<pre><code class="bash">$ lein repl
+</code></pre>
+<h3><a href="#setup" name="setup"></a>Setup</h3>
+<p>First we’ll pull in the Clojure API:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[clojure.java.io :as io]
+                            '[protobuf.core :as protobuf])
+nil
+</code></pre>
+<p>Then we’ll import the generated Java classes we want to use:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial
+                             AddressBookProtos$Person
+                             AddressBookProtos$Person$PhoneNumber
+                             AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+</code></pre>
+<p>Note that for nested inner classes, we simply use the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>We can view the full, nested data schema in Clojure data:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/schema AddressBookProtos$AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+</code></pre>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data.<p></p>
+<p>For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </p></blockquote><p></p>
+<h2><a href="#the" name="the"></a>The <code>ProtoBufAPI</code></h2>
+<p>The following methods all take an instance of <code>protobuf.core.ProtoBufAPI</code> as their first argument. An example implementation is <code>protobuf.impl.flatland.core.FlatlandProtoBuf</code>.</p>
+<p>Note that the constructor is not a method, and as such, does not take a <code>ProtoBufAPI</code> instance as its first arguement.</p>
+<h3><a href="#instantiation" name="instantiation"></a>Instantiation</h3>
+<ul>
+  <li><code>protobuf/create</code> - Takes a compiled protocol buffer class, as created by the  <code>protoc</code> compiler, as well as the data (fields) to use in creating the  protocol buffer message for the class. Returns a <code>protobuf.core.ProtoBufAPI</code>  implementation</li>
+</ul>
+<h3><a href="#serialization-and-deserialization" name="serialization-and-deserialization"></a>Serialization and Deserialization</h3>
+<ul>
+  <li><code>protobuf/-&gt;bytes</code> - Given an instance of a Clojure ProtoBuf, convert its message to  an array of raw bytes; this is the serialization method.</li>
+  <li><code>protobuf/bytes-&gt;</code> - Given an array or stream of bytes, convert it  to a Clojure ProtoBuf instance; this is the deserialization method.</li>
+</ul>
+<h3><a href="#reading-and-writing" name="reading-and-writing"></a>Reading and Writing</h3>
+<ul>
+  <li><code>protobuf/read</code> - Given an instance of a Clojure ProtoBuf and an input  object (anthying that can be coerced to a <code>InputStream</code>), read from the input  and return a Clojure ProtoBuf.</li>
+  <li><code>protobuf/write</code> - Given an instance of a Clojure ProtoBuf and an output  object (anthying that can be coerced to a <code>OutputStream</code>), write the  serialized bytes of the instance to the output.</li>
+</ul>
+<h3><a href="#inspection" name="inspection"></a>Inspection</h3>
+<ul>
+  <li><code>protobuf/-&gt;schema</code> - Given an instance of a Clojure ProtoBuf, return the  data for its protocol buffer schema.</li>
+</ul>
+<h2><a href="#example-usage" name="example-usage"></a>Example Usage</h2>
+<h3><a href="#creating-messages" name="creating-messages"></a>Creating Messages</h3>
+<p>The <code>create</code> function generates the appropriate protocol buffer message. We’ll use that now to create a list of <code>PhoneNumber</code> messages:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def phones [(protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1212" :type :home})
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1213" :type :mobile})
+                                (protobuf/create AddressBookProtos$Person$PhoneNumber
+                                                 {:number "555-1214" :type :work})])
+#'protobuf.dev/phones
+</code></pre>
+<p></p><blockquote> Note that currently only lower-case enum values are supported by Clojure protobuf; if you create <code>.proto</code> files with enum fields whose values contain any capital letters, your code will be unstable and likely eventually break.<p></p>
+<p>For current status on this issue, see <a href="https://github.com/clojusc/protobuf/issues/25"></a><a href="https://github.com/clojusc/protobuf/issues/25">https://github.com/clojusc/protobuf/issues/25</a> </p></blockquote><p></p>
+<p>Now we can use these when creating our <code>Person</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def alice (protobuf/create AddressBookProtos$Person
+                                               {:id 108
+                                                :name "Alice"
+                                                :email "alice@example.com"
+                                                :phones phones}))
+#'protobuf.dev/alice
+</code></pre>
+<p>And then that can be used when creating (or updating) an <code>AddressBook</code> message:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def addresses (protobuf/create AddressBookProtos$AddressBook
+                                                   {:people [alice]}))
+#'protobuf.dev/addresses
+</code></pre>
+<p>Let’s take a quick look at the result:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint addresses)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+</code></pre>
+<h3><a href="#writing-a-message" name="writing-a-message"></a>Writing a Message</h3>
+<p>These can then be written to an output stream:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/write addresses "/tmp/address-book.db")
+nil
+</code></pre>
+<p>Note that the second argument doesn’t have to be a string representing a file name; it can be anything which <code>clojure.java.io/output-stream</code> can coerce to a stream (e.g., <code>OutputStream</code>, <code>File</code>, <code>URI</code>, <code>URL</code>, <code>Socket</code>, or <code>String</code>).</p>
+<p>Take a look at the contents of <code>/tmp/address-book.db</code> to convince yourself that the data was actually written there. Then, we’ll try reading it back in …</p>
+<h3><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h3>
+<p>Reading stored protobuf data is just as easy as writing it:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read addresses "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+[protobuf.dev] λ=&gt; (= addresses address-book)
+true
+</code></pre>
+<p>It may seem a bit awkward to have need an instance already in order to read data to <em>create</em> an instance, but the instance is what holds the underlying Java class, which is needed for the read operation. It’s not that bad, really – you can create an empty instance and use that for a <code>read</code>, for example:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def address-book (protobuf/read
+                                      (protobuf/create AddressBookProtos$AddressBook)
+                                                       "/tmp/address-book.db"))
+#'protobuf.dev/address-book
+[protobuf.dev] λ=&gt; (pprint address-book)
+{:people
+ [{:name "Alice",
+   :id 108,
+   :email "alice@example.com",
+   :phones
+   [{:number "555-1212", :type :home}
+    {:number "555-1213", :type :mobile}
+    {:number "555-1214", :type :work}]}]}
+nil
+</code></pre>
+<h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
+<p>Sooner or later after you release the code that uses your protocol buffer, you will undoubtedly want to “improve” the protocol buffer’s definition. If you want your new buffers to be backwards-compatible, and your old buffers to be forward-compatible – and you almost certainly do want this – then there are some rules you need to follow. In the new version of the protocol buffer:</p>
+<ul>
+  <li>you <strong>must not</strong> change the tag numbers of any existing fields.</li>
+  <li>you <strong>must not</strong> add or delete any required fields.</li>
+  <li>you <em>may</em> delete optional or repeated fields.</li>
+  <li>you <em>may</em> add new optional or repeated fields but you must use fresh tag  numbers (i.e. tag numbers that were never used in this protocol buffer,  not even by deleted fields).</li>
+</ul>
+<p>If you follow these rules, old code will happily read new messages and simply ignore any new fields. To the old code, optional fields that were deleted will simply have their default value, and deleted repeated fields will be empty. New code will also transparently read old messages. However, keep in mind that new optional fields will not be present in old messages, so you will need to either check explicitly whether they’re set or provide a reasonable default value in your <code>.proto</code> file with <code>[default = value]</code> after the tag number.</p>
+<p>If the default value is not specified for an optional element, a type-specific default value is used instead: for strings, the default value is the empty string. For booleans, the default value is <code>false</code>. For numeric types, the default value is zero. Note also that if you added a new repeated field, your new code will not be able to tell whether it was left empty (by new code) or never set at all (by old code).</p>
+<p>Be sure to see our docs on <a href="1100-extensions.html">Extension usage</a> for Clojure protobuf.</p>
+<h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
+<p>Protocol buffers have uses that go beyond simple accessors and serialization. Be sure to explore the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API reference</a> to see what else you can do with them.</p>
+<p>One key feature provided by protocol message classes is <code>reflection</code>. You can iterate over the fields of a message and manipulate their values without writing your code against any specific message type. One very useful way to use reflection is for converting protocol messages to and from other encodings, such as XML or JSON. A more advanced use of reflection might be to find differences between two messages of the same type, or to develop a sort of “regular expressions for protocol messages” in which you can write expressions that match certain message contents. If you use your imagination, it’s possible to apply Protocol Buffers to a much wider range of problems than you might initially expect!</p>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/1100-extensions.html b/docs/3.5.1-v1.1/1100-extensions.html
new file mode 100644
index 0000000..82d1cf9
--- /dev/null
+++ b/docs/3.5.1-v1.1/1100-extensions.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
+<p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
+<p>For example:</p>
+<pre><code class="proto">import "protobuf/core/extensions.proto";
+
+message Photo {
+  required int32  id     = 1;
+  required string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+
+  message Label {
+    required string item   = 1;
+    required bool   exists = 2;
+  }
+
+  message Attr {
+    required string key = 1;
+    optional string val = 2;
+  }
+
+  message Tag {
+    required int32 person_id = 1;
+    optional int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    optional int32 y_coord   = 3;
+    optional int32 width     = 4;
+    optional int32 height    = 5;
+  }
+}
+</code></pre>
+<p>Then you can access the extension fields in Clojure:</p>
+<p>Start up the REPL and do the appropriate requires/imports:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+[protobuf.dev] λ=&gt; (import (protobuf.examples.photo Example$Photo Example$Photo$Tag))
+protobuf.examples.photo.Example$Photo$Tag
+</code></pre>
+<p>Create our protobuf:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def p (protobuf/create
+                            Example$Photo
+                            {:id 7
+                             :path "/photos/h2k3j4h9h23"
+                             :labels #{"hawaii" "family" "surfing"}
+                             :attrs {"dimensions" "1632x1224", "alpha" "no", "color space" "RGB"}
+                             :tags  {4 {:person_id 4
+                                        :x_coord 607
+                                        :y_coord 813
+                                        :width 25
+                                        :height 27}}}))
+#'protobuf.dev/p
+[protobuf.dev] λ=&gt; p
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Convert to and from bytes:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def b (protobuf/-&gt;bytes p))
+#'protobuf.dev/b
+[protobuf.dev] λ=&gt; b
+#object["[B" 0x4455bb6e "[B@4455bb6e"]
+[protobuf.dev] λ=&gt; (protobuf/bytes-&gt; p b)
+{:id 7,
+ :path "/photos/h2k3j4h9h23",
+ :labels #{"family" "hawaii" "surfing"},
+ :attrs {"alpha" "no", "color space" "RGB", "dimensions" "1632x1224"},
+ :tags
+ {4 {:person-id 4, :x-coord 607, :y-coord 813, :width 25, :height 27}}}
+</code></pre>
+<p>Get the schema for a protobuf (or extract a part of it):</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (protobuf/-&gt;schema p)
+{:type :struct,
+ :name "protobuf.examples.photo.Photo",
+ :fields
+ {:id {:type :int},
+  :path {:type :string},
+  :labels {:type :set, :values {:type :string}},
+  :attrs {:type :map, :keys {:type :string}, :values {:type :string}},
+  :tags
+  {:type :map,
+   :keys {:type :int},
+   :values
+   {:type :struct,
+    :name "protobuf.examples.photo.Photo.Tag",
+    :fields
+    {:person-id {:type :int},
+     :x-coord {:type :int, :max 100.0, :min -100.0},
+     :y-coord {:type :int},
+     :width {:type :int},
+     :height {:type :int}}}},
+  :image {:type :byte_string}}}
+[protobuf.dev] λ=&gt; (get-in (protobuf/-&gt;schema p)
+                           [:fields :tags :values :fields :x-coord])
+{:type :int, :max 100.0, :min -100.0}
+</code></pre></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/1200-tutorial.html b/docs/3.5.1-v1.1/1200-tutorial.html
new file mode 100644
index 0000000..bb425bc
--- /dev/null
+++ b/docs/3.5.1-v1.1/1200-tutorial.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<p><em>Note: The content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>.</em></p>
+<h2><a href="#introduction" name="introduction"></a>Introduction</h2>
+<p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
+<ul>
+  <li>Define message formats in a <code>.proto</code> file.</li>
+  <li>Use the protocol buffer compiler.</li>
+  <li>Use the Clojure protocol buffer API to write and read messages.</li>
+</ul>
+<p>This isn’t a comprehensive guide to using protocol buffers in Clojure. For more detailed reference information, see:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a></li>
+  <li>the <a href="https://clojusc.github.io/protobuf">Clojure API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/encoding">Encoding Reference</a></li>
+</ul>
+<p>Additionally, you may find these useful:</p>
+<ul>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java/index.html">Java API Reference</a></li>
+  <li>the <a href="https://developers.google.com/protocol-buffers/docs/reference/java-generated">Java Generated Code Guide</a></li>
+</ul>
+<h2><a href="#why-use-protocol-buffers-" name="why-use-protocol-buffers-"></a>Why Use Protocol Buffers?</h2>
+<p>Protocol buffers solve the problem of efficiently serializing and deserializing structured data in a language-agnostic manner, accessible a vast array of applications (as long as the applications are written in a language that has a protobuf library). We’ll illustrate this with an example.</p>
+<p>The example we’re going to use is a very simple “address book” application that can read and write people’s contact details to and from a file. Each person in the address book has a name, an ID, an email address, and a contact phone number.</p>
+<p>So, how might one serialize and retrieve structured data like this if protobuf wasn’t around? There are a few ways to solve this problem:</p>
+<ul>
+  <li>Use Java Serialization. This is the default approach since it’s built into the language, but it has a host of well-known problems (see Effective Java, by Josh Bloch pp. 213), and also doesn’t work very well if you need to share data with applications written in C++ or Python.</li>
+  <li>You can invent an ad-hoc way to encode the data items into a single string – such as encoding 4 ints as “12:3:-23:67”. This is a simple and flexible approach, although it does require writing one-off encoding and parsing code, and the parsing imposes a small run-time cost. This works best for encoding very simple data.</li>
+  <li>Serialize the data to XML. This approach can be very attractive since XML is (sort of) human readable and there are binding libraries for lots of languages. This can be a good choice if you want to share data with other applications/projects. However, XML is notoriously space intensive, and encoding/decoding it can impose a huge performance penalty on applications. Also, navigating an XML DOM tree is considerably more complicated than navigating simple fields in a class normally would be.</li>
+</ul>
+<p>To avoid the problems mentioned in each of the above (as well as many others), protocol buffers was created. They are the flexible, efficient, automated solution.</p>
+<p>With protocol buffers, you write a <code>.proto</code> description of the data structure you wish to store. From that, the protocol buffer compiler creates compilable source code that implements automatic encoding and parsing of the protocol buffer data with an efficient binary format. The generated code provides getters and setters for the fields that make up a protocol buffer and takes care of the details of reading and writing the protocol buffer as a unit. Importantly, the protocol buffer format supports the idea of extending the format over time in such a way that the code can still read data encoded with the old format.</p>
+<h2><a href="#defining-your-protocol-format" name="defining-your-protocol-format"></a>Defining Your Protocol Format</h2>
+<p>To create your address book application, you’ll need to start with a <code>.proto</code> file. The definitions in a <code>.proto</code> file are simple: you add a message for each data structure you want to serialize, then specify a name and a type for each field in the message. Here is the <code>.proto</code> file that defines your messages, <code>addressbook.proto</code>:</p>
+<pre><code class="proto">syntax = "proto2";
+
+package tutorial;
+
+option java_package = "protobuf.examples.tutorial";
+option java_outer_classname = "AddressBookProtos";
+
+message Person {
+  required string name = 1;
+  required int32 id = 2;
+  optional string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    required string number = 1;
+    optional PhoneType type = 2 [default = HOME];
+  }
+
+  repeated PhoneNumber phones = 4;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}
+</code></pre>
+<p>(Additionally, this file has been made available for you in the <code>resources/proto/examples</code> directory of the Clojure protobuf project.)</p>
+<p>As you can see, the syntax is similar to C++ or Java. Let’s go through each part of the file and see what it does.</p>
+<p>The <code>.proto</code> file starts with a package declaration, which helps to prevent naming conflicts between different projects. In Java, the package name is used as the Java package unless you have explicitly specified a <code>java_package</code>, as we have here. Even if you do provide a <code>java_package</code>, you should still define a normal package as well to avoid name collisions in the Protocol Buffers name space as well as in non-Java languages.</p>
+<p></p><blockquote> After the package declaration, you can see two options that are Java-specific. Thanks to Clojure’s Java inter-op, we can take advantage of this directly, without writing our own Clojure protobuf compiler or waiting for Google to support Clojure. </blockquote><p></p>
+<p><code>java_package</code> specifies in what Java package name your generated classes should live. If you don’t specify this explicitly, it simply matches the package name given by the package declaration, but these names usually aren’t appropriate Java package names (since they usually don’t start with a domain name).</p>
+<p>The <code>java_outer_classname</code> option defines the class name which should contain all of the classes in this file. If you don’t give a <code>java_outer_classname</code> explicitly, it will be generated by converting the file name to camel case. For example, <code>my_proto.proto</code> would, by default, use <code>MyProto</code> as the outer class name.</p>
+<p>Next, you have your message definitions. A message is just an aggregate containing a set of typed fields. Many standard simple data types are available as field types, including <code>bool</code>, <code>int32</code>, <code>float</code>, <code>double</code>, and <code>string.</code> You can also add further structure to your messages by using other message types as field types – in the above example the <code>Person</code> message contains <code>PhoneNumber</code> messages, while the <code>AddressBook</code> message contains <code>Person</code> messages. You can even define message types nested inside other messages – as you can see, the <code>PhoneNumber</code> type is defined inside <code>Person</code>. You can also define <code>enum</code> types if you want one of your fields to have one of a predefined list of values – here you want to specify that a phone number can be one of <code>MOBILE</code>, <code>HOME</code>, or <code>WORK</code>.</p>
+<p>The “ = 1”, “ = 2” markers on each element identify the unique “tag” that field uses in the binary encoding. Tag numbers 1-15 require one less byte to encode than higher numbers, so as an optimization you can decide to use those tags for the commonly used or repeated elements, leaving tags 16 and higher for less-commonly used optional elements. Each element in a repeated field requires re-encoding the tag number, so repeated fields are particularly good candidates for this optimization.</p>
+<p>Each field must be annotated with one of the following modifiers:</p>
+<ul>
+  <li><code>required</code>: a value for the field must be provided, otherwise the message will be considered “uninitialized”. Trying to build an uninitialized message will throw a <code>RuntimeException</code>. Parsing an uninitialized message will throw an <code>IOException</code>. Other than this, a required field behaves exactly like an optional field.</li>
+  <li><code>optional</code>: the field may or may not be set. If an optional field value isn’t set, a default value is used. For simple types, you can specify your own default value, as we’ve done for the phone number type in the example. Otherwise, a system default is used: zero for numeric types, the empty string for strings, <code>false</code> for bools. For embedded messages, the default value is always the “default instance” or “prototype” of the message, which has none of its fields set. Calling the accessor to get the value of an optional (or required) field which has not been explicitly set always returns that field’s default value.</li>
+  <li><code>repeated</code>: the field may be repeated any number of times (including zero). The order of the repeated values will be preserved in the protocol buffer. Think of repeated fields as dynamically sized arrays.</li>
+</ul>
+<p></p><blockquote> <strong>Required Is Forever</strong><p></p>
+<p>You should be very careful about marking fields as required. If at some point you wish to stop writing or sending a required field, it will be problematic to change the field to an optional field – old readers will consider messages without this field to be incomplete and may reject or drop them unintentionally. You should consider writing application-specific custom validation routines for your buffers instead. Some engineers at Google have come to the conclusion that using required does more harm than good; they prefer to use only optional and repeated. However, this view is not universal. </p></blockquote><p></p>
+<p>You’ll find a complete guide to writing <code>.proto</code> files – including all the possible field types – in the <a href="https://developers.google.com/protocol-buffers/docs/proto">Protocol Buffer Language Guide</a>. Don’t go looking for facilities similar to class inheritance, though – protocol buffers don’t do that.</p>
+<h2><a href="#compiling-your-protocol-buffers" name="compiling-your-protocol-buffers"></a>Compiling Your Protocol Buffers</h2>
+<p>Now that you have a <code>.proto</code>, the next thing you need to do is generate the classes you’ll need to read and write <code>AddressBook</code> (and hence <code>Person</code> and <code>PhoneNumber</code>) messages. To do this, you need to run the protocol buffer compiler <code>protoc</code> on your <code>.proto</code>:</p>
+<ol>
+  <li>If you haven’t installed this yet, now is the time. Your operating system’s  package manager very likely already provides a version for you – search  there first. If not, you can <a href="https://developers.google.com/protocol-buffers/docs/downloads.html">download it</a> from Google.</li>
+  <li>Now run the compiler, specifying:</li>
+</ol>
+<ul>
+  <li>the source directory (where your application’s source code lives – the  current directory is used if you don’t provide a value)</li>
+  <li>the destination directory (where you want the generated code to go; often  the same as $SRC_DIR), and</li>
+  <li>the path to your <code>.proto.</code></li>
+</ul>
+<p>In this case:</p>
+<pre><code class="bash">$ protoc -I=resources --java_out=target/examples \
+  resources/protobuf/examples/tutorial.proto
+</code></pre>
+<p>This gives us:</p>
+<pre><code class="bash">$ ls -1 target/examples/protobuf/examples/tutorial/
+AddressBookProtos.java
+</code></pre>
+<p>To have <code>lein</code> compile protobuf <code>.java</code> source files to <code>.class</code> that can be used from Clojure, we need to make sure that <code>lein</code> knows about our Java sources – with do this with the <code>:java-source-paths</code> key in the <code>project.clj</code> file, either at the top-level or in an appropriate profile.</p>
+<p>For example, this is what the Clojure protobuf project has set, using the <code>:test</code> profile:</p>
+<pre><code class="clj">:test {
+  :java-source-paths [
+    "target/examples"
+    "target/testing"]}
+</code></pre>
+<p></p><blockquote> Fore convenience, the Clojure protobuf project always compiles the examples and the tests before starting up the REPL, so they are always freshly available to developers. </blockquote><p></p>
+<h2><a href="#the-protocol-buffer-api" name="the-protocol-buffer-api"></a>The Protocol Buffer API</h2>
+<p>Let’s fire up the REPL and see how to use the compiled code from Clojure:</p>
+<pre><code class="bash">$ lein repl
+</code></pre>
+<h3><a href="#setup" name="setup"></a>Setup</h3>
+<p>First we’ll pull in the Clojure API:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (require '[protobuf.core :as protobuf])
+nil
+</code></pre>
+<p>Then we’ll import the generated Java classes we want to use:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (import '(protobuf.examples.tutorial AddressBookProtos$Person
+              #_=&gt;                                      AddressBookProtos$Person$PhoneNumber
+              #_=&gt;                                      AddressBookProtos$AddressBook))
+protobuf.examples.tutorial.AddressBookProtos$AddressBook
+</code></pre>
+<p>Note that for nested inner classes, we simply keep using the inner class separator <code>$</code> of Clojure’s Java inter-op.</p>
+<p>Next we’ll use a Java wrapper that let’s us treat these like maps:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (def Person (protobuf/mapdef AddressBookProtos$Person))
+#'protobuf.dev/Person
+[protobuf.dev] λ=&gt; (def PhoneNumber (protobuf/mapdef AddressBookProtos$Person$PhoneNumber))
+#'protobuf.dev/PhoneNumber
+[protobuf.dev] λ=&gt; (def AddressBook (protobuf/mapdef AddressBookProtos$AddressBook))
+#'protobuf.dev/AddressBook
+</code></pre>
+<p>We can view the full, nested data schema in Clojure data:</p>
+<pre><code class="clj">[protobuf.dev] λ=&gt; (pprint (protobuf/mapdef-&gt;schema AddressBook))
+{:type :struct,
+ :name "tutorial.AddressBook",
+ :fields
+ {:people
+  {:type :list,
+   :values
+   {:type :struct,
+    :name "tutorial.Person",
+    :fields
+    {:name {:type :string},
+     :id {:type :int},
+     :email {:type :string},
+     :phones
+     {:type :list,
+      :values
+      {:type :struct,
+       :name "tutorial.Person.PhoneNumber",
+       :fields
+       {:number {:type :string},
+        :type
+        {:type :enum,
+         :values #{:home :work :mobile},
+         :default
+         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+nil
+</code></pre>
+<p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data. For current status on this issue, see: <a href="https://github.com/clojusc/protobuf/issues/22"></a><a href="https://github.com/clojusc/protobuf/issues/22">https://github.com/clojusc/protobuf/issues/22</a> </blockquote><p></p>
+<h2><a href="#message-functions" name="message-functions"></a>Message Functions</h2>
+<p>TBD</p>
+<h2><a href="#parsing-and-serialization" name="parsing-and-serialization"></a>Parsing and Serialization</h2>
+<ul>
+  <li><code>protobuf/parse</code> - Given an array or stream of bytes, we can parse these  to a Clojure protobuf data structure</li>
+  <li><code>protobuf/-&gt;bytes</code> - Given a Java protobuf wrapper, we can convert this to  an array of raw bytes</li>
+</ul>
+<h2><a href="#writing-a-message" name="writing-a-message"></a>Writing a Message</h2>
+<p>TBD</p>
+<h2><a href="#reading-a-message" name="reading-a-message"></a>Reading a Message</h2>
+<p>TBD</p>
+<h2><a href="#extending-a-protocol" name="extending-a-protocol"></a>Extending a Protocol</h2>
+<p>TBD</p>
+<h2><a href="#advanced-usage" name="advanced-usage"></a>Advanced Usage</h2>
+<p>TBD</p>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/9800-marginalia.html b/docs/3.5.1-v1.1/9800-marginalia.html
new file mode 100644
index 0000000..43ab0de
--- /dev/null
+++ b/docs/3.5.1-v1.1/9800-marginalia.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
+<ul>
+  <li><a href="marginalia.html">Marginalia docs</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/9900-javadoc.html b/docs/3.5.1-v1.1/9900-javadoc.html
new file mode 100644
index 0000000..ffa92d3
--- /dev/null
+++ b/docs/3.5.1-v1.1/9900-javadoc.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
+<ul>
+  <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
+</ul>
+<!-- Named page links below: /--></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/9999-other-versions.html b/docs/3.5.1-v1.1/9999-other-versions.html
new file mode 100644
index 0000000..8241a27
--- /dev/null
+++ b/docs/3.5.1-v1.1/9999-other-versions.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
+<ul>
+  <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v1.0">3.5.1-v1.0</a></li>
+  <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
+</ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/css/default.css b/docs/3.5.1-v1.1/css/default.css
new file mode 100644
index 0000000..89df9b5
--- /dev/null
+++ b/docs/3.5.1-v1.1/css/default.css
@@ -0,0 +1,638 @@
+@import url('https://fonts.googleapis.com/css?family=PT+Sans');
+
+body {
+    font-family: 'PT Sans', Helvetica, sans-serif;
+    font-size: 14px;
+}
+
+a {
+    color: #337ab7;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #30426a;
+    text-decoration: underline;
+}
+
+pre, code {
+    font-family: Monaco, DejaVu Sans Mono, Consolas, monospace;
+    font-size: 9pt;
+    margin: 15px 0;
+}
+
+h1 {
+    font-weight: normal;
+    font-size: 29px;
+    margin: 10px 0 2px 0;
+    padding: 0;
+}
+
+h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+h3 > a:hover {
+    text-decoration: none;
+}
+
+.document h1, .namespace-index h1 {
+    font-size: 32px;
+    margin-top: 12px;
+}
+
+#header, #content, .sidebar {
+    position: fixed;
+}
+
+#header {
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 22px;
+    color: #f5f5f5;
+    padding: 5px 7px;
+}
+
+#content {
+    top: 32px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    background: #eee;
+    color: #333;
+    padding: 0 18px;
+}
+
+.sidebar {
+    position: fixed;
+    top: 32px;
+    bottom: 0;
+    overflow: auto;
+    color: white;
+}
+
+.sidebar.primary {
+    background: #1f283b;
+    border-right: solid 1px #1f283b;
+    left: 0;
+    width: 250px;
+    font-size: 110%;
+}
+
+.sidebar.secondary {
+    background: #2a364f;
+    border-right: solid 1px #d7d7d7;
+    left: 251px;
+    width: 200px;
+    font-size: 110%;
+}
+
+#content.namespace-index, #content.document {
+    left: 251px;
+}
+
+#content.namespace-docs {
+    left: 452px;
+}
+
+#content.document {
+    padding-bottom: 10%;
+    left: 200px;
+}
+
+#header {
+    background: #58852b;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.4);
+    z-index: 100;
+}
+
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font-size: 18px;
+    font-weight: lighter;
+}
+
+#header h1 .project-version {
+    font-weight: normal;
+}
+
+.project-version {
+    padding-left: 0.15em;
+}
+
+#header a, .sidebar a {
+    display: block;
+    text-decoration: none;
+}
+
+#header a {
+    color: #f5f5f5;
+}
+
+.sidebar.primary, .sidebar.primary a,
+.sidebar.secondary, .sidebar.secondary a {
+    color: #b2bfdc;
+}
+
+.sidebar.primary a:hover, .sidebar.secondary a:hover {
+    color: white;
+}
+
+#header h2 {
+    float: right;
+    font-size: 9pt;
+    font-weight: normal;
+    margin: 4px 3px;
+    padding: 0;
+    color: #bbb;
+}
+
+#header h2 a {
+    display: inline;
+}
+
+.sidebar h3 {
+    margin: 0;
+    padding: 10px 13px 0 13px;
+    font-size: 19px;
+    font-weight: lighter;
+}
+
+.sidebar.primary h3.no-link, .sidebar.secondary h3 a {
+    text-transform: uppercase;
+    font-size: 12px;
+    color: #738bc0;
+}
+
+.sidebar ul {
+    padding: 7px 0 6px 0;
+    margin: 0;
+}
+
+.sidebar ul.index-link {
+    padding-bottom: 4px;
+}
+
+.sidebar li {
+    display: block;
+    vertical-align: middle;
+}
+
+.sidebar li a, .sidebar li .no-link {
+    border-left: 3px solid transparent;
+    padding: 0 10px;
+    white-space: nowrap;
+}
+
+.sidebar li .inner {
+    display: inline-block;
+    padding-top: 7px;
+    height: 24px;
+}
+
+.sidebar li a, .sidebar li .tree {
+    height: 31px;
+}
+
+.depth-1 .inner { padding-left: 2px; }
+.depth-2 .inner { padding-left: 6px; }
+.depth-3 .inner { padding-left: 20px; }
+.depth-4 .inner { padding-left: 34px; }
+.depth-5 .inner { padding-left: 48px; }
+.depth-6 .inner { padding-left: 62px; }
+.depth-7 .inner { padding-left: 76px; }
+.depth-8 .inner { padding-left: 90px; }
+
+.sidebar li .tree {
+    display: block;
+    float: left;
+    position: relative;
+    top: -10px;
+    margin: 0 4px 0 0;
+    padding: 0;
+}
+
+.sidebar li.depth-1 .tree {
+    display: none;
+}
+
+.sidebar li .tree .top, .sidebar li .tree .bottom {
+    display: block;
+    margin: 0;
+    padding: 0;
+    width: 7px;
+}
+
+.sidebar li .tree .top {
+    border-left: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    height: 19px;
+}
+
+.sidebar li .tree .bottom {
+    height: 22px;
+}
+
+.sidebar li.branch .tree .bottom {
+    border-left: 1px solid #aaa;
+}
+
+.sidebar.primary li.current a,
+.sidebar.secondary li.current a {
+    border-left: 3px solid #58852b;
+    color: white;
+}
+
+.namespace-index h2 {
+    margin: 30px 0 0 0;
+}
+
+.namespace-index h3 {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 0;
+    letter-spacing: 0.05em;
+    border-bottom: solid 1px #ddd;
+    max-width: 680px;
+    background-color: #fafafa;
+    padding: 0.5em;
+}
+
+.namespace-index .topics {
+    padding-left: 30px;
+    margin: 11px 0 0 0;
+}
+
+ul.topics {
+    list-style-type: none;
+}
+
+.namespace-index .topics li {
+    padding: 5px 0;
+}
+
+.namespace-docs h3 {
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.public h3 {
+    margin: 0;
+    float: left;
+}
+
+.usage {
+    clear: both;
+}
+
+.public {
+    margin: 0;
+    border-top: 1px solid #e0e0e0;
+    padding-top: 14px;
+    padding-bottom: 6px;
+}
+
+.public:last-child {
+    margin-bottom: 20%;
+}
+
+.members .public:last-child {
+    margin-bottom: 0;
+}
+
+.members {
+    margin: 15px 0;
+}
+
+.members h4 {
+    color: #555;
+    font-weight: normal;
+    font-variant: small-caps;
+    margin: 0 0 5px 0;
+}
+
+.members .inner {
+    padding-top: 5px;
+    padding-left: 12px;
+    margin-top: 2px;
+    margin-left: 7px;
+    border-left: 1px solid #bbb;
+}
+
+#content .members .inner h3 {
+    font-size: 12pt;
+}
+
+.members .public {
+    border-top: none;
+    margin-top: 0;
+    padding-top: 6px;
+    padding-bottom: 0;
+}
+
+.members .public:first-child {
+    padding-top: 0;
+}
+
+h4.type,
+h4.dynamic,
+h4.added,
+h4.deprecated {
+    float: left;
+    margin: 3px 10px 15px 0;
+    font-size: 15px;
+    font-weight: bold;
+    font-variant: small-caps;
+}
+
+.public h4.type,
+.public h4.dynamic,
+.public h4.added,
+.public h4.deprecated {
+    font-size: 13px;
+    font-weight: bold;
+    margin: 3px 0 0 10px;
+}
+
+.members h4.type,
+.members h4.added,
+.members h4.deprecated {
+    margin-top: 1px;
+}
+
+h4.type {
+    color: #717171;
+}
+
+h4.dynamic {
+    color: #9933aa;
+}
+
+h4.added {
+    color: #508820;
+}
+
+h4.deprecated {
+    color: #880000;
+}
+
+.namespace {
+    margin-bottom: 30px;
+}
+
+.namespace:last-child {
+    margin-bottom: 10%;
+}
+
+.index {
+    padding: 0;
+    font-size: 80%;
+    margin: 15px 0;
+    line-height: 1.6em;
+}
+
+.index * {
+    display: inline;
+}
+
+.index p {
+    padding-right: 3px;
+}
+
+.index li {
+    padding-right: 5px;
+}
+
+.index ul {
+    padding-left: 0;
+}
+
+.type-sig {
+    clear: both;
+    color: #088;
+}
+
+.type-sig pre {
+    padding-top: 10px;
+    margin: 0;
+}
+
+.usage code {
+    display: block;
+    color: #008;
+    margin: 2px 0;
+}
+
+.usage code:first-child {
+    padding-top: 10px;
+}
+
+p {
+    margin: 15px 0;
+}
+
+.public p:first-child, .public pre.plaintext {
+    margin-top: 12px;
+}
+
+.doc {
+    margin: 0 0 26px 0;
+    clear: both;
+}
+
+.public .doc {
+    margin: 0;
+}
+
+.namespace-index {
+  font-size: 120%;
+}
+
+.namespace-index .doc {
+    margin-bottom: 20px;
+}
+
+.namespace-index .namespace .doc {
+    margin-bottom: 10px;
+}
+
+.markdown p, .markdown li, .markdown dt, .markdown dd, .markdown td {
+    line-height: 1.6em;
+}
+
+.markdown h2 {
+    font-weight: normal;
+    font-size: 25px;
+}
+
+#content .markdown h3 {
+    font-size: 20px;
+}
+
+.markdown h4 {
+    font-size: 15px;
+}
+
+.doc, .public, .namespace .index {
+    max-width: 680px;
+    overflow-x: visible;
+}
+
+.markdown pre > code {
+    display: block;
+    padding: 10px;
+}
+
+.markdown pre > code, .src-link a {
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+}
+
+.src-link a {
+    background: #f6f6f6;
+}
+
+.markdown code:not(.hljs) {
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+    font-size: 90%;
+    padding: 2px 4px;
+}
+
+pre.deps {
+    display: inline-block;
+    margin: 0 10px;
+    border: 1px solid #e4e4e4;
+    border-radius: 2px;
+    padding: 10px;
+    background-color: #f6f6f6;
+}
+
+.markdown hr {
+    border-style: solid;
+    border-top: none;
+    color: #ccc;
+}
+
+.doc ul, .doc ol {
+    padding-left: 30px;
+}
+
+.doc table {
+    border-collapse: collapse;
+    margin: 0 10px;
+}
+
+.doc table td, .doc table th {
+    border: 1px solid #dddddd;
+    padding: 4px 6px;
+}
+
+.doc table th {
+    background: #f2f2f2;
+}
+
+.doc dl {
+    margin: 0 10px 20px 10px;
+}
+
+.doc dl dt {
+    font-weight: bold;
+    margin: 0;
+    padding: 3px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.doc dl dd {
+    padding: 5px 0;
+    margin: 0 0 5px 10px;
+}
+
+.doc abbr {
+    border-bottom: 1px dotted #333;
+    font-variant: none;
+    cursor: help;
+}
+
+.src-link {
+    margin-bottom: 15px;
+}
+
+.src-link a {
+    font-size: 70%;
+    padding: 1px 4px;
+    text-decoration: none;
+    color: #5555bb;
+    background-color: #f6f6f6;
+}
+
+blockquote {
+    opacity: 0.6;
+    border-left: solid 2px #ddd;
+    margin-left: 0;
+    padding-left: 1em;
+}
+
+/* Responsiveness Theme */
+
+@media (max-device-width: 480px) {
+  .sidebar {
+    display:none;
+  }
+
+  #content {
+    position: relative;
+    left: initial !important;
+    top: 110px;
+    padding: 1em 1em 0 1em;
+  }
+
+  #header {
+    display: flex;
+    flex-direction: column-reverse;
+    height: 100px;
+  }
+
+  #header > h1 {
+    font-size: 52px;
+  }
+
+  #header h2 {
+    float: none;
+    font-size: 20px;
+  }
+
+  .namespace-index > h1 {
+    display: none;
+  }
+
+  .public, .doc, .namespace > .index, .namespace > .doc, .namespace > h3 {
+    max-width: initial;
+  }
+
+  .doc {
+    text-align: justify;
+  }
+
+  .public {
+    padding-top: 2em;
+    padding-bottom: 2em;
+  }
+
+  .public > h3 {
+    font-size: 300%;
+  }
+
+  .public > h4.type, .public > h4.added, .public > h4.deprecated {
+    font-size: 150%;
+    margin-top: 1em;
+  }
+
+  pre > code {
+    font-size: 200%;
+  }
+}
diff --git a/docs/3.5.1-v1.1/highlight/atom-one-dark.css b/docs/3.5.1-v1.1/highlight/atom-one-dark.css
new file mode 100644
index 0000000..1616aaf
--- /dev/null
+++ b/docs/3.5.1-v1.1/highlight/atom-one-dark.css
@@ -0,0 +1,96 @@
+/*
+
+Atom One Dark by Daniel Gamage
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+base:    #282c34
+mono-1:  #abb2bf
+mono-2:  #818896
+mono-3:  #5c6370
+hue-1:   #56b6c2
+hue-2:   #61aeee
+hue-3:   #c678dd
+hue-4:   #98c379
+hue-5:   #e06c75
+hue-5-2: #be5046
+hue-6:   #d19a66
+hue-6-2: #e6c07b
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #abb2bf;
+  background: #282c34;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #5c6370;
+  font-style: italic;
+}
+
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #c678dd;
+}
+
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
+.hljs-subst {
+  color: #e06c75;
+}
+
+.hljs-literal {
+  color: #56b6c2;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #98c379;
+}
+
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #e6c07b;
+}
+
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #d19a66;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-title {
+  color: #61aeee;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/docs/3.5.1-v1.1/highlight/highlight.pack.js b/docs/3.5.1-v1.1/highlight/highlight.pack.js
new file mode 100644
index 0000000..126e338
--- /dev/null
+++ b/docs/3.5.1-v1.1/highlight/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.11.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]\n/,sL:"bash"}}],i:"</"}});hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"meta",b:"^#!",e:"$"},l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},i=b.inherit(b.QSM,{i:null}),t=b.C(";","$",{r:0}),s={b:"\\*",e:"\\*"},u={cN:"symbol",b:"[:&]"+e},d={b:e,r:0},f={b:c},m={b:"\\(",e:"\\)",c:["self",l,i,n,d]},o={c:[n,i,s,u,m,d],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},v={v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},N={b:"\\(\\s*",e:"\\)"},A={eW:!0,r:0};return N.c=[{cN:"name",v:[{b:e},{b:c}]},A],A.c=[o,v,N,l,n,i,t,s,u,f,d],{i:/\S/,c:[n,a,l,i,t,o,v,N,d]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(i,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[a,e.HCM,l,i,{cN:"symbol",b:":(?!\\s)",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:b,c:s}});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure"}}]}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/index.html b/docs/3.5.1-v1.1/index.html
new file mode 100644
index 0000000..2e402d1
--- /dev/null
+++ b/docs/3.5.1-v1.1/index.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/javadoc/allclasses-frame.html b/docs/3.5.1-v1.1/javadoc/allclasses-frame.html
new file mode 100644
index 0000000..9f098ea
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/allclasses-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/allclasses-noframe.html b/docs/3.5.1-v1.1/javadoc/allclasses-noframe.html
new file mode 100644
index 0000000..2d75ad3
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/allclasses-noframe.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>All Classes (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+<li><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/constant-values.html b/docs/3.5.1-v1.1/javadoc/constant-values.html
new file mode 100644
index 0000000..25e11fc
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/constant-values.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Constant Field Values (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#protobuf">protobuf.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="protobuf">
+<!--   -->
+</a>
+<h2 title="protobuf">protobuf.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.COUNTER_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52004</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52003</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52006</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52007</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.MAP_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52002</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.META_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52010</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52025</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52026</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52024</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52022</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52023</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52021</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52020</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="protobuf.Extensions.SET_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52001</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="protobuf.Extensions.SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></code></td>
+<td class="colLast"><code>52005</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/deprecated-list.html b/docs/3.5.1-v1.1/javadoc/deprecated-list.html
new file mode 100644
index 0000000..781dcd3
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/deprecated-list.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Deprecated List (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Deprecated List (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/help-doc.html b/docs/3.5.1-v1.1/javadoc/help-doc.html
new file mode 100644
index 0000000..e16c31a
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/help-doc.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>API Help (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="API Help (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/index-all.html b/docs/3.5.1-v1.1/javadoc/index-all.html
new file mode 100644
index 0000000..6445163
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/index-all.html
@@ -0,0 +1,623 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Index (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Index (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
+<!--   -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:B">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#builder--">builder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:C">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue(Descriptors.EnumValueDescriptor)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName(Descriptors.FieldDescriptor, String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName(Descriptors.FieldDescriptor, String)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct(PersistentProtocolBufferMap.Def, Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#count--">count()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#counter">counter</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create(PersistentProtocolBufferMap.Def, byte[])</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create(Descriptors.Descriptor, PersistentProtocolBufferMap.Def.NamingStrategy, int)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:D">
+<!--   -->
+</a>
+<h2 class="title">D</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#def">def</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:E">
+<!--   -->
+</a>
+<h2 class="title">E</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#empty--">empty()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:F">
+<!--   -->
+</a>
+<h2 class="title">F</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:G">
+<!--   -->
+</a>
+<h2 class="title">G</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#getDescriptor--">getDescriptor()</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt(Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt(Object, Object, boolean)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:I">
+<!--   -->
+</a>
+<h2 class="title">I</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern(String)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#iterator--">iterator()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:M">
+<!--   -->
+</a>
+<h2 class="title">M</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#map">map</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapBy">mapBy</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapDeleted">mapDeleted</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#mapExists">mapExists</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#message--">message()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#meta">meta</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#meta--">meta()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:N">
+<!--   -->
+</a>
+<h2 class="title">N</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr(Object)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullable">nullable</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullDouble">nullDouble</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullEnum">nullEnum</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullFloat">nullFloat</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullInt">nullInt</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullLong">nullLong</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#nullString">nullString</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+</dl>
+<a name="I:P">
+<!--   -->
+</a>
+<h2 class="title">P</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom(InputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom(PersistentProtocolBufferMap.Def, InputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom(byte[])</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom(CodedInputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom(PersistentProtocolBufferMap.Def, CodedInputStream)</a></span> - Static method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a> - Class in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a> - Interface in <a href="protobuf/package-summary.html">protobuf</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="protobuf/package-summary.html">protobuf</a> - package protobuf</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span> - Static variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName(Descriptors.FieldDescriptor, Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName(Descriptors.FieldDescriptor, Object)</a></span> - Method in interface protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></dt>
+<dd>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</dd>
+</dl>
+<a name="I:R">
+<!--   -->
+</a>
+<h2 class="title">R</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:S">
+<!--   -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#seq--">seq()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#set">set</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#succession">succession</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span> - Static variable in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:T">
+<!--   -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray()</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span> - Variable in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt(Object, Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:W">
+<!--   -->
+</a>
+<h2 class="title">W</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta(IPersistentMap)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without(Object)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo(OutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo(CodedOutputStream)</a></span> - Method in class protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/index.html b/docs/3.5.1-v1.1/javadoc/index.html
new file mode 100644
index 0000000..c0dcb94
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/index.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Clojure Protocol Buffer Library</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="protobuf/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="protobuf/package-summary.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/overview-tree.html b/docs/3.5.1-v1.1/javadoc/overview-tree.html
new file mode 100644
index 0000000..b76721d
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/overview-tree.html
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="protobuf/package-tree.html">protobuf</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/package-list b/docs/3.5.1-v1.1/javadoc/package-list
new file mode 100644
index 0000000..b0c79cc
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/package-list
@@ -0,0 +1 @@
+protobuf
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/Extensions.html b/docs/3.5.1-v1.1/javadoc/protobuf/Extensions.html
new file mode 100644
index 0000000..d0b3222
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/Extensions.html
@@ -0,0 +1,764 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Extensions (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Extensions (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class Extensions" class="title">Class Extensions</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.Extensions</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">Extensions</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#counter">counter</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#COUNTER_FIELD_NUMBER">COUNTER_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#map">map</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_BY_FIELD_NUMBER">MAP_BY_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_DELETED_FIELD_NUMBER">MAP_DELETED_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_EXISTS_FIELD_NUMBER">MAP_EXISTS_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#MAP_FIELD_NUMBER">MAP_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapBy">mapBy</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapDeleted">mapDeleted</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#mapExists">mapExists</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#meta">meta</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#META_FIELD_NUMBER">META_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_DOUBLE_FIELD_NUMBER">NULL_DOUBLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_ENUM_FIELD_NUMBER">NULL_ENUM_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_FLOAT_FIELD_NUMBER">NULL_FLOAT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_INT_FIELD_NUMBER">NULL_INT_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_LONG_FIELD_NUMBER">NULL_LONG_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULL_STRING_FIELD_NUMBER">NULL_STRING_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullable">nullable</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#NULLABLE_FIELD_NUMBER">NULLABLE_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullDouble">nullDouble</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullEnum">nullEnum</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullFloat">nullFloat</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullInt">nullInt</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullLong">nullLong</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#nullString">nullString</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#set">set</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SET_FIELD_NUMBER">SET_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;any&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#succession">succession</a></span></code>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#SUCCESSION_FIELD_NUMBER">SUCCESSION_FIELD_NUMBER</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static com.google.protobuf.Descriptors.FileDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#getDescriptor--">getDescriptor</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions</a></span>(com.google.protobuf.ExtensionRegistry&nbsp;registry)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="SET_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SET_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SET_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SET_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="set">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>set</h4>
+<pre>public static final&nbsp;&lt;any&gt; set</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="map">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>map</h4>
+<pre>public static final&nbsp;&lt;any&gt; map</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_BY_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_BY_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_BY_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_BY_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapBy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapBy</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapBy</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="COUNTER_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COUNTER_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int COUNTER_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.COUNTER_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="counter">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>counter</h4>
+<pre>public static final&nbsp;&lt;any&gt; counter</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="SUCCESSION_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SUCCESSION_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int SUCCESSION_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.SUCCESSION_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="succession">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>succession</h4>
+<pre>public static final&nbsp;&lt;any&gt; succession</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_DELETED_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_DELETED_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_DELETED_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_DELETED_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapDeleted">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapDeleted</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapDeleted</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="MAP_EXISTS_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MAP_EXISTS_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int MAP_EXISTS_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.MAP_EXISTS_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="mapExists">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mapExists</h4>
+<pre>public static final&nbsp;&lt;any&gt; mapExists</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="META_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>META_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int META_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.META_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="meta">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public static final&nbsp;&lt;any&gt; meta</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULLABLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULLABLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULLABLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULLABLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullable">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullable</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullable</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_STRING_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_STRING_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_STRING_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_STRING_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullString">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullString</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullString</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_INT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_INT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_INT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_INT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullInt">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullInt</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullInt</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_LONG_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_LONG_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_LONG_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_LONG_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullLong">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullLong</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullLong</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_FLOAT_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_FLOAT_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_FLOAT_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_FLOAT_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullFloat">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullFloat</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullFloat</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_DOUBLE_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_DOUBLE_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_DOUBLE_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_DOUBLE_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullDouble">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nullDouble</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullDouble</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+<a name="NULL_ENUM_FIELD_NUMBER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NULL_ENUM_FIELD_NUMBER</h4>
+<pre>public static final&nbsp;int NULL_ENUM_FIELD_NUMBER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#protobuf.Extensions.NULL_ENUM_FIELD_NUMBER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="nullEnum">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>nullEnum</h4>
+<pre>public static final&nbsp;&lt;any&gt; nullEnum</pre>
+<div class="block"><code>extend .google.protobuf.FieldOptions { ... }</code></div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="registerAllExtensions-com.google.protobuf.ExtensionRegistry-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerAllExtensions</h4>
+<pre>public static&nbsp;void&nbsp;registerAllExtensions(com.google.protobuf.ExtensionRegistry&nbsp;registry)</pre>
+</li>
+</ul>
+<a name="getDescriptor--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDescriptor</h4>
+<pre>public static&nbsp;com.google.protobuf.Descriptors.FileDescriptor&nbsp;getDescriptor()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/Extensions.html" target="_top">Frames</a></li>
+<li><a href="Extensions.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
new file mode 100644
index 0000000..7939ffb
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -0,0 +1,244 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Interface PersistentProtocolBufferMap.Def.NamingStrategy" class="title">Interface PersistentProtocolBufferMap.Def.NamingStrategy</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static interface <span class="typeNameLabel">PersistentProtocolBufferMap.Def.NamingStrategy</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#clojureName-Descriptors.FieldDescriptor-java.lang.String-">clojureName</a></span>(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+           java.lang.String&nbsp;protoName)</code>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html#protoName-Descriptors.FieldDescriptor-java.lang.Object-">protoName</a></span>(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+         java.lang.Object&nbsp;clojureName)</code>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="protoName-Descriptors.FieldDescriptor-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protoName</h4>
+<pre>java.lang.String&nbsp;protoName(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+                           java.lang.Object&nbsp;clojureName)</pre>
+<div class="block">Given a Clojure map key, return the string to be used as the protobuf message field name.</div>
+</li>
+</ul>
+<a name="clojureName-Descriptors.FieldDescriptor-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureName</h4>
+<pre>java.lang.Object&nbsp;clojureName(Descriptors.FieldDescriptor&nbsp;fieldDescriptor,
+                             java.lang.String&nbsp;protoName)</pre>
+<div class="block">Given a protobuf message field name, return a Clojure object suitable for use as a map key.</div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
new file mode 100644
index 0000000..d984ab4
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -0,0 +1,532 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap.Def" class="title">Class PersistentProtocolBufferMap.Def</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap.Def</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">PersistentProtocolBufferMap.Def</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#convertUnderscores">convertUnderscores</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static clojure.lang.Var</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NAME_VAR">NAME_VAR</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#namingStrategy">namingStrategy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#NULL">NULL</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#protobufNames">protobufNames</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#sizeLimit">sizeLimit</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#type">type</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#clojureEnumValue-Descriptors.EnumValueDescriptor-">clojureEnumValue</a></span>(Descriptors.EnumValueDescriptor&nbsp;enum_value)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">create</a></span>(Descriptors.Descriptor&nbsp;type,
+      <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+      int&nbsp;sizeLimit)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>Descriptors.FieldDescriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#fieldDescriptor-java.lang.Object-">fieldDescriptor</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getFullName--">getFullName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#getName--">getName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#intern-java.lang.String-">intern</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#nameStr-java.lang.Object-">nameStr</a></span>(java.lang.Object&nbsp;named)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#newBuilder--">newBuilder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseDelimitedFrom-java.io.InputStream-">parseDelimitedFrom</a></span>(java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-byte:A-">parseFrom</a></span>(byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html#parseFrom-CodedInputStream-">parseFrom</a></span>(CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="NAME_VAR">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NAME_VAR</h4>
+<pre>public static final&nbsp;clojure.lang.Var NAME_VAR</pre>
+</li>
+</ul>
+<a name="protobufNames">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>protobufNames</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> protobufNames</pre>
+</li>
+</ul>
+<a name="convertUnderscores">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertUnderscores</h4>
+<pre>public static final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> convertUnderscores</pre>
+</li>
+</ul>
+<a name="type">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>type</h4>
+<pre>public final&nbsp;Descriptors.Descriptor type</pre>
+</li>
+</ul>
+<a name="namingStrategy">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>namingStrategy</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a> namingStrategy</pre>
+</li>
+</ul>
+<a name="sizeLimit">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sizeLimit</h4>
+<pre>public final&nbsp;int sizeLimit</pre>
+</li>
+</ul>
+<a name="NULL">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NULL</h4>
+<pre>public static final&nbsp;java.lang.Object NULL</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="nameStr-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nameStr</h4>
+<pre>public static final&nbsp;java.lang.String&nbsp;nameStr(java.lang.Object&nbsp;named)</pre>
+</li>
+</ul>
+<a name="create-Descriptors.Descriptor-protobuf.PersistentProtocolBufferMap.Def.NamingStrategy-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;create(Descriptors.Descriptor&nbsp;type,
+                                                     <a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a>&nbsp;strat,
+                                                     int&nbsp;sizeLimit)</pre>
+</li>
+</ul>
+<a name="parseFrom-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(byte[]&nbsp;bytes)
+                         throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;parseFrom(CodedInputStream&nbsp;input)
+                         throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;parseDelimitedFrom(java.io.InputStream&nbsp;input)
+                                          throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newBuilder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>newBuilder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;newBuilder()</pre>
+</li>
+</ul>
+<a name="fieldDescriptor-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fieldDescriptor</h4>
+<pre>public&nbsp;Descriptors.FieldDescriptor&nbsp;fieldDescriptor(java.lang.Object&nbsp;key)</pre>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+</li>
+</ul>
+<a name="getFullName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFullName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getFullName()</pre>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="intern-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>intern</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;intern(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="clojureEnumValue-Descriptors.EnumValueDescriptor-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clojureEnumValue</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;clojureEnumValue(Descriptors.EnumValueDescriptor&nbsp;enum_value)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.Def.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.html
new file mode 100644
index 0000000..367c7c6
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -0,0 +1,803 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PersistentProtocolBufferMap (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":9,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">protobuf</div>
+<h2 title="Class PersistentProtocolBufferMap" class="title">Class PersistentProtocolBufferMap</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.AFn</li>
+<li>
+<ul class="inheritance">
+<li>clojure.lang.APersistentMap</li>
+<li>
+<ul class="inheritance">
+<li>protobuf.PersistentProtocolBufferMap</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>clojure.lang.Associative, clojure.lang.Counted, clojure.lang.IFn, clojure.lang.IHashEq, clojure.lang.ILookup, clojure.lang.IMeta, clojure.lang.IObj, clojure.lang.IPersistentCollection, clojure.lang.IPersistentMap, clojure.lang.MapEquivalence, clojure.lang.Seqable, java.io.Serializable, java.lang.Iterable, java.lang.Runnable, java.util.concurrent.Callable, java.util.Map</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PersistentProtocolBufferMap</span>
+extends clojure.lang.APersistentMap
+implements clojure.lang.IObj</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#protobuf.PersistentProtocolBufferMap">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clojure.lang.APersistentMap.KeySeq, clojure.lang.APersistentMap.ValSeq</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;java.util.Map</h3>
+<code>java.util.Map.Entry&lt;K,V&gt;</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.clojure.lang.IFn">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;clojure.lang.IFn</h3>
+<code>clojure.lang.IFn.D, clojure.lang.IFn.DD, clojure.lang.IFn.DDD, clojure.lang.IFn.DDDD, clojure.lang.IFn.DDDDD, clojure.lang.IFn.DDDDL, clojure.lang.IFn.DDDDO, clojure.lang.IFn.DDDL, clojure.lang.IFn.DDDLD, clojure.lang.IFn.DDDLL, clojure.lang.IFn.DDDLO, clojure.lang.IFn.DDDO, clojure.lang.IFn.DDDOD, clojure.lang.IFn.DDDOL, clojure.lang.IFn.DDDOO, clojure.lang.IFn.DDL, clojure.lang.IFn.DDLD, clojure.lang.IFn.DDLDD, clojure.lang.IFn.DDLDL, clojure.lang.IFn.DDLDO, clojure.lang.IFn.DDLL, clojure.lang.IFn.DDLLD, clojure.lang.IFn.DDLLL, clojure.lang.IFn.DDLLO, clojure.lang.IFn.DDLO, clojure.lang.IFn.DDLOD, clojure.lang.IFn.DDLOL, clojure.lang.IFn.DDLOO, clojure.lang.IFn.DDO, clojure.lang.IFn.DDOD, clojure.lang.IFn.DDODD, clojure.lang.IFn.DDODL, clojure.lang.IFn.DDODO, clojure.lang.IFn.DDOL, clojure.lang.IFn.DDOLD, clojure.lang.IFn.DDOLL, clojure.lang.IFn.DDOLO, clojure.lang.IFn.DDOO, clojure.lang.IFn.DDOOD, clojure.lang.IFn.DDOOL, clojure.lang.IFn.DDOOO, clojure.lang.IFn.DL, clojure.lang.IFn.DLD, clojure.lang.IFn.DLDD, clojure.lang.IFn.DLDDD, clojure.lang.IFn.DLDDL, clojure.lang.IFn.DLDDO, clojure.lang.IFn.DLDL, clojure.lang.IFn.DLDLD, clojure.lang.IFn.DLDLL, clojure.lang.IFn.DLDLO, clojure.lang.IFn.DLDO, clojure.lang.IFn.DLDOD, clojure.lang.IFn.DLDOL, clojure.lang.IFn.DLDOO, clojure.lang.IFn.DLL, clojure.lang.IFn.DLLD, clojure.lang.IFn.DLLDD, clojure.lang.IFn.DLLDL, clojure.lang.IFn.DLLDO, clojure.lang.IFn.DLLL, clojure.lang.IFn.DLLLD, clojure.lang.IFn.DLLLL, clojure.lang.IFn.DLLLO, clojure.lang.IFn.DLLO, clojure.lang.IFn.DLLOD, clojure.lang.IFn.DLLOL, clojure.lang.IFn.DLLOO, clojure.lang.IFn.DLO, clojure.lang.IFn.DLOD, clojure.lang.IFn.DLODD, clojure.lang.IFn.DLODL, clojure.lang.IFn.DLODO, clojure.lang.IFn.DLOL, clojure.lang.IFn.DLOLD, clojure.lang.IFn.DLOLL, clojure.lang.IFn.DLOLO, clojure.lang.IFn.DLOO, clojure.lang.IFn.DLOOD, clojure.lang.IFn.DLOOL, clojure.lang.IFn.DLOOO, clojure.lang.IFn.DO, clojure.lang.IFn.DOD, clojure.lang.IFn.DODD, clojure.lang.IFn.DODDD, clojure.lang.IFn.DODDL, clojure.lang.IFn.DODDO, clojure.lang.IFn.DODL, clojure.lang.IFn.DODLD, clojure.lang.IFn.DODLL, clojure.lang.IFn.DODLO, clojure.lang.IFn.DODO, clojure.lang.IFn.DODOD, clojure.lang.IFn.DODOL, clojure.lang.IFn.DODOO, clojure.lang.IFn.DOL, clojure.lang.IFn.DOLD, clojure.lang.IFn.DOLDD, clojure.lang.IFn.DOLDL, clojure.lang.IFn.DOLDO, clojure.lang.IFn.DOLL, clojure.lang.IFn.DOLLD, clojure.lang.IFn.DOLLL, clojure.lang.IFn.DOLLO, clojure.lang.IFn.DOLO, clojure.lang.IFn.DOLOD, clojure.lang.IFn.DOLOL, clojure.lang.IFn.DOLOO, clojure.lang.IFn.DOO, clojure.lang.IFn.DOOD, clojure.lang.IFn.DOODD, clojure.lang.IFn.DOODL, clojure.lang.IFn.DOODO, clojure.lang.IFn.DOOL, clojure.lang.IFn.DOOLD, clojure.lang.IFn.DOOLL, clojure.lang.IFn.DOOLO, clojure.lang.IFn.DOOO, clojure.lang.IFn.DOOOD, clojure.lang.IFn.DOOOL, clojure.lang.IFn.DOOOO, clojure.lang.IFn.L, clojure.lang.IFn.LD, clojure.lang.IFn.LDD, clojure.lang.IFn.LDDD, clojure.lang.IFn.LDDDD, clojure.lang.IFn.LDDDL, clojure.lang.IFn.LDDDO, clojure.lang.IFn.LDDL, clojure.lang.IFn.LDDLD, clojure.lang.IFn.LDDLL, clojure.lang.IFn.LDDLO, clojure.lang.IFn.LDDO, clojure.lang.IFn.LDDOD, clojure.lang.IFn.LDDOL, clojure.lang.IFn.LDDOO, clojure.lang.IFn.LDL, clojure.lang.IFn.LDLD, clojure.lang.IFn.LDLDD, clojure.lang.IFn.LDLDL, clojure.lang.IFn.LDLDO, clojure.lang.IFn.LDLL, clojure.lang.IFn.LDLLD, clojure.lang.IFn.LDLLL, clojure.lang.IFn.LDLLO, clojure.lang.IFn.LDLO, clojure.lang.IFn.LDLOD, clojure.lang.IFn.LDLOL, clojure.lang.IFn.LDLOO, clojure.lang.IFn.LDO, clojure.lang.IFn.LDOD, clojure.lang.IFn.LDODD, clojure.lang.IFn.LDODL, clojure.lang.IFn.LDODO, clojure.lang.IFn.LDOL, clojure.lang.IFn.LDOLD, clojure.lang.IFn.LDOLL, clojure.lang.IFn.LDOLO, clojure.lang.IFn.LDOO, clojure.lang.IFn.LDOOD, clojure.lang.IFn.LDOOL, clojure.lang.IFn.LDOOO, clojure.lang.IFn.LL, clojure.lang.IFn.LLD, clojure.lang.IFn.LLDD, clojure.lang.IFn.LLDDD, clojure.lang.IFn.LLDDL, clojure.lang.IFn.LLDDO, clojure.lang.IFn.LLDL, clojure.lang.IFn.LLDLD, clojure.lang.IFn.LLDLL, clojure.lang.IFn.LLDLO, clojure.lang.IFn.LLDO, clojure.lang.IFn.LLDOD, clojure.lang.IFn.LLDOL, clojure.lang.IFn.LLDOO, clojure.lang.IFn.LLL, clojure.lang.IFn.LLLD, clojure.lang.IFn.LLLDD, clojure.lang.IFn.LLLDL, clojure.lang.IFn.LLLDO, clojure.lang.IFn.LLLL, clojure.lang.IFn.LLLLD, clojure.lang.IFn.LLLLL, clojure.lang.IFn.LLLLO, clojure.lang.IFn.LLLO, clojure.lang.IFn.LLLOD, clojure.lang.IFn.LLLOL, clojure.lang.IFn.LLLOO, clojure.lang.IFn.LLO, clojure.lang.IFn.LLOD, clojure.lang.IFn.LLODD, clojure.lang.IFn.LLODL, clojure.lang.IFn.LLODO, clojure.lang.IFn.LLOL, clojure.lang.IFn.LLOLD, clojure.lang.IFn.LLOLL, clojure.lang.IFn.LLOLO, clojure.lang.IFn.LLOO, clojure.lang.IFn.LLOOD, clojure.lang.IFn.LLOOL, clojure.lang.IFn.LLOOO, clojure.lang.IFn.LO, clojure.lang.IFn.LOD, clojure.lang.IFn.LODD, clojure.lang.IFn.LODDD, clojure.lang.IFn.LODDL, clojure.lang.IFn.LODDO, clojure.lang.IFn.LODL, clojure.lang.IFn.LODLD, clojure.lang.IFn.LODLL, clojure.lang.IFn.LODLO, clojure.lang.IFn.LODO, clojure.lang.IFn.LODOD, clojure.lang.IFn.LODOL, clojure.lang.IFn.LODOO, clojure.lang.IFn.LOL, clojure.lang.IFn.LOLD, clojure.lang.IFn.LOLDD, clojure.lang.IFn.LOLDL, clojure.lang.IFn.LOLDO, clojure.lang.IFn.LOLL, clojure.lang.IFn.LOLLD, clojure.lang.IFn.LOLLL, clojure.lang.IFn.LOLLO, clojure.lang.IFn.LOLO, clojure.lang.IFn.LOLOD, clojure.lang.IFn.LOLOL, clojure.lang.IFn.LOLOO, clojure.lang.IFn.LOO, clojure.lang.IFn.LOOD, clojure.lang.IFn.LOODD, clojure.lang.IFn.LOODL, clojure.lang.IFn.LOODO, clojure.lang.IFn.LOOL, clojure.lang.IFn.LOOLD, clojure.lang.IFn.LOOLL, clojure.lang.IFn.LOOLO, clojure.lang.IFn.LOOO, clojure.lang.IFn.LOOOD, clojure.lang.IFn.LOOOL, clojure.lang.IFn.LOOOO, clojure.lang.IFn.OD, clojure.lang.IFn.ODD, clojure.lang.IFn.ODDD, clojure.lang.IFn.ODDDD, clojure.lang.IFn.ODDDL, clojure.lang.IFn.ODDDO, clojure.lang.IFn.ODDL, clojure.lang.IFn.ODDLD, clojure.lang.IFn.ODDLL, clojure.lang.IFn.ODDLO, clojure.lang.IFn.ODDO, clojure.lang.IFn.ODDOD, clojure.lang.IFn.ODDOL, clojure.lang.IFn.ODDOO, clojure.lang.IFn.ODL, clojure.lang.IFn.ODLD, clojure.lang.IFn.ODLDD, clojure.lang.IFn.ODLDL, clojure.lang.IFn.ODLDO, clojure.lang.IFn.ODLL, clojure.lang.IFn.ODLLD, clojure.lang.IFn.ODLLL, clojure.lang.IFn.ODLLO, clojure.lang.IFn.ODLO, clojure.lang.IFn.ODLOD, clojure.lang.IFn.ODLOL, clojure.lang.IFn.ODLOO, clojure.lang.IFn.ODO, clojure.lang.IFn.ODOD, clojure.lang.IFn.ODODD, clojure.lang.IFn.ODODL, clojure.lang.IFn.ODODO, clojure.lang.IFn.ODOL, clojure.lang.IFn.ODOLD, clojure.lang.IFn.ODOLL, clojure.lang.IFn.ODOLO, clojure.lang.IFn.ODOO, clojure.lang.IFn.ODOOD, clojure.lang.IFn.ODOOL, clojure.lang.IFn.ODOOO, clojure.lang.IFn.OL, clojure.lang.IFn.OLD, clojure.lang.IFn.OLDD, clojure.lang.IFn.OLDDD, clojure.lang.IFn.OLDDL, clojure.lang.IFn.OLDDO, clojure.lang.IFn.OLDL, clojure.lang.IFn.OLDLD, clojure.lang.IFn.OLDLL, clojure.lang.IFn.OLDLO, clojure.lang.IFn.OLDO, clojure.lang.IFn.OLDOD, clojure.lang.IFn.OLDOL, clojure.lang.IFn.OLDOO, clojure.lang.IFn.OLL, clojure.lang.IFn.OLLD, clojure.lang.IFn.OLLDD, clojure.lang.IFn.OLLDL, clojure.lang.IFn.OLLDO, clojure.lang.IFn.OLLL, clojure.lang.IFn.OLLLD, clojure.lang.IFn.OLLLL, clojure.lang.IFn.OLLLO, clojure.lang.IFn.OLLO, clojure.lang.IFn.OLLOD, clojure.lang.IFn.OLLOL, clojure.lang.IFn.OLLOO, clojure.lang.IFn.OLO, clojure.lang.IFn.OLOD, clojure.lang.IFn.OLODD, clojure.lang.IFn.OLODL, clojure.lang.IFn.OLODO, clojure.lang.IFn.OLOL, clojure.lang.IFn.OLOLD, clojure.lang.IFn.OLOLL, clojure.lang.IFn.OLOLO, clojure.lang.IFn.OLOO, clojure.lang.IFn.OLOOD, clojure.lang.IFn.OLOOL, clojure.lang.IFn.OLOOO, clojure.lang.IFn.OOD, clojure.lang.IFn.OODD, clojure.lang.IFn.OODDD, clojure.lang.IFn.OODDL, clojure.lang.IFn.OODDO, clojure.lang.IFn.OODL, clojure.lang.IFn.OODLD, clojure.lang.IFn.OODLL, clojure.lang.IFn.OODLO, clojure.lang.IFn.OODO, clojure.lang.IFn.OODOD, clojure.lang.IFn.OODOL, clojure.lang.IFn.OODOO, clojure.lang.IFn.OOL, clojure.lang.IFn.OOLD, clojure.lang.IFn.OOLDD, clojure.lang.IFn.OOLDL, clojure.lang.IFn.OOLDO, clojure.lang.IFn.OOLL, clojure.lang.IFn.OOLLD, clojure.lang.IFn.OOLLL, clojure.lang.IFn.OOLLO, clojure.lang.IFn.OOLO, clojure.lang.IFn.OOLOD, clojure.lang.IFn.OOLOL, clojure.lang.IFn.OOLOO, clojure.lang.IFn.OOOD, clojure.lang.IFn.OOODD, clojure.lang.IFn.OOODL, clojure.lang.IFn.OOODO, clojure.lang.IFn.OOOL, clojure.lang.IFn.OOOLD, clojure.lang.IFn.OOOLL, clojure.lang.IFn.OOOLO, clojure.lang.IFn.OOOOD, clojure.lang.IFn.OOOOL</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#def">def</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#append-clojure.lang.IPersistentMap-">append</a></span>(clojure.lang.IPersistentMap&nbsp;map)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assoc-java.lang.Object-java.lang.Object-">assoc</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#assocEx-java.lang.Object-java.lang.Object-">assocEx</a></span>(java.lang.Object&nbsp;key,
+       java.lang.Object&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>DynamicMessage.Builder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#builder--">builder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#cons-java.lang.Object-">cons</a></span>(java.lang.Object&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">construct</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         java.lang.Object&nbsp;keyvals)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#containsKey-java.lang.Object-">containsKey</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#count--">count</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">create</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+      byte[]&nbsp;bytes)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>clojure.lang.IPersistentCollection</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#empty--">empty</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>clojure.lang.IMapEntry</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#entryAt-java.lang.Object-">entryAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>Descriptors.Descriptor</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getMessageType--">getMessageType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#getValAt-java.lang.Object-java.lang.Object-boolean-">getValAt</a></span>(java.lang.Object&nbsp;key,
+        java.lang.Object&nbsp;notFound,
+        boolean&nbsp;use_extensions)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>java.util.Iterator&lt;?&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>DynamicMessage</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#message--">message</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#meta--">meta</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">parseDelimitedFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                  java.io.InputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>static <a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">parseFrom</a></span>(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+         CodedInputStream&nbsp;input)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>clojure.lang.ISeq</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#seq--">seq</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#toByteArray--">toByteArray</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#valAt-java.lang.Object-java.lang.Object-">valAt</a></span>(java.lang.Object&nbsp;key,
+     java.lang.Object&nbsp;notFound)</code>&nbsp;</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#withMeta-clojure.lang.IPersistentMap-">withMeta</a></span>(clojure.lang.IPersistentMap&nbsp;meta)</code>&nbsp;</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>clojure.lang.IPersistentMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#without-java.lang.Object-">without</a></span>(java.lang.Object&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeDelimitedTo-java.io.OutputStream-">writeDelimitedTo</a></span>(java.io.OutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/PersistentProtocolBufferMap.html#writeTo-CodedOutputStream-">writeTo</a></span>(CodedOutputStream&nbsp;output)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.APersistentMap">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.APersistentMap</h3>
+<code>clear, containsValue, entrySet, equals, equiv, get, hashCode, hasheq, invoke, invoke, isEmpty, keySet, mapEquals, mapHash, mapHasheq, put, putAll, remove, size, toString, values</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.clojure.lang.AFn">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;clojure.lang.AFn</h3>
+<code>applyTo, applyToHelper, call, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, invoke, run, throwArity</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.util.Map">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.util.Map</h3>
+<code>compute, computeIfAbsent, computeIfPresent, forEach, getOrDefault, merge, putIfAbsent, remove, replace, replace, replaceAll</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="def">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>def</h4>
+<pre>public final&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="create-protobuf.PersistentProtocolBufferMap.Def-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;create(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                 byte[]&nbsp;bytes)
+                                          throws InvalidProtocolBufferException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>InvalidProtocolBufferException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseFrom-protobuf.PersistentProtocolBufferMap.Def-CodedInputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    CodedInputStream&nbsp;input)
+                                             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="parseDelimitedFrom-protobuf.PersistentProtocolBufferMap.Def-java.io.InputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parseDelimitedFrom</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;parseDelimitedFrom(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                             java.io.InputStream&nbsp;input)
+                                                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="construct-protobuf.PersistentProtocolBufferMap.Def-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>construct</h4>
+<pre>public static&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;construct(<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a>&nbsp;def,
+                                                    java.lang.Object&nbsp;keyvals)</pre>
+</li>
+</ul>
+<a name="toByteArray--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toByteArray</h4>
+<pre>public&nbsp;byte[]&nbsp;toByteArray()</pre>
+</li>
+</ul>
+<a name="writeTo-CodedOutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeTo</h4>
+<pre>public&nbsp;void&nbsp;writeTo(CodedOutputStream&nbsp;output)
+             throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="writeDelimitedTo-java.io.OutputStream-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>writeDelimitedTo</h4>
+<pre>public&nbsp;void&nbsp;writeDelimitedTo(java.io.OutputStream&nbsp;output)
+                      throws java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMessageType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMessageType</h4>
+<pre>public&nbsp;Descriptors.Descriptor&nbsp;getMessageType()</pre>
+</li>
+</ul>
+<a name="message--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>message</h4>
+<pre>public&nbsp;DynamicMessage&nbsp;message()</pre>
+</li>
+</ul>
+<a name="builder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>builder</h4>
+<pre>public&nbsp;DynamicMessage.Builder&nbsp;builder()</pre>
+</li>
+</ul>
+<a name="withMeta-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>withMeta</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;withMeta(clojure.lang.IPersistentMap&nbsp;meta)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>withMeta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IObj</code></dd>
+</dl>
+</li>
+</ul>
+<a name="meta--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>meta</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;meta()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>meta</code>&nbsp;in interface&nbsp;<code>clojure.lang.IMeta</code></dd>
+</dl>
+</li>
+</ul>
+<a name="containsKey-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>containsKey</h4>
+<pre>public&nbsp;boolean&nbsp;containsKey(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>containsKey</code>&nbsp;in interface&nbsp;<code>java.util.Map</code></dd>
+</dl>
+</li>
+</ul>
+<a name="entryAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>entryAt</h4>
+<pre>public&nbsp;clojure.lang.IMapEntry&nbsp;entryAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>entryAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="valAt-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;valAt(java.lang.Object&nbsp;key,
+                              java.lang.Object&nbsp;notFound)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>valAt</code>&nbsp;in interface&nbsp;<code>clojure.lang.ILookup</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="getValAt-java.lang.Object-java.lang.Object-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValAt</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;getValAt(java.lang.Object&nbsp;key,
+                                 java.lang.Object&nbsp;notFound,
+                                 boolean&nbsp;use_extensions)</pre>
+</li>
+</ul>
+<a name="assoc-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assoc</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assoc(java.lang.Object&nbsp;key,
+                                         java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.Associative</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assoc</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="assocEx-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>assocEx</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;assocEx(java.lang.Object&nbsp;key,
+                                           java.lang.Object&nbsp;value)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>assocEx</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="cons-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cons</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;cons(java.lang.Object&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>cons</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>cons</code>&nbsp;in class&nbsp;<code>clojure.lang.APersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="append-clojure.lang.IPersistentMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a>&nbsp;append(clojure.lang.IPersistentMap&nbsp;map)</pre>
+</li>
+</ul>
+<a name="without-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>without</h4>
+<pre>public&nbsp;clojure.lang.IPersistentMap&nbsp;without(java.lang.Object&nbsp;key)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>without</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentMap</code></dd>
+</dl>
+</li>
+</ul>
+<a name="iterator--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>iterator</h4>
+<pre>public&nbsp;java.util.Iterator&lt;?&gt;&nbsp;iterator()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>iterator</code>&nbsp;in interface&nbsp;<code>java.lang.Iterable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="count--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>count</h4>
+<pre>public&nbsp;int&nbsp;count()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.Counted</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>count</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+<a name="seq--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>seq</h4>
+<pre>public&nbsp;clojure.lang.ISeq&nbsp;seq()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>seq</code>&nbsp;in interface&nbsp;<code>clojure.lang.Seqable</code></dd>
+</dl>
+</li>
+</ul>
+<a name="empty--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>empty</h4>
+<pre>public&nbsp;clojure.lang.IPersistentCollection&nbsp;empty()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>empty</code>&nbsp;in interface&nbsp;<code>clojure.lang.IPersistentCollection</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/PersistentProtocolBufferMap.html" target="_top">Frames</a></li>
+<li><a href="PersistentProtocolBufferMap.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/package-frame.html b/docs/3.5.1-v1.1/javadoc/protobuf/package-frame.html
new file mode 100644
index 0000000..eb5a851
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/package-frame.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../protobuf/package-summary.html" target="classFrame">protobuf</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf" target="classFrame"><span class="interfaceName">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Extensions.html" title="class in protobuf" target="classFrame">Extensions</a></li>
+<li><a href="PersistentProtocolBufferMap.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap</a></li>
+<li><a href="PersistentProtocolBufferMap.Def.html" title="class in protobuf" target="classFrame">PersistentProtocolBufferMap.Def</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/package-summary.html b/docs/3.5.1-v1.1/javadoc/protobuf/package-summary.html
new file mode 100644
index 0000000..c38b7dc
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/package-summary.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>protobuf (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;protobuf</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf">PersistentProtocolBufferMap.Def.NamingStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/Extensions.html" title="class in protobuf">Extensions</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">PersistentProtocolBufferMap</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/protobuf/package-tree.html b/docs/3.5.1-v1.1/javadoc/protobuf/package-tree.html
new file mode 100644
index 0000000..2711a69
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/protobuf/package-tree.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="protobuf Class Hierarchy (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package protobuf</h1>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">clojure.lang.AFn (implements clojure.lang.IFn)
+<ul>
+<li type="circle">clojure.lang.APersistentMap (implements clojure.lang.IHashEq, clojure.lang.IPersistentMap, java.lang.Iterable&lt;T&gt;, java.util.Map&lt;K,V&gt;, clojure.lang.MapEquivalence, java.io.Serializable)
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap</span></a> (implements clojure.lang.IObj)</li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">protobuf.<a href="../protobuf/Extensions.html" title="class in protobuf"><span class="typeNameLink">Extensions</span></a></li>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">protobuf.<a href="../protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html" title="interface in protobuf"><span class="typeNameLink">PersistentProtocolBufferMap.Def.NamingStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-all.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?protobuf/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/script.js b/docs/3.5.1-v1.1/javadoc/script.js
new file mode 100644
index 0000000..b346356
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/script.js
@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}
diff --git a/docs/3.5.1-v1.1/javadoc/serialized-form.html b/docs/3.5.1-v1.1/javadoc/serialized-form.html
new file mode 100644
index 0000000..3a17563
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/serialized-form.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_162) on Mon Jul 02 22:24:52 CDT 2018 -->
+<title>Serialized Form (Clojure Protocol Buffer Library)</title>
+<meta name="date" content="2018-07-02">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Serialized Form (Clojure Protocol Buffer Library)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Serialized Form" class="title">Serialized Form</h1>
+</div>
+<div class="serializedFormContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2 title="Package">Package&nbsp;protobuf</h2>
+<ul class="blockList">
+<li class="blockList"><a name="protobuf.PersistentProtocolBufferMap">
+<!--   -->
+</a>
+<h3>Class <a href="protobuf/PersistentProtocolBufferMap.html" title="class in protobuf">protobuf.PersistentProtocolBufferMap</a> extends clojure.lang.APersistentMap implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialized Fields</h3>
+<ul class="blockList">
+<li class="blockList">
+<h4>def</h4>
+<pre><a href="protobuf/PersistentProtocolBufferMap.Def.html" title="class in protobuf">PersistentProtocolBufferMap.Def</a> def</pre>
+</li>
+<li class="blockList">
+<h4>message</h4>
+<pre>DynamicMessage message</pre>
+</li>
+<li class="blockList">
+<h4>_meta</h4>
+<pre>clojure.lang.IPersistentMap _meta</pre>
+</li>
+<li class="blockListLast">
+<h4>ext</h4>
+<pre>clojure.lang.IPersistentMap ext</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="protobuf/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/3.5.1-v1.1/javadoc/stylesheet.css b/docs/3.5.1-v1.1/javadoc/stylesheet.css
new file mode 100644
index 0000000..98055b2
--- /dev/null
+++ b/docs/3.5.1-v1.1/javadoc/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
diff --git a/docs/3.5.1-v1.1/js/jquery.min.js b/docs/3.5.1-v1.1/js/jquery.min.js
new file mode 100644
index 0000000..73f33fb
--- /dev/null
+++ b/docs/3.5.1-v1.1/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/docs/3.5.1-v1.1/js/page_effects.js b/docs/3.5.1-v1.1/js/page_effects.js
new file mode 100644
index 0000000..7ba93bf
--- /dev/null
+++ b/docs/3.5.1-v1.1/js/page_effects.js
@@ -0,0 +1,113 @@
+function visibleInParent(element) {
+    var position = $(element).position().top
+    return position > -50 && position < ($(element).offsetParent().height() - 50)
+}
+
+function hasFragment(link, fragment) {
+    return $(link).attr("href").indexOf("#" + fragment) != -1
+}
+
+function findLinkByFragment(elements, fragment) {
+    return $(elements).filter(function(i, e) { return hasFragment(e, fragment)}).first()
+}
+
+function scrollToCurrentVarLink(elements) {
+    var elements = $(elements);
+    var parent   = elements.offsetParent();
+
+    if (elements.length == 0) return;
+
+    var top    = elements.first().position().top;
+    var bottom = elements.last().position().top + elements.last().height();
+
+    if (top >= 0 && bottom <= parent.height()) return;
+
+    if (top < 0) {
+        parent.scrollTop(parent.scrollTop() + top);
+    }
+    else if (bottom > parent.height()) {
+        parent.scrollTop(parent.scrollTop() + bottom - parent.height());
+    }
+}
+
+function setCurrentVarLink() {
+    $('.secondary a').parent().removeClass('current')
+    $('.anchor').
+        filter(function(index) { return visibleInParent(this) }).
+        each(function(index, element) {
+            findLinkByFragment(".secondary a", element.id).
+                parent().
+                addClass('current')
+        });
+    scrollToCurrentVarLink('.secondary .current');
+}
+
+var hasStorage = (function() { try { return localStorage.getItem } catch(e) {} }())
+
+function scrollPositionId(element) {
+    var directory = window.location.href.replace(/[^\/]+\.html$/, '')
+    return 'scroll::' + $(element).attr('id') + '::' + directory
+}
+
+function storeScrollPosition(element) {
+    if (!hasStorage) return;
+    localStorage.setItem(scrollPositionId(element) + "::x", $(element).scrollLeft())
+    localStorage.setItem(scrollPositionId(element) + "::y", $(element).scrollTop())
+}
+
+function recallScrollPosition(element) {
+    if (!hasStorage) return;
+    $(element).scrollLeft(localStorage.getItem(scrollPositionId(element) + "::x"))
+    $(element).scrollTop(localStorage.getItem(scrollPositionId(element) + "::y"))
+}
+
+function persistScrollPosition(element) {
+    recallScrollPosition(element)
+    $(element).scroll(function() { storeScrollPosition(element) })
+}
+
+function sidebarContentWidth(element) {
+    var widths = $(element).find('.inner').map(function() { return $(this).innerWidth() })
+    return Math.max.apply(Math, widths)
+}
+
+function calculateSize(width, snap, margin, minimum) {
+    if (width == 0) {
+        return 0
+    }
+    else {
+        return Math.max(minimum, (Math.ceil(width / snap) * snap) + (margin * 2))
+    }
+}
+
+function resizeSidebars() {
+    var primaryWidth   = sidebarContentWidth('.primary')
+    var secondaryWidth = 0
+
+    if ($('.secondary').length != 0) {
+        secondaryWidth = sidebarContentWidth('.secondary')
+    }
+
+    // snap to grid
+    primaryWidth   = calculateSize(primaryWidth, 32, 13, 160)
+    secondaryWidth = calculateSize(secondaryWidth, 32, 13, 160)
+
+    $('.primary').css('width', primaryWidth)
+    $('.secondary').css('width', secondaryWidth).css('left', primaryWidth + 1)
+
+    if (secondaryWidth > 0) {
+        $('#content').css('left', primaryWidth + secondaryWidth + 2)
+    }
+    else {
+        $('#content').css('left', primaryWidth + 1)
+    }
+}
+
+$(window).ready(resizeSidebars)
+$(window).ready(setCurrentVarLink)
+$(window).ready(function() { persistScrollPosition('.primary')})
+$(window).ready(function() {
+    $('#content').scroll(setCurrentVarLink)
+    $(window).resize(setCurrentVarLink)
+    $(window).resize(resizeSidebars)
+})
diff --git a/docs/3.5.1-v1.1/marginalia.html b/docs/3.5.1-v1.1/marginalia.html
new file mode 100644
index 0000000..d2978e4
--- /dev/null
+++ b/docs/3.5.1-v1.1/marginalia.html
@@ -0,0 +1,3531 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8" content="text/html" http-equiv="Content-Type" /><meta content="A Clojure interface to Google's protocol buffers" name="description" /><style type="text/css">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  -moz-border-radius: 0 0 0 0 !important;
+  -webkit-border-radius: 0 0 0 0 !important;
+  background: none !important;
+  border: 0 !important;
+  bottom: auto !important;
+  float: none !important;
+  height: auto !important;
+  left: auto !important;
+  line-height: 1.1em !important;
+/*  margin: 0 !important; */
+  outline: 0 !important;
+  overflow: visible !important;
+  padding: 0 !important;
+  position: static !important;
+  right: auto !important;
+  text-align: left !important;
+  top: auto !important;
+  vertical-align: baseline !important;
+  width: auto !important;
+  box-sizing: content-box !important;
+  font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+  font-weight: normal !important;
+  font-style: normal !important;
+  min-height: inherit !important;
+  min-height: auto !important;
+}
+
+.syntaxhighlighter {
+/*  width: 100% !important; */
+  margin: 1em 0 1em 0 !important;
+  position: relative !important;
+  overflow: auto !important;
+}
+.syntaxhighlighter.source {
+  overflow: hidden !important;
+}
+.syntaxhighlighter .bold {
+  font-weight: bold !important;
+}
+.syntaxhighlighter .italic {
+  font-style: italic !important;
+}
+.syntaxhighlighter .line {
+  white-space: pre !important;
+}
+.syntaxhighlighter table {
+/*    width: 100% !important;*/
+}
+.syntaxhighlighter table caption {
+  text-align: left !important;
+  padding: .5em 0 0.5em 1em !important;
+}
+.syntaxhighlighter table td.code {
+  width: 100% !important;
+}
+.syntaxhighlighter table td.code .container {
+  position: relative !important;
+}
+.syntaxhighlighter table td.code .container textarea {
+  box-sizing: border-box !important;
+  position: absolute !important;
+  left: 0 !important;
+  top: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  border: none !important;
+  background: white !important;
+  padding-left: 1em !important;
+  overflow: hidden !important;
+  white-space: pre !important;
+}
+.syntaxhighlighter table td.gutter .line {
+  text-align: right !important;
+  padding: 0 0.5em 0 1em !important;
+}
+.syntaxhighlighter table td.code .line {
+  padding: 0 1em !important;
+}
+.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
+  padding-left: 0em !important;
+}
+.syntaxhighlighter.show {
+  display: block !important;
+}
+.syntaxhighlighter.collapsed table {
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+    display: none;
+/*  padding: 0.1em 0.8em 0em 0.8em !important;
+  font-size: 1em !important;
+  position: static !important;
+  width: auto !important;
+  height: auto !important;*/
+}
+.syntaxhighlighter.collapsed .toolbar span {
+  display: inline !important;
+  margin-right: 1em !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a {
+  padding: 0 !important;
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar {
+    display: none;
+/*  position: absolute !important;
+  right: 1px !important;
+  top: 1px !important;
+  width: 11px !important;
+  height: 11px !important;
+  font-size: 10px !important;
+  z-index: 10 !important;*/
+}
+.syntaxhighlighter .toolbar span.title {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar a {
+  display: block !important;
+  text-align: center !important;
+  text-decoration: none !important;
+  padding-top: 1px !important;
+}
+.syntaxhighlighter .toolbar a.expandSource {
+  display: none !important;
+}
+.syntaxhighlighter.ie {
+  font-size: .9em !important;
+  padding: 1px 0 1px 0 !important;
+}
+.syntaxhighlighter.ie .toolbar {
+  line-height: 8px !important;
+}
+.syntaxhighlighter.ie .toolbar a {
+  padding-top: 0px !important;
+}
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content {
+  background: none !important;
+}
+.syntaxhighlighter.printing .line .number {
+  color: #bbbbbb !important;
+}
+.syntaxhighlighter.printing .line .content {
+  color: black !important;
+}
+.syntaxhighlighter.printing .toolbar {
+  display: none !important;
+}
+.syntaxhighlighter.printing a {
+  text-decoration: none !important;
+}
+.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
+  color: black !important;
+}
+.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
+  color: blue !important;
+}
+.syntaxhighlighter.printing .keyword {
+  color: #006699 !important;
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter.printing .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter.printing .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter.printing .script {
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
+  color: red !important;
+}
+.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
+  color: black !important;
+}
+</style><style type="text/css">.syntaxhighlighter{overflow:hidden !important;}</style><style type="text/css">/**
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
+  background-color: #c3defe !important;
+}
+.syntaxhighlighter .line.highlighted.number {
+  color: white !important;
+}
+.syntaxhighlighter table caption {
+  color: black !important;
+}
+.syntaxhighlighter .gutter {
+  color: #787878 !important;
+}
+.syntaxhighlighter .gutter .line {
+  border-right: 3px solid #d4d0c8 !important;
+}
+.syntaxhighlighter .gutter .line.highlighted {
+  background-color: #d4d0c8 !important;
+  color: white !important;
+}
+.syntaxhighlighter.printing .line .content {
+  border: none !important;
+}
+.syntaxhighlighter.collapsed {
+  overflow: visible !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  color: #3f5fbf !important;
+  background: white !important;
+  border: 1px solid #d4d0c8 !important;
+}
+.syntaxhighlighter.collapsed .toolbar a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter.collapsed .toolbar a:hover {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .toolbar {
+  color: #a0a0a0 !important;
+  background: #d4d0c8 !important;
+  border: none !important;
+}
+.syntaxhighlighter .toolbar a {
+  color: #a0a0a0 !important;
+}
+.syntaxhighlighter .toolbar a:hover {
+  color: red !important;
+}
+.syntaxhighlighter .plain, .syntaxhighlighter .plain a {
+  color: black !important;
+}
+.syntaxhighlighter .comments, .syntaxhighlighter .comments a {
+  color: #3f5fbf !important;
+}
+.syntaxhighlighter .string, .syntaxhighlighter .string a {
+  color: #2a00ff !important;
+}
+.syntaxhighlighter .keyword {
+  color: #7f0055 !important;
+}
+.syntaxhighlighter .preprocessor {
+  color: #646464 !important;
+}
+.syntaxhighlighter .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter .script {
+  font-weight: bold !important;
+  color: #7f0055 !important;
+  background-color: none !important;
+}
+.syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
+  color: red !important;
+}
+
+.syntaxhighlighter .xml .keyword {
+  color: #3f7f7f !important;
+  font-weight: normal !important;
+}
+.syntaxhighlighter .xml .color1, .syntaxhighlighter .xml .color1 a {
+  color: #7f007f !important;
+}
+.syntaxhighlighter .xml .string {
+  font-style: italic !important;
+  color: #2a00ff !important;
+}
+
+.clojure.syntaxhighlighter .invalid { 
+   background-color: #FAA !important;
+}
+
+.clojure.syntaxhighlighter .quoted {      
+    font-style: italic !important;
+}
+
+.syntaxhighlighter .clojure.variable,
+.syntaxhighlighter .clojure.symbol,
+.syntaxhighlighter .clojure.value
+{
+    color: #006060 !important;
+}
+
+.syntaxhighlighter .clojure.string {
+    color: #55B !important;
+}
+
+.syntaxhighlighter .clojure.functions {
+    color: black !important;
+}
+
+.syntaxhighlighter .clojure.color1 {
+    color: #666 !important;
+}
+
+.syntaxhighlighter .clojure.color3 {
+    color: #900 !important;
+}
+
+.syntaxhighlighter .clojure.constants {
+    color: #1A734D !important;
+}
+
+</style><style type="text/css">html{margin:0;padding:0;}h1{margin:0;padding:0;}h2{margin:0;padding:0;}h3{margin:0;padding:0;}h4{margin:0;padding:0;}a{color:#261A3B;}a:visited{color:#261A3B;}</style><style type="text/css">.header{margin-top:30px;}h1.project-name{font-size:34px;display:inline;}h2.project-version{font-size:18px;margin-top:0;display:inline;margin-left:10px;}.toc-link{font-size:12px;margin-left:10px;color:#252519;text-decoration:none;}.toc-link:hover{color:#5050A6;}.toc h1{font-size:34px;margin:0;}.docs-header{border-bottom:dotted #aaa 1px;padding-bottom:10px;margin-bottom:25px;}.toc h1{font-size:24px;}.toc{border-bottom:solid #bbb 1px;margin-bottom:40px;}.toc ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.toc li{list-style-type:none;padding-left:0;}.dependencies{}.dependencies table{font-size:16px;width:99.99%;border:none;margin-left:20px;}.dependencies td{padding-right:20px;;white-space:nowrap;}.dependencies .dotted{width:99%;}.dependencies .dotted hr{border-right:none;color:transparent;background-color:transparent;noshade:noshade;border-left:none;border-top:none;margin-bottom:-6px;height:0;border-bottom:dotted #bbb 1px;}.dependencies .dep-version{text-align:right;}.plugins ul{margin-left:20px;padding-left:0px;padding-top:0;margin-top:0;}.plugins li{list-style-type:none;padding-left:0;}.header p{margin-left:20px;}</style><style type="text/css">#floating-toc{position:fixed;top:10px;right:20px;height:20px;overflow:hidden;text-align:right;}#floating-toc li{list-style-type:none;margin:0;padding:0;}</style><style type="text/css">body{margin:0;padding:0;font-family:'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;;font-size:16px;color:#252519;background-color:#F5F5FF;}h1{font-size:20px;margin-top:0;}h2{font-size:18px;}h3{font-size:16px;}a.anchor{text-decoration:none;color:#252519;}a.anchor:hover{color:#5050A6;}table{border-spacing:0;border-bottom:solid #ddd 1px;;margin-bottom:10px;}code{display:inline;}p{margin-top:8px;}tr{margin:0px;padding:0px;}td.docs{width:410px;max-width:410px;vertical-align:top;margin:0px;padding-left:55px;padding-right:20px;border:none;background-color:#FFF;}td.docs pre{font-size:12px;overflow:hidden;}td.codes{vertical-align:top;font-size:10pt;overflow:hidden;background-color:#F5F5FF;width:55%;border-left:solid #E5E5EE 1px;padding-left:20px;border:none;margin:0px;}td.spacer{padding-bottom:40px;}pre code{display:block;padding:4px;}code{background-color:ghostWhite;border:solid #DEDEDE 1px;padding-left:3px;padding-right:3px;font-size:14px;}.syntaxhighlighter code{font-size:13px;}.footer{text-align:center;}</style><script type="text/javascript">/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
+</script><script type="text/javascript">//XRegExp 1.5.0 <xregexp.com> MIT License
+var XRegExp;if(XRegExp){throw Error("can't load XRegExp twice in the same frame")}(function(){XRegExp=function(w,r){var q=[],u=XRegExp.OUTSIDE_CLASS,x=0,p,s,v,t,y;if(XRegExp.isRegExp(w)){if(r!==undefined){throw TypeError("can't supply flags when constructing one RegExp from another")}return j(w)}if(g){throw Error("can't call the XRegExp constructor within token definition functions")}r=r||"";p={hasNamedCapture:false,captureNames:[],hasFlag:function(z){return r.indexOf(z)>-1},setFlag:function(z){r+=z}};while(x<w.length){s=o(w,x,u,p);if(s){q.push(s.output);x+=(s.match[0].length||1)}else{if(v=m.exec.call(i[u],w.slice(x))){q.push(v[0]);x+=v[0].length}else{t=w.charAt(x);if(t==="["){u=XRegExp.INSIDE_CLASS}else{if(t==="]"){u=XRegExp.OUTSIDE_CLASS}}q.push(t);x++}}}y=RegExp(q.join(""),m.replace.call(r,h,""));y._xregexp={source:w,captureNames:p.hasNamedCapture?p.captureNames:null};return y};XRegExp.version="1.5.0";XRegExp.INSIDE_CLASS=1;XRegExp.OUTSIDE_CLASS=2;var c=/\$(?:(\d\d?|[$&`'])|{([$\w]+)})/g,h=/[^gimy]+|([\s\S])(?=[\s\S]*\1)/g,n=/^(?:[?*+]|{\d+(?:,\d*)?})\??/,g=false,k=[],m={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},a=m.exec.call(/()??/,"")[1]===undefined,e=function(){var p=/^/g;m.test.call(p,"");return !p.lastIndex}(),f=function(){var p=/x/g;m.replace.call("x",p,"");return !p.lastIndex}(),b=RegExp.prototype.sticky!==undefined,i={};i[XRegExp.INSIDE_CLASS]=/^(?:\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S]))/;i[XRegExp.OUTSIDE_CLASS]=/^(?:\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??)/;XRegExp.addToken=function(s,r,q,p){k.push({pattern:j(s,"g"+(b?"y":"")),handler:r,scope:q||XRegExp.OUTSIDE_CLASS,trigger:p||null})};XRegExp.cache=function(r,p){var q=r+"/"+(p||"");return XRegExp.cache[q]||(XRegExp.cache[q]=XRegExp(r,p))};XRegExp.copyAsGlobal=function(p){return j(p,"g")};XRegExp.escape=function(p){return p.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")};XRegExp.execAt=function(s,r,t,q){r=j(r,"g"+((q&&b)?"y":""));r.lastIndex=t=t||0;var p=r.exec(s);if(q){return(p&&p.index===t)?p:null}else{return p}};XRegExp.freezeTokens=function(){XRegExp.addToken=function(){throw Error("can't run addToken after freezeTokens")}};XRegExp.isRegExp=function(p){return Object.prototype.toString.call(p)==="[object RegExp]"};XRegExp.iterate=function(u,p,v,s){var t=j(p,"g"),r=-1,q;while(q=t.exec(u)){v.call(s,q,++r,u,t);if(t.lastIndex===q.index){t.lastIndex++}}if(p.global){p.lastIndex=0}};XRegExp.matchChain=function(q,p){return function r(s,x){var v=p[x].regex?p[x]:{regex:p[x]},u=j(v.regex,"g"),w=[],t;for(t=0;t<s.length;t++){XRegExp.iterate(s[t],u,function(y){w.push(v.backref?(y[v.backref]||""):y[0])})}return((x===p.length-1)||!w.length)?w:r(w,x+1)}([q],0)};RegExp.prototype.apply=function(q,p){return this.exec(p[0])};RegExp.prototype.call=function(p,q){return this.exec(q)};RegExp.prototype.exec=function(t){var r=m.exec.apply(this,arguments),q,p;if(r){if(!a&&r.length>1&&l(r,"")>-1){p=RegExp(this.source,m.replace.call(d(this),"g",""));m.replace.call(t.slice(r.index),p,function(){for(var u=1;u<arguments.length-2;u++){if(arguments[u]===undefined){r[u]=undefined}}})}if(this._xregexp&&this._xregexp.captureNames){for(var s=1;s<r.length;s++){q=this._xregexp.captureNames[s-1];if(q){r[q]=r[s]}}}if(!e&&this.global&&!r[0].length&&(this.lastIndex>r.index)){this.lastIndex--}}return r};if(!e){RegExp.prototype.test=function(q){var p=m.exec.call(this,q);if(p&&this.global&&!p[0].length&&(this.lastIndex>p.index)){this.lastIndex--}return !!p}}String.prototype.match=function(q){if(!XRegExp.isRegExp(q)){q=RegExp(q)}if(q.global){var p=m.match.apply(this,arguments);q.lastIndex=0;return p}return q.exec(this)};String.prototype.replace=function(r,s){var t=XRegExp.isRegExp(r),q,p,u;if(t&&typeof s.valueOf()==="string"&&s.indexOf("${")===-1&&f){return m.replace.apply(this,arguments)}if(!t){r=r+""}else{if(r._xregexp){q=r._xregexp.captureNames}}if(typeof s==="function"){p=m.replace.call(this,r,function(){if(q){arguments[0]=new String(arguments[0]);for(var v=0;v<q.length;v++){if(q[v]){arguments[0][q[v]]=arguments[v+1]}}}if(t&&r.global){r.lastIndex=arguments[arguments.length-2]+arguments[0].length}return s.apply(null,arguments)})}else{u=this+"";p=m.replace.call(u,r,function(){var v=arguments;return m.replace.call(s,c,function(x,w,A){if(w){switch(w){case"$":return"$";case"&":return v[0];case"`":return v[v.length-1].slice(0,v[v.length-2]);case"'":return v[v.length-1].slice(v[v.length-2]+v[0].length);default:var y="";w=+w;if(!w){return x}while(w>v.length-3){y=String.prototype.slice.call(w,-1)+y;w=Math.floor(w/10)}return(w?v[w]||"":"$")+y}}else{var z=+A;if(z<=v.length-3){return v[z]}z=q?l(q,A):-1;return z>-1?v[z+1]:x}})})}if(t&&r.global){r.lastIndex=0}return p};String.prototype.split=function(u,p){if(!XRegExp.isRegExp(u)){return m.split.apply(this,arguments)}var w=this+"",r=[],v=0,t,q;if(p===undefined||+p<0){p=Infinity}else{p=Math.floor(+p);if(!p){return[]}}u=XRegExp.copyAsGlobal(u);while(t=u.exec(w)){if(u.lastIndex>v){r.push(w.slice(v,t.index));if(t.length>1&&t.index<w.length){Array.prototype.push.apply(r,t.slice(1))}q=t[0].length;v=u.lastIndex;if(r.length>=p){break}}if(u.lastIndex===t.index){u.lastIndex++}}if(v===w.length){if(!m.test.call(u,"")||q){r.push("")}}else{r.push(w.slice(v))}return r.length>p?r.slice(0,p):r};function j(r,q){if(!XRegExp.isRegExp(r)){throw TypeError("type RegExp expected")}var p=r._xregexp;r=XRegExp(r.source,d(r)+(q||""));if(p){r._xregexp={source:p.source,captureNames:p.captureNames?p.captureNames.slice(0):null}}return r}function d(p){return(p.global?"g":"")+(p.ignoreCase?"i":"")+(p.multiline?"m":"")+(p.extended?"x":"")+(p.sticky?"y":"")}function o(v,u,w,p){var r=k.length,y,s,x;g=true;try{while(r--){x=k[r];if((w&x.scope)&&(!x.trigger||x.trigger.call(p))){x.pattern.lastIndex=u;s=x.pattern.exec(v);if(s&&s.index===u){y={output:x.handler.call(p,s,w),match:s};break}}}}catch(q){throw q}finally{g=false}return y}function l(s,q,r){if(Array.prototype.indexOf){return s.indexOf(q,r)}for(var p=r||0;p<s.length;p++){if(s[p]===q){return p}}return -1}XRegExp.addToken(/\(\?#[^)]*\)/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"});XRegExp.addToken(/\((?!\?)/,function(){this.captureNames.push(null);return"("});XRegExp.addToken(/\(\?<([$\w]+)>/,function(p){this.captureNames.push(p[1]);this.hasNamedCapture=true;return"("});XRegExp.addToken(/\\k<([\w$]+)>/,function(q){var p=l(this.captureNames,q[1]);return p>-1?"\\"+(p+1)+(isNaN(q.input.charAt(q.index+q[0].length))?"":"(?:)"):q[0]});XRegExp.addToken(/\[\^?]/,function(p){return p[0]==="[]"?"\\b\\B":"[\\s\\S]"});XRegExp.addToken(/^\(\?([imsx]+)\)/,function(p){this.setFlag(p[1]);return""});XRegExp.addToken(/(?:\s+|#.*)+/,function(p){return m.test.call(n,p.input.slice(p.index+p[0].length))?"":"(?:)"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("x")});XRegExp.addToken(/\./,function(){return"[\\s\\S]"},XRegExp.OUTSIDE_CLASS,function(){return this.hasFlag("s")})})();
+</script><script type="text/javascript">/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+//
+// Begin anonymous function. This is used to contain local scope variables without polutting global scope.
+//
+var SyntaxHighlighter = function() { 
+
+// CommonJS
+if (typeof(require) != 'undefined' && typeof(XRegExp) == 'undefined')
+{
+	XRegExp = require('XRegExp').XRegExp;
+}
+
+// Shortcut object which will be assigned to the SyntaxHighlighter variable.
+// This is a shorthand for local reference in order to avoid long namespace 
+// references to SyntaxHighlighter.whatever...
+var sh = {
+	defaults : {
+		/** Additional CSS class names to be added to highlighter elements. */
+		'class-name' : '',
+		
+		/** First line number. */
+		'first-line' : 1,
+		
+		/**
+		 * Pads line numbers. Possible values are:
+		 *
+		 *   false - don't pad line numbers.
+		 *   true  - automaticaly pad numbers with minimum required number of leading zeroes.
+		 *   [int] - length up to which pad line numbers.
+		 */
+		'pad-line-numbers' : false,
+		
+		/** Lines to highlight. */
+		'highlight' : null,
+		
+		/** Title to be displayed above the code block. */
+		'title' : null,
+		
+		/** Enables or disables smart tabs. */
+		'smart-tabs' : true,
+		
+		/** Gets or sets tab size. */
+		'tab-size' : 4,
+		
+		/** Enables or disables gutter. */
+		'gutter' : true,
+		
+		/** Enables or disables toolbar. */
+		'toolbar' : true,
+		
+		/** Enables quick code copy and paste from double click. */
+		'quick-code' : true,
+		
+		/** Forces code view to be collapsed. */
+		'collapse' : false,
+		
+		/** Enables or disables automatic links. */
+		'auto-links' : true,
+		
+		/** Gets or sets light mode. Equavalent to turning off gutter and toolbar. */
+		'light' : false,
+		
+		'html-script' : false
+	},
+	
+	config : {
+		space : '&nbsp;',
+		
+		/** Enables use of <SCRIPT type="syntaxhighlighter" /> tags. */
+		useScriptTags : true,
+		
+		/** Blogger mode flag. */
+		bloggerMode : false,
+		
+		stripBrs : false,
+		
+		/** Name of the tag that SyntaxHighlighter will automatically look for. */
+		tagName : 'pre',
+		
+		strings : {
+			expandSource : 'expand source',
+			help : '?',
+			alert: 'SyntaxHighlighter\n\n',
+			noBrush : 'Can\'t find brush for: ',
+			brushNotHtmlScript : 'Brush wasn\'t configured for html-script option: ',
+			
+			// this is populated by the build script
+			aboutDialog : '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>About SyntaxHighlighter</title></head><body style="font-family:Geneva,Arial,Helvetica,sans-serif;background-color:#fff;color:#000;font-size:1em;text-align:center;"><div style="text-align:center;margin-top:1.5em;"><div style="font-size:xx-large;">SyntaxHighlighter</div><div style="font-size:.75em;margin-bottom:3em;"><div>version 3.0.83 (July 02 2010)</div><div><a href="http://alexgorbatchev.com/SyntaxHighlighter" target="_blank" style="color:#005896">http://alexgorbatchev.com/SyntaxHighlighter</a></div><div>JavaScript code syntax highlighter.</div><div>Copyright 2004-2010 Alex Gorbatchev.</div></div><div>If you like this script, please <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2930402" style="color:#005896">donate</a> to <br/>keep development active!</div></div></body></html>'
+		}
+	},
+	
+	/** Internal 'global' variables. */
+	vars : {
+		discoveredBrushes : null,
+		highlighters : {}
+	},
+	
+	/** This object is populated by user included external brush files. */
+	brushes : {},
+
+	/** Common regular expressions. */
+	regexLib : {
+		multiLineCComments			: /\/\*[\s\S]*?\*\//gm,
+		singleLineCComments			: /\/\/.*$/gm,
+		singleLinePerlComments		: /#.*$/gm,
+		doubleQuotedString			: /"([^\\"\n]|\\.)*"/g,
+		singleQuotedString			: /'([^\\'\n]|\\.)*'/g,
+		multiLineDoubleQuotedString	: new XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
+		multiLineSingleQuotedString	: new XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
+		xmlComments					: /(&lt;|<)!--[\s\S]*?--(&gt;|>)/gm,
+		url							: /\w+:\/\/[\w-.\/?%&=:@;]*/g,
+		
+		/** <?= ?> tags. */
+		phpScriptTags 				: { left: /(&lt;|<)\?=?/g, right: /\?(&gt;|>)/g },
+		
+		/** <%= %> tags. */
+		aspScriptTags				: { left: /(&lt;|<)%=?/g, right: /%(&gt;|>)/g },
+		
+		scriptScriptTags			: { left: /(&lt;|<)\s*script.*?(&gt;|>)/gi, right: /(&lt;|<)\/\s*script\s*(&gt;|>)/gi }
+	},
+
+	toolbar: {
+		/**
+		 * Generates HTML markup for the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @return {String} Returns HTML markup.
+		 */
+		getHtml: function(highlighter)
+		{
+			var html = '<div class="toolbar">',
+				items = sh.toolbar.items,
+				list = items.list
+				;
+			
+			function defaultGetHtml(highlighter, name)
+			{
+				return sh.toolbar.getButtonHtml(highlighter, name, sh.config.strings[name]);
+			};
+			
+			for (var i = 0; i < list.length; i++)
+				html += (items[list[i]].getHtml || defaultGetHtml)(highlighter, list[i]);
+			
+			html += '</div>';
+			
+			return html;
+		},
+		
+		/**
+		 * Generates HTML markup for a regular button in the toolbar.
+		 * @param {Highlighter} highlighter Highlighter instance.
+		 * @param {String} commandName		Command name that would be executed.
+		 * @param {String} label			Label text to display.
+		 * @return {String}					Returns HTML markup.
+		 */
+		getButtonHtml: function(highlighter, commandName, label)
+		{
+			return '<span><a href="#" class="toolbar_item'
+				+ ' command_' + commandName
+				+ ' ' + commandName
+				+ '">' + label + '</a></span>'
+				;
+		},
+		
+		/**
+		 * Event handler for a toolbar anchor.
+		 */
+		handler: function(e)
+		{
+			var target = e.target,
+				className = target.className || ''
+				;
+
+			function getValue(name)
+			{
+				var r = new RegExp(name + '_(\\w+)'),
+					match = r.exec(className)
+					;
+
+				return match ? match[1] : null;
+			};
+			
+			var highlighter = getHighlighterById(findParentElement(target, '.syntaxhighlighter').id),
+				commandName = getValue('command')
+				;
+			
+			// execute the toolbar command
+			if (highlighter && commandName)
+				sh.toolbar.items[commandName].execute(highlighter);
+
+			// disable default A click behaviour
+			e.preventDefault();
+		},
+		
+		/** Collection of toolbar items. */
+		items : {
+			// Ordered lis of items in the toolbar. Can't expect `for (var n in items)` to be consistent.
+			list: ['expandSource', 'help'],
+
+			expandSource: {
+				getHtml: function(highlighter)
+				{
+					if (highlighter.getParam('collapse') != true)
+						return '';
+						
+					var title = highlighter.getParam('title');
+					return sh.toolbar.getButtonHtml(highlighter, 'expandSource', title ? title : sh.config.strings.expandSource);
+				},
+			
+				execute: function(highlighter)
+				{
+					var div = getHighlighterDivById(highlighter.id);
+					removeClass(div, 'collapsed');
+				}
+			},
+
+			/** Command to display the about dialog window. */
+			help: {
+				execute: function(highlighter)
+				{	
+					var wnd = popup('', '_blank', 500, 250, 'scrollbars=0'),
+						doc = wnd.document
+						;
+					
+					doc.write(sh.config.strings.aboutDialog);
+					doc.close();
+					wnd.focus();
+				}
+			}
+		}
+	},
+
+	/**
+	 * Finds all elements on the page which should be processes by SyntaxHighlighter.
+	 *
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are returned which qualify.
+	 *
+	 * @return {Array}	Returns list of <code>{ target: DOMElement, params: Object }</code> objects.
+	 */
+	findElements: function(globalParams, element)
+	{
+		var elements = element ? [element] : toArray(document.getElementsByTagName(sh.config.tagName)), 
+			conf = sh.config,
+			result = []
+			;
+
+		// support for <SCRIPT TYPE="syntaxhighlighter" /> feature
+		if (conf.useScriptTags)
+			elements = elements.concat(getSyntaxHighlighterScriptTags());
+
+		if (elements.length === 0) 
+			return result;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var item = {
+				target: elements[i], 
+				// local params take precedence over globals
+				params: merge(globalParams, parseParams(elements[i].className))
+			};
+
+			if (item.params['brush'] == null)
+				continue;
+				
+			result.push(item);
+		}
+		
+		return result;
+	},
+
+	/**
+	 * Shorthand to highlight all elements on the page that are marked as 
+	 * SyntaxHighlighter source code.
+	 * 
+	 * @param {Object} globalParams		Optional parameters which override element's 
+	 * 									parameters. Only used if element is specified.
+	 * 
+	 * @param {Object} element	Optional element to highlight. If none is
+	 * 							provided, all elements in the current document 
+	 * 							are highlighted.
+	 */ 
+	highlight: function(globalParams, element)
+	{
+		var elements = this.findElements(globalParams, element),
+			propertyName = 'innerHTML', 
+			highlighter = null,
+			conf = sh.config
+			;
+
+		if (elements.length === 0) 
+			return;
+	
+		for (var i = 0; i < elements.length; i++) 
+		{
+			var element = elements[i],
+				target = element.target,
+				params = element.params,
+				brushName = params.brush,
+				code
+				;
+
+			if (brushName == null)
+				continue;
+
+			// Instantiate a brush
+			if (params['html-script'] == 'true' || sh.defaults['html-script'] == true) 
+			{
+				highlighter = new sh.HtmlScript(brushName);
+				brushName = 'htmlscript';
+			}
+			else
+			{
+				var brush = findBrush(brushName);
+				
+				if (brush)
+					highlighter = new brush();
+				else
+					continue;
+			}
+			
+			code = target[propertyName];
+			
+			// remove CDATA from <SCRIPT/> tags if it's present
+			if (conf.useScriptTags)
+				code = stripCData(code);
+				
+			// Inject title if the attribute is present
+			if ((target.title || '') != '')
+				params.title = target.title;
+				
+			params['brush'] = brushName;
+			highlighter.init(params);
+			element = highlighter.getDiv(code);
+			
+			// carry over ID
+			if ((target.id || '') != '')
+				element.id = target.id;
+			
+			target.parentNode.replaceChild(element, target);
+		}
+	},
+
+	/**
+	 * Main entry point for the SyntaxHighlighter.
+	 * @param {Object} params Optional params to apply to all highlighted elements.
+	 */
+	all: function(params)
+	{
+		attachEvent(
+			window,
+			'load',
+			function() { sh.highlight(params); }
+		);
+	}
+}; // end of sh
+
+sh['all']			= sh.all;
+sh['highlight']		= sh.highlight;
+
+/**
+ * Checks if target DOM elements has specified CSS class.
+ * @param {DOMElement} target Target DOM element to check.
+ * @param {String} className Name of the CSS class to check for.
+ * @return {Boolean} Returns true if class name is present, false otherwise.
+ */
+function hasClass(target, className)
+{
+	return target.className.indexOf(className) != -1;
+};
+
+/**
+ * Adds CSS class name to the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className New CSS class to add.
+ */
+function addClass(target, className)
+{
+	if (!hasClass(target, className))
+		target.className += ' ' + className;
+};
+
+/**
+ * Removes CSS class name from the target DOM element.
+ * @param {DOMElement} target Target DOM element.
+ * @param {String} className CSS class to remove.
+ */
+function removeClass(target, className)
+{
+	target.className = target.className.replace(className, '');
+};
+
+/**
+ * Converts the source to array object. Mostly used for function arguments and 
+ * lists returned by getElementsByTagName() which aren't Array objects.
+ * @param {List} source Source list.
+ * @return {Array} Returns array.
+ */
+function toArray(source)
+{
+	var result = [];
+	
+	for (var i = 0; i < source.length; i++) 
+		result.push(source[i]);
+		
+	return result;
+};
+
+/**
+ * Splits block of text into lines.
+ * @param {String} block Block of text.
+ * @return {Array} Returns array of lines.
+ */
+function splitLines(block)
+{
+	return block.split('\n');
+}
+
+/**
+ * Generates HTML ID for the highlighter.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {String} Returns HTML ID.
+ */
+function getHighlighterId(id)
+{
+	var prefix = 'highlighter_';
+	return id.indexOf(prefix) == 0 ? id : prefix + id;
+};
+
+/**
+ * Finds Highlighter instance by ID.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Highlighter} Returns instance of the highlighter.
+ */
+function getHighlighterById(id)
+{
+	return sh.vars.highlighters[getHighlighterId(id)];
+};
+
+/**
+ * Finds highlighter's DIV container.
+ * @param {String} highlighterId Highlighter ID.
+ * @return {Element} Returns highlighter's DIV element.
+ */
+function getHighlighterDivById(id)
+{
+	return document.getElementById(getHighlighterId(id));
+};
+
+/**
+ * Stores highlighter so that getHighlighterById() can do its thing. Each
+ * highlighter must call this method to preserve itself.
+ * @param {Highilghter} highlighter Highlighter instance.
+ */
+function storeHighlighter(highlighter)
+{
+	sh.vars.highlighters[getHighlighterId(highlighter.id)] = highlighter;
+};
+
+/**
+ * Looks for a child or parent node which has specified classname.
+ * Equivalent to jQuery's $(container).find(".className")
+ * @param {Element} target Target element.
+ * @param {String} search Class name or node name to look for.
+ * @param {Boolean} reverse If set to true, will go up the node tree instead of down.
+ * @return {Element} Returns found child or parent element on null.
+ */
+function findElement(target, search, reverse /* optional */)
+{
+	if (target == null)
+		return null;
+		
+	var nodes			= reverse != true ? target.childNodes : [ target.parentNode ],
+		propertyToFind	= { '#' : 'id', '.' : 'className' }[search.substr(0, 1)] || 'nodeName',
+		expectedValue,
+		found
+		;
+
+	expectedValue = propertyToFind != 'nodeName'
+		? search.substr(1)
+		: search.toUpperCase()
+		;
+		
+	// main return of the found node
+	if ((target[propertyToFind] || '').indexOf(expectedValue) != -1)
+		return target;
+	
+	for (var i = 0; nodes && i < nodes.length && found == null; i++)
+		found = findElement(nodes[i], search, reverse);
+	
+	return found;
+};
+
+/**
+ * Looks for a parent node which has specified classname.
+ * This is an alias to <code>findElement(container, className, true)</code>.
+ * @param {Element} target Target element.
+ * @param {String} className Class name to look for.
+ * @return {Element} Returns found parent element on null.
+ */
+function findParentElement(target, className)
+{
+	return findElement(target, className, true);
+};
+
+/**
+ * Finds an index of element in the array.
+ * @ignore
+ * @param {Object} searchElement
+ * @param {Number} fromIndex
+ * @return {Number} Returns index of element if found; -1 otherwise.
+ */
+function indexOf(array, searchElement, fromIndex)
+{
+	fromIndex = Math.max(fromIndex || 0, 0);
+
+	for (var i = fromIndex; i < array.length; i++)
+		if(array[i] == searchElement)
+			return i;
+	
+	return -1;
+};
+
+/**
+ * Generates a unique element ID.
+ */
+function guid(prefix)
+{
+	return (prefix || '') + Math.round(Math.random() * 1000000).toString();
+};
+
+/**
+ * Merges two objects. Values from obj2 override values in obj1.
+ * Function is NOT recursive and works only for one dimensional objects.
+ * @param {Object} obj1 First object.
+ * @param {Object} obj2 Second object.
+ * @return {Object} Returns combination of both objects.
+ */
+function merge(obj1, obj2)
+{
+	var result = {}, name;
+
+	for (name in obj1) 
+		result[name] = obj1[name];
+	
+	for (name in obj2) 
+		result[name] = obj2[name];
+		
+	return result;
+};
+
+/**
+ * Attempts to convert string to boolean.
+ * @param {String} value Input string.
+ * @return {Boolean} Returns true if input was "true", false if input was "false" and value otherwise.
+ */
+function toBoolean(value)
+{
+	var result = { "true" : true, "false" : false }[value];
+	return result == null ? value : result;
+};
+
+/**
+ * Opens up a centered popup window.
+ * @param {String} url		URL to open in the window.
+ * @param {String} name		Popup name.
+ * @param {int} width		Popup width.
+ * @param {int} height		Popup height.
+ * @param {String} options	window.open() options.
+ * @return {Window}			Returns window instance.
+ */
+function popup(url, name, width, height, options)
+{
+	var x = (screen.width - width) / 2,
+		y = (screen.height - height) / 2
+		;
+		
+	options +=	', left=' + x + 
+				', top=' + y +
+				', width=' + width +
+				', height=' + height
+		;
+	options = options.replace(/^,/, '');
+
+	var win = window.open(url, name, options);
+	win.focus();
+	return win;
+};
+
+/**
+ * Adds event handler to the target object.
+ * @param {Object} obj		Target object.
+ * @param {String} type		Name of the event.
+ * @param {Function} func	Handling function.
+ */
+function attachEvent(obj, type, func, scope)
+{
+	function handler(e)
+	{
+		e = e || window.event;
+		
+		if (!e.target)
+		{
+			e.target = e.srcElement;
+			e.preventDefault = function()
+			{
+				this.returnValue = false;
+			};
+		}
+			
+		func.call(scope || window, e);
+	};
+	
+	if (obj.attachEvent) 
+	{
+		obj.attachEvent('on' + type, handler);
+	}
+	else 
+	{
+		obj.addEventListener(type, handler, false);
+	}
+};
+
+/**
+ * Displays an alert.
+ * @param {String} str String to display.
+ */
+function alert(str)
+{
+	window.alert(sh.config.strings.alert + str);
+};
+
+/**
+ * Finds a brush by its alias.
+ *
+ * @param {String} alias		Brush alias.
+ * @param {Boolean} showAlert	Suppresses the alert if false.
+ * @return {Brush}				Returns bursh constructor if found, null otherwise.
+ */
+function findBrush(alias, showAlert)
+{
+	var brushes = sh.vars.discoveredBrushes,
+		result = null
+		;
+	
+	if (brushes == null) 
+	{
+		brushes = {};
+		
+		// Find all brushes
+		for (var brush in sh.brushes) 
+		{
+			var info = sh.brushes[brush],
+				aliases = info.aliases
+				;
+			
+			if (aliases == null) 
+				continue;
+			
+			// keep the brush name
+			info.brushName = brush.toLowerCase();
+			
+			for (var i = 0; i < aliases.length; i++) 
+				brushes[aliases[i]] = brush;
+		}
+		
+		sh.vars.discoveredBrushes = brushes;
+	}
+	
+	result = sh.brushes[brushes[alias]];
+
+	if (result == null && showAlert != false)
+		alert(sh.config.strings.noBrush + alias);
+	
+	return result;
+};
+
+/**
+ * Executes a callback on each line and replaces each line with result from the callback.
+ * @param {Object} str			Input string.
+ * @param {Object} callback		Callback function taking one string argument and returning a string.
+ */
+function eachLine(str, callback)
+{
+	var lines = splitLines(str);
+	
+	for (var i = 0; i < lines.length; i++)
+		lines[i] = callback(lines[i], i);
+		
+	return lines.join('\n');
+};
+
+/**
+ * This is a special trim which only removes first and last empty lines
+ * and doesn't affect valid leading space on the first line.
+ * 
+ * @param {String} str   Input string
+ * @return {String}      Returns string without empty first and last lines.
+ */
+function trimFirstAndLastLines(str)
+{
+	return str.replace(/^[ ]*[\n]+|[\n]*[ ]*$/g, '');
+};
+
+/**
+ * Parses key/value pairs into hash object.
+ * 
+ * Understands the following formats:
+ * - name: word;
+ * - name: [word, word];
+ * - name: "string";
+ * - name: 'string';
+ * 
+ * For example:
+ *   name1: value; name2: [value, value]; name3: 'value'
+ *   
+ * @param {String} str    Input string.
+ * @return {Object}       Returns deserialized object.
+ */
+function parseParams(str)
+{
+	var match, 
+		result = {},
+		arrayRegex = new XRegExp("^\\[(?<values>(.*?))\\]$"),
+		regex = new XRegExp(
+			"(?<name>[\\w-]+)" +
+			"\\s*:\\s*" +
+			"(?<value>" +
+				"[\\w-%#]+|" +		// word
+				"\\[.*?\\]|" +		// [] array
+				'".*?"|' +			// "" string
+				"'.*?'" +			// '' string
+			")\\s*;?",
+			"g"
+		)
+		;
+
+	while ((match = regex.exec(str)) != null) 
+	{
+		var value = match.value
+			.replace(/^['"]|['"]$/g, '') // strip quotes from end of strings
+			;
+		
+		// try to parse array value
+		if (value != null && arrayRegex.test(value))
+		{
+			var m = arrayRegex.exec(value);
+			value = m.values.length > 0 ? m.values.split(/\s*,\s*/) : [];
+		}
+		
+		result[match.name] = value;
+	}
+	
+	return result;
+};
+
+/**
+ * Wraps each line of the string into <code/> tag with given style applied to it.
+ * 
+ * @param {String} str   Input string.
+ * @param {String} css   Style name to apply to the string.
+ * @return {String}      Returns input string with each line surrounded by <span/> tag.
+ */
+function wrapLinesWithCode(str, css)
+{
+	if (str == null || str.length == 0 || str == '\n') 
+		return str;
+
+	str = str.replace(/</g, '&lt;');
+
+	// Replace two or more sequential spaces with &nbsp; leaving last space untouched.
+	str = str.replace(/ {2,}/g, function(m)
+	{
+		var spaces = '';
+		
+		for (var i = 0; i < m.length - 1; i++)
+			spaces += sh.config.space;
+		
+		return spaces + ' ';
+	});
+
+	// Split each line and apply <span class="...">...</span> to them so that
+	// leading spaces aren't included.
+	if (css != null) 
+		str = eachLine(str, function(line)
+		{
+			if (line.length == 0) 
+				return '';
+			
+			var spaces = '';
+			
+			line = line.replace(/^(&nbsp;| )+/, function(s)
+			{
+				spaces = s;
+				return '';
+			});
+			
+			if (line.length == 0) 
+				return spaces;
+			
+			return spaces + '<code class="' + css + '">' + line + '</code>';
+		});
+
+	return str;
+};
+
+/**
+ * Pads number with zeros until it's length is the same as given length.
+ * 
+ * @param {Number} number	Number to pad.
+ * @param {Number} length	Max string length with.
+ * @return {String}			Returns a string padded with proper amount of '0'.
+ */
+function padNumber(number, length)
+{
+	var result = number.toString();
+	
+	while (result.length < length)
+		result = '0' + result;
+	
+	return result;
+};
+
+/**
+ * Replaces tabs with spaces.
+ * 
+ * @param {String} code		Source code.
+ * @param {Number} tabSize	Size of the tab.
+ * @return {String}			Returns code with all tabs replaces by spaces.
+ */
+function processTabs(code, tabSize)
+{
+	var tab = '';
+	
+	for (var i = 0; i < tabSize; i++)
+		tab += ' ';
+
+	return code.replace(/\t/g, tab);
+};
+
+/**
+ * Replaces tabs with smart spaces.
+ * 
+ * @param {String} code    Code to fix the tabs in.
+ * @param {Number} tabSize Number of spaces in a column.
+ * @return {String}        Returns code with all tabs replaces with roper amount of spaces.
+ */
+function processSmartTabs(code, tabSize)
+{
+	var lines = splitLines(code),
+		tab = '\t',
+		spaces = ''
+		;
+	
+	// Create a string with 1000 spaces to copy spaces from... 
+	// It's assumed that there would be no indentation longer than that.
+	for (var i = 0; i < 50; i++) 
+		spaces += '                    '; // 20 spaces * 50
+			
+	// This function inserts specified amount of spaces in the string
+	// where a tab is while removing that given tab.
+	function insertSpaces(line, pos, count)
+	{
+		return line.substr(0, pos)
+			+ spaces.substr(0, count)
+			+ line.substr(pos + 1, line.length) // pos + 1 will get rid of the tab
+			;
+	};
+
+	// Go through all the lines and do the 'smart tabs' magic.
+	code = eachLine(code, function(line)
+	{
+		if (line.indexOf(tab) == -1) 
+			return line;
+		
+		var pos = 0;
+		
+		while ((pos = line.indexOf(tab)) != -1) 
+		{
+			// This is pretty much all there is to the 'smart tabs' logic.
+			// Based on the position within the line and size of a tab,
+			// calculate the amount of spaces we need to insert.
+			var spaces = tabSize - pos % tabSize;
+			line = insertSpaces(line, pos, spaces);
+		}
+		
+		return line;
+	});
+	
+	return code;
+};
+
+/**
+ * Performs various string fixes based on configuration.
+ */
+function fixInputString(str)
+{
+	var br = /<br\s*\/?>|&lt;br\s*\/?&gt;/gi;
+	
+	if (sh.config.bloggerMode == true)
+		str = str.replace(br, '\n');
+
+	if (sh.config.stripBrs == true)
+		str = str.replace(br, '');
+		
+	return str;
+};
+
+/**
+ * Removes all white space at the begining and end of a string.
+ * 
+ * @param {String} str   String to trim.
+ * @return {String}      Returns string without leading and following white space characters.
+ */
+function trim(str)
+{
+	return str.replace(/^\s+|\s+$/g, '');
+};
+
+/**
+ * Unindents a block of text by the lowest common indent amount.
+ * @param {String} str   Text to unindent.
+ * @return {String}      Returns unindented text block.
+ */
+function unindent(str)
+{
+	var lines = splitLines(fixInputString(str)),
+		indents = new Array(),
+		regex = /^\s*/,
+		min = 1000
+		;
+	
+	// go through every line and check for common number of indents
+	for (var i = 0; i < lines.length && min > 0; i++) 
+	{
+		var line = lines[i];
+		
+		if (trim(line).length == 0) 
+			continue;
+		
+		var matches = regex.exec(line);
+		
+		// In the event that just one line doesn't have leading white space
+		// we can't unindent anything, so bail completely.
+		if (matches == null) 
+			return str;
+			
+		min = Math.min(matches[0].length, min);
+	}
+	
+	// trim minimum common number of white space from the begining of every line
+	if (min > 0) 
+		for (var i = 0; i < lines.length; i++) 
+			lines[i] = lines[i].substr(min);
+	
+	return lines.join('\n');
+};
+
+/**
+ * Callback method for Array.sort() which sorts matches by
+ * index position and then by length.
+ * 
+ * @param {Match} m1	Left object.
+ * @param {Match} m2    Right object.
+ * @return {Number}     Returns -1, 0 or -1 as a comparison result.
+ */
+function matchesSortCallback(m1, m2)
+{
+	// sort matches by index first
+	if(m1.index < m2.index)
+		return -1;
+	else if(m1.index > m2.index)
+		return 1;
+	else
+	{
+		// if index is the same, sort by length
+		if(m1.length < m2.length)
+			return -1;
+		else if(m1.length > m2.length)
+			return 1;
+	}
+	
+	return 0;
+};
+
+/**
+ * Executes given regular expression on provided code and returns all
+ * matches that are found.
+ * 
+ * @param {String} code    Code to execute regular expression on.
+ * @param {Object} regex   Regular expression item info from <code>regexList</code> collection.
+ * @return {Array}         Returns a list of Match objects.
+ */ 
+function getMatches(code, regexInfo)
+{
+	function defaultAdd(match, regexInfo)
+	{
+		return match[0];
+	};
+	
+	var index = 0,
+		match = null,
+		matches = [],
+		func = regexInfo.func ? regexInfo.func : defaultAdd
+		;
+	
+	while((match = regexInfo.regex.exec(code)) != null)
+	{
+		var resultMatch = func(match, regexInfo);
+		
+		if (typeof(resultMatch) == 'string')
+			resultMatch = [new sh.Match(resultMatch, match.index, regexInfo.css)];
+
+		matches = matches.concat(resultMatch);
+	}
+	
+	return matches;
+};
+
+/**
+ * Turns all URLs in the code into <a/> tags.
+ * @param {String} code Input code.
+ * @return {String} Returns code with </a> tags.
+ */
+function processUrls(code)
+{
+	var gt = /(.*)((&gt;|&lt;).*)/;
+	
+	return code.replace(sh.regexLib.url, function(m)
+	{
+		var suffix = '',
+			match = null
+			;
+		
+		// We include &lt; and &gt; in the URL for the common cases like <http://google.com>
+		// The problem is that they get transformed into &lt;http://google.com&gt;
+		// Where as &gt; easily looks like part of the URL string.
+	
+		if (match = gt.exec(m))
+		{
+			m = match[1];
+			suffix = match[2];
+		}
+		
+		return '<a href="' + m + '">' + m + '</a>' + suffix;
+	});
+};
+
+/**
+ * Finds all <SCRIPT TYPE="syntaxhighlighter" /> elementss.
+ * @return {Array} Returns array of all found SyntaxHighlighter tags.
+ */
+function getSyntaxHighlighterScriptTags()
+{
+	var tags = document.getElementsByTagName('script'),
+		result = []
+		;
+	
+	for (var i = 0; i < tags.length; i++)
+		if (tags[i].type == 'syntaxhighlighter')
+			result.push(tags[i]);
+			
+	return result;
+};
+
+/**
+ * Strips <![CDATA[]]> from <SCRIPT /> content because it should be used
+ * there in most cases for XHTML compliance.
+ * @param {String} original	Input code.
+ * @return {String} Returns code without leading <![CDATA[]]> tags.
+ */
+function stripCData(original)
+{
+	var left = '<![CDATA[',
+		right = ']]>',
+		// for some reason IE inserts some leading blanks here
+		copy = trim(original),
+		changed = false,
+		leftLength = left.length,
+		rightLength = right.length
+		;
+	
+	if (copy.indexOf(left) == 0)
+	{
+		copy = copy.substring(leftLength);
+		changed = true;
+	}
+	
+	var copyLength = copy.length;
+	
+	if (copy.indexOf(right) == copyLength - rightLength)
+	{
+		copy = copy.substring(0, copyLength - rightLength);
+		changed = true;
+	}
+	
+	return changed ? copy : original;
+};
+
+
+/**
+ * Quick code mouse double click handler.
+ */
+function quickCodeHandler(e)
+{
+	var target = e.target,
+		highlighterDiv = findParentElement(target, '.syntaxhighlighter'),
+		container = findParentElement(target, '.container'),
+		textarea = document.createElement('textarea'),
+		highlighter
+		;
+
+	if (!container || !highlighterDiv || findElement(container, 'textarea'))
+		return;
+
+	highlighter = getHighlighterById(highlighterDiv.id);
+	
+	// add source class name
+	addClass(highlighterDiv, 'source');
+
+	// Have to go over each line and grab it's text, can't just do it on the
+	// container because Firefox loses all \n where as Webkit doesn't.
+	var lines = container.childNodes,
+		code = []
+		;
+	
+	for (var i = 0; i < lines.length; i++)
+		code.push(lines[i].innerText || lines[i].textContent);
+	
+	// using \r instead of \r or \r\n makes this work equally well on IE, FF and Webkit
+	code = code.join('\r');
+	
+	// inject <textarea/> tag
+	textarea.appendChild(document.createTextNode(code));
+	container.appendChild(textarea);
+	
+	// preselect all text
+	textarea.focus();
+	textarea.select();
+	
+	// set up handler for lost focus
+	attachEvent(textarea, 'blur', function(e)
+	{
+		textarea.parentNode.removeChild(textarea);
+		removeClass(highlighterDiv, 'source');
+	});
+};
+
+/**
+ * Match object.
+ */
+sh.Match = function(value, index, css)
+{
+	this.value = value;
+	this.index = index;
+	this.length = value.length;
+	this.css = css;
+	this.brushName = null;
+};
+
+sh.Match.prototype.toString = function()
+{
+	return this.value;
+};
+
+/**
+ * Simulates HTML code with a scripting language embedded.
+ * 
+ * @param {String} scriptBrushName Brush name of the scripting language.
+ */
+sh.HtmlScript = function(scriptBrushName)
+{
+	var brushClass = findBrush(scriptBrushName),
+		scriptBrush,
+		xmlBrush = new sh.brushes.Xml(),
+		bracketsRegex = null,
+		ref = this,
+		methodsToExpose = 'getDiv getHtml init'.split(' ')
+		;
+
+	if (brushClass == null)
+		return;
+	
+	scriptBrush = new brushClass();
+	
+	for(var i = 0; i < methodsToExpose.length; i++)
+		// make a closure so we don't lose the name after i changes
+		(function() {
+			var name = methodsToExpose[i];
+			
+			ref[name] = function()
+			{
+				return xmlBrush[name].apply(xmlBrush, arguments);
+			};
+		})();
+	
+	if (scriptBrush.htmlScript == null)
+	{
+		alert(sh.config.strings.brushNotHtmlScript + scriptBrushName);
+		return;
+	}
+	
+	xmlBrush.regexList.push(
+		{ regex: scriptBrush.htmlScript.code, func: process }
+	);
+	
+	function offsetMatches(matches, offset)
+	{
+		for (var j = 0; j < matches.length; j++) 
+			matches[j].index += offset;
+	}
+	
+	function process(match, info)
+	{
+		var code = match.code,
+			matches = [],
+			regexList = scriptBrush.regexList,
+			offset = match.index + match.left.length,
+			htmlScript = scriptBrush.htmlScript,
+			result
+			;
+
+		// add all matches from the code
+		for (var i = 0; i < regexList.length; i++)
+		{
+			result = getMatches(code, regexList[i]);
+			offsetMatches(result, offset);
+			matches = matches.concat(result);
+		}
+		
+		// add left script bracket
+		if (htmlScript.left != null && match.left != null)
+		{
+			result = getMatches(match.left, htmlScript.left);
+			offsetMatches(result, match.index);
+			matches = matches.concat(result);
+		}
+		
+		// add right script bracket
+		if (htmlScript.right != null && match.right != null)
+		{
+			result = getMatches(match.right, htmlScript.right);
+			offsetMatches(result, match.index + match[0].lastIndexOf(match.right));
+			matches = matches.concat(result);
+		}
+		
+		for (var j = 0; j < matches.length; j++)
+			matches[j].brushName = brushClass.brushName;
+			
+		return matches;
+	}
+};
+
+/**
+ * Main Highlither class.
+ * @constructor
+ */
+sh.Highlighter = function()
+{
+	// not putting any code in here because of the prototype inheritance
+};
+
+sh.Highlighter.prototype = {
+	/**
+	 * Returns value of the parameter passed to the highlighter.
+	 * @param {String} name				Name of the parameter.
+	 * @param {Object} defaultValue		Default value.
+	 * @return {Object}					Returns found value or default value otherwise.
+	 */
+	getParam: function(name, defaultValue)
+	{
+		var result = this.params[name];
+		return toBoolean(result == null ? defaultValue : result);
+	},
+	
+	/**
+	 * Shortcut to document.createElement().
+	 * @param {String} name		Name of the element to create (DIV, A, etc).
+	 * @return {HTMLElement}	Returns new HTML element.
+	 */
+	create: function(name)
+	{
+		return document.createElement(name);
+	},
+	
+	/**
+	 * Applies all regular expression to the code and stores all found
+	 * matches in the `this.matches` array.
+	 * @param {Array} regexList		List of regular expressions.
+	 * @param {String} code			Source code.
+	 * @return {Array}				Returns list of matches.
+	 */
+	findMatches: function(regexList, code)
+	{
+		var result = [];
+		
+		if (regexList != null)
+			for (var i = 0; i < regexList.length; i++) 
+				// BUG: length returns len+1 for array if methods added to prototype chain (oising@gmail.com)
+				if (typeof (regexList[i]) == "object")
+					result = result.concat(getMatches(code, regexList[i]));
+		
+		// sort and remove nested the matches
+		return this.removeNestedMatches(result.sort(matchesSortCallback));
+	},
+	
+	/**
+	 * Checks to see if any of the matches are inside of other matches. 
+	 * This process would get rid of highligted strings inside comments, 
+	 * keywords inside strings and so on.
+	 */
+	removeNestedMatches: function(matches)
+	{
+		// Optimized by Jose Prado (http://joseprado.com)
+		for (var i = 0; i < matches.length; i++) 
+		{ 
+			if (matches[i] === null)
+				continue;
+			
+			var itemI = matches[i],
+				itemIEndPos = itemI.index + itemI.length
+				;
+			
+			for (var j = i + 1; j < matches.length && matches[i] !== null; j++) 
+			{
+				var itemJ = matches[j];
+				
+				if (itemJ === null) 
+					continue;
+				else if (itemJ.index > itemIEndPos) 
+					break;
+				else if (itemJ.index == itemI.index && itemJ.length > itemI.length)
+					matches[i] = null;
+				else if (itemJ.index >= itemI.index && itemJ.index < itemIEndPos) 
+					matches[j] = null;
+			}
+		}
+		
+		return matches;
+	},
+	
+	/**
+	 * Creates an array containing integer line numbers starting from the 'first-line' param.
+	 * @return {Array} Returns array of integers.
+	 */
+	figureOutLineNumbers: function(code)
+	{
+		var lines = [],
+			firstLine = parseInt(this.getParam('first-line'))
+			;
+		
+		eachLine(code, function(line, index)
+		{
+			lines.push(index + firstLine);
+		});
+		
+		return lines;
+	},
+	
+	/**
+	 * Determines if specified line number is in the highlighted list.
+	 */
+	isLineHighlighted: function(lineNumber)
+	{
+		var list = this.getParam('highlight', []);
+		
+		if (typeof(list) != 'object' && list.push == null) 
+			list = [ list ];
+		
+		return indexOf(list, lineNumber.toString()) != -1;
+	},
+	
+	/**
+	 * Generates HTML markup for a single line of code while determining alternating line style.
+	 * @param {Integer} lineNumber	Line number.
+	 * @param {String} code Line	HTML markup.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineHtml: function(lineIndex, lineNumber, code)
+	{
+		var classes = [
+			'line',
+			'number' + lineNumber,
+			'index' + lineIndex,
+			'alt' + (lineNumber % 2 == 0 ? 1 : 2).toString()
+		];
+		
+		if (this.isLineHighlighted(lineNumber))
+		 	classes.push('highlighted');
+		
+		if (lineNumber == 0)
+			classes.push('break');
+			
+		return '<div class="' + classes.join(' ') + '">' + code + '</div>';
+	},
+	
+	/**
+	 * Generates HTML markup for line number column.
+	 * @param {String} code			Complete code HTML markup.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns HTML markup.
+	 */
+	getLineNumbersHtml: function(code, lineNumbers)
+	{
+		var html = '',
+			count = splitLines(code).length,
+			firstLine = parseInt(this.getParam('first-line')),
+			pad = this.getParam('pad-line-numbers')
+			;
+		
+		if (pad == true)
+			pad = (firstLine + count - 1).toString().length;
+		else if (isNaN(pad) == true)
+			pad = 0;
+			
+		for (var i = 0; i < count; i++)
+		{
+			var lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i,
+				code = lineNumber == 0 ? sh.config.space : padNumber(lineNumber, pad)
+				;
+				
+			html += this.getLineHtml(i, lineNumber, code);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Splits block of text into individual DIV lines.
+	 * @param {String} code			Code to highlight.
+	 * @param {Array} lineNumbers	Calculated line numbers.
+	 * @return {String}				Returns highlighted code in HTML form.
+	 */
+	getCodeLinesHtml: function(html, lineNumbers)
+	{
+		html = trim(html);
+		
+		var lines = splitLines(html),
+			padLength = this.getParam('pad-line-numbers'),
+			firstLine = parseInt(this.getParam('first-line')),
+			html = '',
+			brushName = this.getParam('brush')
+			;
+
+		for (var i = 0; i < lines.length; i++)
+		{
+			var line = lines[i],
+				indent = /^(&nbsp;|\s)+/.exec(line),
+				spaces = null,
+				lineNumber = lineNumbers ? lineNumbers[i] : firstLine + i;
+				;
+
+			if (indent != null)
+			{
+				spaces = indent[0].toString();
+				line = line.substr(spaces.length);
+				spaces = spaces.replace(' ', sh.config.space);
+			}
+
+			line = trim(line);
+			
+			if (line.length == 0)
+				line = sh.config.space;
+			
+			html += this.getLineHtml(
+				i,
+				lineNumber, 
+				(spaces != null ? '<code class="' + brushName + ' spaces">' + spaces + '</code>' : '') + line
+			);
+		}
+		
+		return html;
+	},
+	
+	/**
+	 * Returns HTML for the table title or empty string if title is null.
+	 */
+	getTitleHtml: function(title)
+	{
+		return title ? '<caption>' + title + '</caption>' : '';
+	},
+	
+	/**
+	 * Finds all matches in the source code.
+	 * @param {String} code		Source code to process matches in.
+	 * @param {Array} matches	Discovered regex matches.
+	 * @return {String} Returns formatted HTML with processed mathes.
+	 */
+	getMatchesHtml: function(code, matches)
+	{
+		var pos = 0, 
+			result = '',
+			brushName = this.getParam('brush', '')
+			;
+		
+		function getBrushNameCss(match)
+		{
+			var result = match ? (match.brushName || brushName) : brushName;
+			return result ? result + ' ' : '';
+		};
+		
+		// Finally, go through the final list of matches and pull the all
+		// together adding everything in between that isn't a match.
+		for (var i = 0; i < matches.length; i++) 
+		{
+			var match = matches[i],
+				matchBrushName
+				;
+			
+			if (match === null || match.length === 0) 
+				continue;
+			
+			matchBrushName = getBrushNameCss(match);
+			
+			result += wrapLinesWithCode(code.substr(pos, match.index - pos), matchBrushName + 'plain')
+					+ wrapLinesWithCode(match.value, matchBrushName + match.css)
+					;
+
+			pos = match.index + match.length + (match.offset || 0);
+		}
+
+		// don't forget to add whatever's remaining in the string
+		result += wrapLinesWithCode(code.substr(pos), getBrushNameCss() + 'plain');
+
+		return result;
+	},
+	
+	/**
+	 * Generates HTML markup for the whole syntax highlighter.
+	 * @param {String} code Source code.
+	 * @return {String} Returns HTML markup.
+	 */
+	getHtml: function(code)
+	{
+		var html = '',
+			classes = [ 'syntaxhighlighter' ],
+			tabSize,
+			matches,
+			lineNumbers
+			;
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+
+		className = 'syntaxhighlighter';
+
+		if (this.getParam('collapse') == true)
+			classes.push('collapsed');
+		
+		if ((gutter = this.getParam('gutter')) == false)
+			classes.push('nogutter');
+
+		// add custom user style name
+		classes.push(this.getParam('class-name'));
+
+		// add brush alias to the class name for custom CSS
+		classes.push(this.getParam('brush'));
+
+		code = trimFirstAndLastLines(code)
+			.replace(/\r/g, ' ') // IE lets these buggers through
+			;
+
+		tabSize = this.getParam('tab-size');
+
+		// replace tabs with spaces
+		code = this.getParam('smart-tabs') == true
+			? processSmartTabs(code, tabSize)
+			: processTabs(code, tabSize)
+			;
+
+		// unindent code by the common indentation
+		code = unindent(code);
+
+		if (gutter)
+			lineNumbers = this.figureOutLineNumbers(code);
+		
+		// find matches in the code using brushes regex list
+		matches = this.findMatches(this.regexList, code);
+		// processes found matches into the html
+		html = this.getMatchesHtml(code, matches);
+		// finally, split all lines so that they wrap well
+		html = this.getCodeLinesHtml(html, lineNumbers);
+
+		// finally, process the links
+		if (this.getParam('auto-links'))
+			html = processUrls(html);
+		
+		if (typeof(navigator) != 'undefined' && navigator.userAgent && navigator.userAgent.match(/MSIE/))
+			classes.push('ie');
+		
+		html = 
+			'<div id="' + getHighlighterId(this.id) + '" class="' + classes.join(' ') + '">'
+				+ (this.getParam('toolbar') ? sh.toolbar.getHtml(this) : '')
+				+ '<table border="0" cellpadding="0" cellspacing="0">'
+					+ this.getTitleHtml(this.getParam('title'))
+					+ '<tbody>'
+						+ '<tr>'
+							+ (gutter ? '<td class="gutter">' + this.getLineNumbersHtml(code) + '</td>' : '')
+							+ '<td class="code">'
+								+ '<div class="container">'
+									+ html
+								+ '</div>'
+							+ '</td>'
+						+ '</tr>'
+					+ '</tbody>'
+				+ '</table>'
+			+ '</div>'
+			;
+			
+		return html;
+	},
+	
+	/**
+	 * Highlights the code and returns complete HTML.
+	 * @param {String} code     Code to highlight.
+	 * @return {Element}        Returns container DIV element with all markup.
+	 */
+	getDiv: function(code)
+	{
+		if (code === null) 
+			code = '';
+		
+		this.code = code;
+
+		var div = this.create('div');
+
+		// create main HTML
+		div.innerHTML = this.getHtml(code);
+		
+		// set up click handlers
+		if (this.getParam('toolbar'))
+			attachEvent(findElement(div, '.toolbar'), 'click', sh.toolbar.handler);
+		
+		if (this.getParam('quick-code'))
+			attachEvent(findElement(div, '.code'), 'dblclick', quickCodeHandler);
+		
+		return div;
+	},
+	
+	/**
+	 * Initializes the highlighter/brush.
+	 *
+	 * Constructor isn't used for initialization so that nothing executes during necessary
+	 * `new SyntaxHighlighter.Highlighter()` call when setting up brush inheritence.
+	 *
+	 * @param {Hash} params Highlighter parameters.
+	 */
+	init: function(params)
+	{
+		this.id = guid();
+		
+		// register this instance in the highlighters list
+		storeHighlighter(this);
+		
+		// local params take precedence over defaults
+		this.params = merge(sh.defaults, params || {})
+		
+		// process light mode
+		if (this.getParam('light') == true)
+			this.params.toolbar = this.params.gutter = false;
+	},
+	
+	/**
+	 * Converts space separated list of keywords into a regular expression string.
+	 * @param {String} str    Space separated keywords.
+	 * @return {String}       Returns regular expression string.
+	 */
+	getKeywords: function(str)
+	{
+		str = str
+			.replace(/^\s+|\s+$/g, '')
+			.replace(/\s+/g, '|')
+			;
+		
+		return '\\b(?:' + str + ')\\b';
+	},
+	
+	/**
+	 * Makes a brush compatible with the `html-script` functionality.
+	 * @param {Object} regexGroup Object containing `left` and `right` regular expressions.
+	 */
+	forHtmlScript: function(regexGroup)
+	{
+		this.htmlScript = {
+			left : { regex: regexGroup.left, css: 'script' },
+			right : { regex: regexGroup.right, css: 'script' },
+			code : new XRegExp(
+				"(?<left>" + regexGroup.left.source + ")" +
+				"(?<code>.*?)" +
+				"(?<right>" + regexGroup.right.source + ")",
+				"sgi"
+				)
+		};
+	}
+}; // end of Highlighter
+
+return sh;
+}(); // end of anonymous function
+
+// CommonJS
+typeof(exports) != 'undefined' ? exports['SyntaxHighlighter'] = SyntaxHighlighter : null;
+</script><script type="text/javascript">// (inc clojure-brush) ;; an improved SyntaxHighlighter brush for clojure
+//
+// Copyright (C) 2011 Andrew Brehaut
+//
+// Distributed under the Eclipse Public License, the same as Clojure.
+//
+// https://github.com/brehaut/inc-clojure-brush
+//
+// Written by Andrew Brehaut
+// V0.9.1, November 2011
+
+if (typeof net == "undefined") net = {};
+if (!(net.brehaut)) net.brehaut = {};
+
+net.brehaut.ClojureTools = (function (SH) {
+  "use strict";
+  // utiliies
+  if (!Object.create) Object.create = function object(o) {
+    function F() {};
+    F.prototype = o;  
+    return new F();
+  };
+        
+  // data
+  
+  function Token(value, index, tag, length) {
+    this.value = value;
+    this.index = index;
+    this.length = length || value.length;
+    this.tag = tag;
+    this.secondary_tags = {};
+  }
+  
+  // null_token exists so that LispNodes that have not had a closing tag attached
+  // can have a dummy token to simplify annotation
+  var null_token = new Token("", -1, "null", -1);
+  
+  /* LispNodes are aggregate nodes for sexpressions. 
+   *
+   */
+  function LispNode(tag, children, opening) {
+    this.tag = tag;            // current metadata for syntax inference
+    this.parent = null;        // the parent expression
+    this.list = children;      // all the child forms in order
+    this.opening = opening;    // the token that opens this form.
+    this.closing = null_token; // the token that closes this form.
+    this.meta = null;          // metadata nodes will be attached here if they are found
+  }
+
+  var null_lispnode = new LispNode("null", [], null_token);
+
+  
+  function PrefixNode(tag, token, attached_node) {
+    this.tag = tag;
+    this.token = token;
+    this.attached_node = attached_node;
+    this.parent = null;
+  }
+
+  
+  
+  // tokenize
+
+  function tokenize(code) {
+    var tokens = [];
+    var tn = 0;
+    
+    var zero = "0".charCodeAt(0);
+    var nine = "9".charCodeAt(0); 
+    var lower_a = "a".charCodeAt(0);
+    var lower_f = "f".charCodeAt(0);    
+    var upper_a = "A".charCodeAt(0);
+    var upper_f = "F".charCodeAt(0);
+    
+    var dispatch = false; // have we just seen a # character?
+    
+    // i tracks the start of the current window
+    // extent is the window for slicing
+    
+    for (var i = 0, 
+             extent = i, 
+             j = code.length; 
+             i < j && extent <= j;) {          
+                
+      var c = code[i];
+      
+      // we care about capturing the whole token when dispatch is used, so back up the
+      // starting index by 1
+      if (dispatch) i--; 
+      
+      switch (c) {
+        // dispatch alters the value of the next thing read
+        case "#":
+          dispatch = true;
+          i++;
+          extent++;
+          continue;
+          
+        case " ":    // ignore whitespace
+        case "\t":
+        case "\n":
+        case "\r":
+        case ",":   
+          extent++
+          break; 
+          
+        // simple terms
+        case "^":
+        case "`":
+        case ")":
+        case "[":
+        case "]":
+        case "}":
+        case "@":
+          tokens[tn++] = new Token(c, i, c, ++extent - i);
+          break;
+        
+        case "'":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#'" : "'", extent - i);
+          break
+        
+        case "(":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "(", extent - i);
+          break;          
+          
+        case "{":
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "#{" : "{", extent - i);
+          break;  
+        
+        case "\\":
+          if (code.slice(i + 1, i + 8) === "newline") {
+            tokens[tn++] = new Token("\\newline", i, "value", 8);
+            extent = i + 9; 
+          }
+          else if (code.slice(i + 1, i + 6) === "space") {
+            tokens[tn++] = new Token("\\space", i, "value", 6);
+            extent = i + 6;
+          }
+          else if (code.slice(i + 1, i + 4) === "tab") {
+            tokens[tn++] = new Token("\\tab", i, "value", 4);
+            extent = i + 5;
+          } // work around fun bug with &,>,< in character literals
+          else if (code.slice(i + 1, i + 6) === "&amp;") {
+            tokens[tn++] = new Token("\\&amp;", i, "value", 6);
+            extent = i + 6; 
+          }
+          else if (code.slice(i + 1, i + 5) === "&lt;") {
+            tokens[tn++] = new Token("\\&lt;", i, "value", 5);
+            extent = i + 5;
+          }
+          else if (code.slice(i + 1, i + 5) === "&gt;") {
+            tokens[tn++] = new Token("\\&gt;", i, "value", 5);
+            extent = i + 5;
+          }
+          
+          else {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", 2);
+          }
+          break;
+        
+        case "~": // slice
+          if (code[i + 1] === "@") {
+            extent += 2;
+            tokens[tn++] = new Token(code.slice(i, extent), i, "splice", 2);
+          }
+          else {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "unquote", 2);
+          }
+          break;
+        
+        // complicated terms
+        case "\"": // strings and regexps
+          for (extent++; extent <= j; extent++) {
+            if (code[extent] === "\\") extent++;
+            else if (code[extent] === "\"") break;
+          }
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, dispatch ? "regexp" : "string", extent - i);       
+          break;
+          
+        case ";":
+          for (; extent <= j && code[extent] !== "\n" && code[extent] !== "\r"; extent++);
+          tokens[tn++] = new Token(code.slice(i, ++extent), i, "comments", extent - i);   
+          break;
+        
+        case "+": // numbers; fall through to symbol for + and - not prefixing a number
+        case "-":
+        case "0":
+        case "1":
+        case "2":
+        case "3":
+        case "4":
+        case "5":
+        case "6":
+        case "7":
+        case "8":
+        case "9":
+        // todo: exponents, hex
+        // http://my.safaribooksonline.com/9781449310387/14?reader=pf&readerfullscreen=&readerleftmenu=1
+          var c2 = code.charCodeAt(i + 1);
+          if (((c === "+" || c === "-") && (c2 >= zero && c2 <= nine)) // prefixes
+              || (c !== "+" && c !== "-")) {
+            if (c === "+" || c === "-") extent++; 
+            for (; extent <= j; extent++) {
+              var charCode = code.charCodeAt(extent);
+              if (charCode < zero || charCode > nine) break;
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "r" || c === "R" || c === "/" || c === ".") // interstitial characters
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "x" || c === "X") && 
+                ((c2 >= zero && c2 <= nine) 
+                 || (c2 >= lower_a && c2 <= lower_f)
+                 || (c2 >= upper_a && c2 <= upper_f))) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (((charCode >= zero && charCode <= nine) 
+                    || (charCode >= lower_a && charCode <= lower_f)
+                    || (charCode >= upper_a && charCode <= upper_f))) continue;
+                break;
+              }
+            }
+            
+            c = code[extent];
+            c2 = code.charCodeAt(extent + 1);
+            if ((c === "e" || c === "E") 
+                && (c2 >= zero && c2 <= nine)) {
+              for (extent++; extent <= j; extent++) {
+                var charCode = code.charCodeAt(extent);
+                if (charCode < zero || charCode > nine) break;
+              }
+            }
+            
+            c = code[extent];
+            if (c === "N" || c === "M") extent++;
+
+            tokens[tn++] = new Token(code.slice(i, extent), i, "value", extent - i);
+            break;
+          }
+
+        case "_":
+          if (dispatch && c === "_") {
+            tokens[tn++] = new Token(code.slice(i, ++extent), i, "skip", extent - i);
+            break;
+          } // if not a skip, fall through to symbols
+        
+        // Allow just about any other symbol as a symbol. This is far more permissive than 
+        // clojure actually allows, but should catch any weirdo crap that accidentally gets
+        // into the code.
+        default: 
+          for (extent++; extent <= j; extent++) {
+            switch (code[extent]) {
+              case " ":
+              case "\t":
+              case "\n":
+              case "\r":
+              case "\\":
+              case ",":
+              case "{":
+              case "}":
+              case "(":
+              case ")":
+              case "[":
+              case "]":
+              case "^":
+              case "`":
+              case "@":   
+                break;
+              case ";":   
+                // theres a weird bug via syntax highligher that gives us escaped entities.
+                // need to watch out for these
+                if (code.slice(extent-3, extent+1) === "&lt;"
+                    ||code.slice(extent-3, extent+1) === "&gt;"
+                    ||code.slice(extent-4, extent+1) === "&amp;") {
+                  continue;
+                }
+                break;
+              default:
+                continue;
+            }
+            break;
+          }
+          
+          var value = code.slice(i, extent);
+          var tag = "symbol";
+          if (value[0] == ":") {
+            tag = "keyword";
+          }
+          else if (value === "true" || value === "false" || value === "nil") {
+            tag = "value";
+          }
+          tokens[tn++] = new Token(value, i, tag, extent - i);
+      }
+      
+      dispatch = false;
+      i = extent;
+    } 
+
+    return tokens;
+  }
+
+
+  function build_tree(tokens) {
+    var toplevel = {
+      list: [], 
+      tag: "toplevel", 
+      parent: null, 
+      opening: null,
+      closing: null,
+      depth: -1
+    };
+    
+    // loop variables hoisted out as semi globals to track position in token stream
+    var i = -1;
+    var j = tokens.length;
+    
+    function parse_one(t) {
+      // ignore special tokens and forms that dont belong in the tree
+      for (; t && (t.tag === "comments" || t.tag === "invalid" || t.tag == "skip") && i < j; ) {
+        if (t.tag === "skip") {
+          t.tag = "preprocessor";
+          annotate_comment(parse_one(tokens[++i]));
+        }
+        t = tokens[++i];
+      }
+      
+      if (!t) return {}; // hackity hack
+      
+      switch (t.tag) {
+        case "{":
+          return build_aggregate(new LispNode("map", [], t), "}");
+        case "(":
+          return build_aggregate(new LispNode("list", [], t), ")");
+        case "#{":
+          return build_aggregate(new LispNode("set", [], t), "}");
+        case "[":
+          return build_aggregate(new LispNode("vector", [], t), "]");
+        case "'":
+          return new PrefixNode("quote", t, parse_one(tokens[++i]));
+        case "#'":
+          return new PrefixNode("varquote", t, parse_one(tokens[++i]));  
+        case "@":
+          return new PrefixNode("deref", t, parse_one(tokens[++i]));  
+        case "`":
+          return new PrefixNode("quasiquote", t, parse_one(tokens[++i]));  
+        case "unquote":
+          return new PrefixNode("unquote", t, parse_one(tokens[++i]));
+        case "splice":
+          return new PrefixNode("splice", t, parse_one(tokens[++i]));  
+        case "^":
+          t.tag = "meta";
+          var meta = parse_one(tokens[++i]);
+          var next = parse_one(tokens[++i]);
+          next.meta = meta;
+          return next;
+      }
+      
+      return t;
+    }
+    
+    // build_aggregate collects to ether sub forms for one aggregate for. 
+    function build_aggregate(current, expected_closing) {
+      for (i++; i < j; i++) {
+        var t = tokens[i];
+
+        if (t.tag === "}" || t.tag === ")" || t.tag === "]") {
+          if (t.tag !== expected_closing) t.tag = "invalid";
+          current.closing = t;
+          if (expected_closing) return current;
+        }
+        var node = parse_one(t);
+
+        node.parent = current;
+        current.list[current.list.length] = node;
+      }
+      
+      return current;
+    }
+    
+    build_aggregate(toplevel, null);
+    
+    return toplevel;
+  }
+
+  // annotation rules to apply to a form based on its head
+
+  var show_locals = true;  // HACK. would rather not use a (semi)-global.
+
+  /* annotate_comment is a special case annotation. 
+   * in addition to its role in styling specific forms, it is called by parse_one to
+   * ignore any forms skipped with #_
+   */ 
+  function annotate_comment(exp) {
+    exp.tag = "comments";
+
+    if (exp.list) {
+      exp.opening.tag = "comments";
+      exp.closing.tag = "comments";
+    
+      for (var i = 0; i < exp.list.length; i++) {
+        var child = exp.list[i];
+        if (child.list) {
+          annotate_comment(child);
+        }
+        if (child.attached_node) {
+          annotate_comment(child.attached_node);
+        }
+        else {
+          child.tag = "comments";
+        }
+      }
+    }
+  }
+
+  /* custom annotation rules are stored here */
+  var annotation_rules = {};
+  
+  // this function is exposed to allow ad hoc extension of the customisation rules
+  function register_annotation_rule(names, rule) {
+    for (var i = 0; i < names.length; i++) {
+      annotation_rules[names[i]] = rule;
+    }
+  }
+
+
+  function annotate_destructuring (exp, scope) {
+    if (exp.list) {
+      if (exp.tag === "vector") {
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_destructuring(exp.list[i], scope);
+        }
+      } 
+      else if (exp.tag === "map") {
+        for (var i = 0; i < exp.list.length; i += 2) {
+          var key = exp.list[i];
+          var val = exp.list[i + 1];
+          
+          if (key.tag === "keyword" && val.tag === "vector") {
+            for (var ii = 0, jj = val.list.length; ii < jj; ii++) {
+              if (val.list[ii].tag !== "symbol") continue;
+              val.list[ii].tag = "variable";
+              scope[val.list[ii].value] = true;
+            }
+          }
+          else {
+            annotate_destructuring(key, scope);
+            annotate_expressions(val, scope);
+          }
+        } 
+      }
+    } 
+    else if (exp.tag === "symbol" && (exp.value !== "&" && exp.value !== "&amp;")){
+      exp.tag = "variable";
+      scope[exp.value] = true;
+    }
+  }
+
+  function _annotate_binding_vector (exp, scope) {
+    if (exp.tag !== "vector") return;
+  
+    var bindings = exp.list;
+
+    if (bindings.length % 2 === 1) return;
+    
+    for (var i = 0; i < bindings.length; i += 2) {
+      annotate_destructuring(bindings[i], scope);
+      annotate_expressions(bindings[i + 1], scope);
+    }    
+  }
+
+  function annotate_binding (exp, scope) {
+    var bindings = exp.list[1];
+    if (!show_locals) return; // HACK
+
+    if (bindings) {
+      scope = Object.create(scope);
+      _annotate_binding_vector(bindings, scope);
+    }
+    for (var i = 2; i < exp.list.length; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function _annotate_function_body (exp, scope, start_idx) {
+    var argvec = exp.list[start_idx];
+    if (argvec.tag !== "vector") return;
+
+    scope = Object.create(scope);
+
+    for (var i = 0, j = argvec.list.length; i < j; i++) {
+      annotate_destructuring(argvec.list[i], scope);
+    }
+    
+    for (var i = start_idx, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+  
+  function annotate_function (exp, scope) {
+    for (var i = 1, j = exp.list.length; i < j; i++) {
+      var child = exp.list[i];
+      
+      if (child.tag === "vector") {
+        _annotate_function_body (exp, scope, i);
+        return;
+      }
+      else if (child.tag === "list") {
+        _annotate_function_body(child, scope, 0)
+      }
+    }
+  }
+  
+  function annotate_letfn (exp, scope) {
+    scope = Object.create(scope);
+    var bindings = exp.list[1];
+    
+    var fn;
+    for (var i = 0, j = bindings.list.length; i < j; i++) {
+      fn = bindings.list[i];
+      if (!fn.list[0]) continue;
+      fn.list[0].tag = "variable";
+      scope[fn.list[0].value] = true;
+    }
+    
+    for (i = 0, j = bindings.list.length; i < j; i++) {
+      var fn = bindings.list[i];
+      annotate_function(fn, scope);
+    }
+    
+    for (i = 2, j = exp.list.length; i < j; i++) {
+      annotate_expressions(exp.list[i], scope);
+    }
+  }
+
+  register_annotation_rule(
+    ["comment"],
+    annotate_comment
+  );
+  
+  register_annotation_rule(
+    ["let", "when-let", "if-let", "binding", "doseq", "for", "dotimes", "let*"],
+    annotate_binding
+  );
+  
+  register_annotation_rule(
+    ["defn", "defn-", "fn", "bound-fn", "defmacro", "fn*", "defmethod"],
+    annotate_function
+  );
+  
+  register_annotation_rule(
+    ["letfn"],
+    annotate_letfn
+  );
+
+  // standard annotations
+
+  function _annotate_metadata_recursive(meta, scope) {
+    if (!meta) return;
+
+    if (meta.list !== undefined && meta.list !== null) {
+      for (var i = 0, j = meta.list.length; i < j; i++) {
+        meta.opening.secondary_tags.meta = true
+        meta.closing.secondary_tags.meta = true
+        _annotate_metadata_recursive(meta.list[i], scope);
+      }
+    }
+    else if (meta.attached_node) {
+      meta.token.secondary_tags.meta = true;
+      _annotate_metadata_recursive(meta.attached_node, scope);
+    }
+    else {
+      meta.secondary_tags.meta = true;
+    }
+  }
+  
+  function annotate_metadata(exp) {
+    if (!(exp && exp.meta)) return;
+    var meta = exp.meta;
+    
+     annotate_expressions(meta, {});    
+    _annotate_metadata_recursive(meta, {});
+  }
+
+
+  function annotate_quoted(exp, scope) {
+    if (!exp) return;
+
+    if (exp.list !== undefined && exp.list !== null) {
+      for (var i = 0, j = exp.list.length; i < j; i++) {
+        exp.opening.secondary_tags.quoted = true
+        exp.closing.secondary_tags.quoted = true
+        annotate_quoted(exp.list[i], scope);
+      }
+    }
+    else if (exp.attached_node) {
+      if (exp.tag === "unquote" || exp.tag === "splice") return;
+      exp.token.secondary_tags.quoted = true;
+      annotate_quoted(exp.attached_node, scope);
+    }
+    else {
+      exp.secondary_tags.quoted = true;
+    }
+  }
+
+
+  function annotate_expressions(exp, scope) {
+    annotate_metadata(exp);
+    
+    switch (exp.tag) {
+      case "toplevel": 
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "list": // functions, macros, special forms, comments
+        var head = exp.list[0];
+      
+        if (head) {
+          if (head.tag === "list" || head.tag === "vector" 
+           || head.tag === "map" || head.tag === "set") {
+            annotate_expressions(head, scope);
+          }
+          else if (head.attached_node) {
+            annotate_expressions(head.attached_node, scope);
+          }
+          else {
+            head.tag = (head.value.match(/(^\.)|(\.$)|[A-Z].*\//)
+                        ? "method"
+                        : "function");
+          }
+
+          // apply specific rules
+          if (annotation_rules.hasOwnProperty(head.value)) {
+            annotation_rules[head.value](exp, scope);
+          } 
+          else {
+            for (var i = 1; i < exp.list.length; i++) {
+              annotate_expressions(exp.list[i], scope);
+            }
+          } 
+        }
+        else { // empty list
+          exp.opening.tag = "value";
+          exp.closing.tag = "value";
+        }
+      
+        break;
+      
+      case "vector": // data
+      case "map":
+      case "set":
+        for (var i = 0; i < exp.list.length; i++) {
+          annotate_expressions(exp.list[i], scope);
+        }
+        break;
+      
+      case "symbol":
+        if (exp.value.match(/[A-Z].*\/[A-Z_]+/)) {
+          exp.tag = "constant";
+        }
+        else if (show_locals && scope[exp.value]) {
+          exp.tag = "variable";
+        }
+        else if (exp.tag === "symbol" && exp.value.match(/([A-Z].*\/)?[A-Z_]+/)) {
+          exp.tag = "type";
+        }
+        break;
+      
+      case "quote":
+      case "quasiquote":
+        annotate_quoted(exp.attached_node, scope);
+        
+      default:
+        if (exp.attached_node) annotate_expressions(exp.attached_node, scope);
+    }
+  }
+
+  // translation of tag to css:
+  var css_translation = {
+    "constant":     "constants",
+    "keyword":      "constants",
+    "method":       "color1",
+    "type":         "color3", 
+    "function":     "functions",
+    "string":       "string",
+    "regexp":       "string",
+    "value":        "value",
+    "comments":     "comments",
+    "symbol":       "symbol",
+    "variable":     "variable",
+    "splice":       "preprocessor", 
+    "unquote":      "preprocessor",     
+    "preprocessor": "preprocessor",
+    "meta":         "preprocessor", 
+    "'":            "preprocessor", 
+    "#'":           "preprocessor",    
+    "(":            "plain",
+    ")":            "plain",
+    "{":            "keyword",
+    "}":            "keyword",
+    "#{":           "keyword",   
+    "[":            "keyword",
+    "]":            "keyword",
+    "invalid":      "invalid",
+    "@":            "plain" 
+  };
+  
+  function translate_tags_to_css(tokens) {
+    for (var i = 0, j = tokens.length; i < j; i++) {
+      var token = tokens[i];
+      token.css = css_translation[token.tag];
+      for (var k in token.secondary_tags) if (token.secondary_tags.hasOwnProperty(k))
+        token.css += " " + k ;
+    };
+  }
+  
+  
+  // create the new brush
+
+  SH.brushes.Clojure = function () {};
+  SH.brushes.Clojure.prototype = new SyntaxHighlighter.Highlighter();
+  
+  SH.brushes.Clojure.prototype.findMatches = function find_matches (regexpList, code) {
+    // this is a nasty global hack. need to resolve this
+    if (this.params && this.params.locals) {
+      show_locals = this.params.locals === true || this.params.locals === "true"; 
+    }
+    else {
+      show_locals = true;
+    }
+    
+    var tokens = tokenize(code);
+    annotate_expressions(build_tree(tokens), {});
+    translate_tags_to_css(tokens);
+
+    return tokens;
+  };
+  
+  SH.brushes.Clojure.aliases = ['clojure', 'Clojure', 'clj'];
+  SH.brushes.Clojure.register_annotation_rule = register_annotation_rule;
+
+  return {
+    tokenize: tokenize,
+    build_tree: build_tree
+  };
+})(SyntaxHighlighter);
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.1</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
+  (:import
+    (clojure.lang IDeref
+                  ISeq
+                  IPersistentMap
+                  IPersistentSet
+                  IPersistentCollection))
+  (:refer-clojure :exclude [update]))</pre></td></tr><tr><td class="docs"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn as-fn
+  [x]
+  (if (ifn? x) x, (constantly x)))</pre></td></tr><tr><td class="docs"><p>Update the given set using an existence map.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn into-set
+  [set map]
+  (if (map? map)
+    (reduce (fn [set [k v]] ((if v conj disj) set k))
+            set map)
+    (into set map)))</pre></td></tr><tr><td class="docs"><p>Walk through clauses, a series of predicate/transform pairs. The
+  first predicate that x satisfies has its transformation clause
+  called on x. Predicates or transforms may be values (eg true or nil)
+  rather than functions; these will be treated as functions that
+  return that value.
+  The last "pair" may be only a transform with no pred: in that case it
+  is unconditionally used to transform x, if nothing previously matched.
+  If no predicate matches, then x is returned unchanged.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn fix
+  [x &amp; clauses]
+  (let [call #((as-fn %) x)]
+    (first (or (seq (for [[pred &amp; [transform :as exists?]] (partition-all 2 clauses)
+                          :let [[pred transform] ;; handle odd number of clauses
+                                (if exists? [pred transform] [true pred])]
+                          :when (call pred)]
+                      (call transform)))
+               [x]))))</pre></td></tr><tr><td class="docs"><p>A "curried" version of fix, which sets the clauses once, yielding a
+  function that calls fix with the specified first argument.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn to-fix
+  [&amp; clauses]
+  (fn [x]
+    (apply fix x clauses)))</pre></td></tr><tr><td class="docs"><p>A macro combining the features of fix and fixing, by using parentheses to group the
+   additional arguments to each clause:
+   (-> x
+       (given string? read-string
+              map? (dissoc :x :y :z)
+              even? (/ 2)))</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro given
+  [x &amp; clauses]
+  (let [[clauses default] (if (even? (count clauses))
+                            [clauses `identity]
+                            [(butlast clauses) (last clauses)])]
+    `(fix ~x ~@(for [[pred transform] (partition 2 clauses)
+                     arg [pred `#(-&gt; % ~transform)]]
+                 arg)
+          ~default)))</pre></td></tr><tr><td class="docs"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell.
+  flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmacro map-entry
+  [a b]
+  `(clojure.lang.MapEntry. ~a ~b))</pre></td></tr><tr><td class="docs"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a
+  function that will take the old value and any supplied args and return the new value, and returns
+  a new nested structure. If any levels do not exist, hash-maps will be created. This implementation
+  was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged
+  values are not re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update-in*
+  [m keys f &amp; args]
+  (if-let [[k &amp; ks] (seq keys)]
+    (let [old (get m k)
+          new (apply update-in* old ks f args)]
+      (if (identical? old new)
+        m
+        (assoc m k new)))
+     (apply f m args)))</pre></td></tr><tr><td class="docs"><p>Update a value for the given key in a map where f is a function that takes the previous value and
+  the supplied args and returns the new value. Like update-in*, unchanged values are not
+  re-assoc'd.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn update
+  [m key f &amp; args]
+  (apply update-in* m [key] f args))</pre></td></tr><tr><td class="docs"><p>Create a new map from m by calling function f on each value to get a new value.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn map-vals
+  [m f &amp; args]
+  (when m
+    (into {}
+          (for [[k v] m]
+            (map-entry k (apply f v args))))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol Combiner
+  (combine-onto [left right]
+  &quot;Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.&quot;))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol Combiner
+  IPersistentMap
+  (combine-onto [this other]
+    (merge-with combine-onto this other))
+
+  IPersistentSet
+  (combine-onto [this other]
+    (into-set this other))
+
+  ISeq
+  (combine-onto [this other]
+    (concat this other))
+
+  IPersistentCollection
+  (combine-onto [this other]
+    (into this other))
+
+  Object
+  (combine-onto [this other]
+    other)
+
+  nil
+  (combine-onto [this other]
+    other))</pre></td></tr><tr><td class="docs"><p>Merge two data structures by combining the contents. For maps, merge recursively by
+  adjoining values with the same key. For collections, combine the right and left using
+  into or conj. If the left value is a set and the right value is a map, the right value
+  is assumed to be an existence map where the value determines whether the key is in the
+  merged set. This makes sets unique from other collections because items can be deleted
+  from them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn combine
+  [a b]
+  (combine-onto a b))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn catbytes
+  [&amp; args]
+  (let [out-buf (byte-array (loop [len 0, args (seq args)]
+                              (if-let [[arg &amp; args] args]
+                                (recur (+ len (alength ^bytes arg)) args)
+                                len)))]
+    (loop [offset 0, args args]
+      (if-let [[^bytes array &amp; more] (seq args)]
+        (let [size (alength array)]
+          (System/arraycopy array 0
+                            out-buf offset size)
+          (recur (+ size offset) more))
+        out-buf))))</pre></td></tr><tr><td class="docs"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn walk
+  [inner outer schema]
+  (outer
+   (case (:type schema)
+     :struct           (update schema :fields map-vals inner)
+     (:set :list :map) (-&gt; schema
+                           (given :values (update :values inner))
+                           (given :keys   (update :keys   inner)))
+     schema)))</pre></td></tr><tr><td class="docs"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each
+  and type with the result of calling f on it.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn postwalk
+  [f schema]
+  (walk (partial postwalk f) f schema))</pre></td></tr><tr><td class="docs"><p>Like postwalk, but do a pre-order traversal.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn prewalk
+  [f schema]
+  (walk (partial prewalk f) identity (f schema)))</pre></td></tr><tr><td class="docs"><p>Traverse the given schema, removing the given fields at any level.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn dissoc-fields
+  [schema &amp; fields]
+  (prewalk (to-fix #(= :struct (:type %))
+                   #(apply update % :fields dissoc fields))
+           schema))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.schema" name="protobuf.impl.flatland.schema"><h1 class="project-name">protobuf.impl.flatland.schema</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.schema
+  (:require
+    [clojure.string :as string]
+    [protobuf.util :as util])
+  (:import
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def )
+    (com.google.protobuf Descriptors$Descriptor
+                         Descriptors$FieldDescriptor
+                         Descriptors$FieldDescriptor$Type)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn extension
+  [ext ^Descriptors$FieldDescriptor field]
+  (-&gt; (.getOptions field)
+      (.getExtension ext)
+      (util/fix string? not-empty)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn field-type
+  [field]
+  (condp instance? field
+    Descriptors$FieldDescriptor
+    (if (.isRepeated ^Descriptors$FieldDescriptor field)
+      (condp extension field
+        (Extensions/counter)    :counter
+        (Extensions/succession) :succession
+        (Extensions/map)        :map
+        (Extensions/mapBy)      :map-by
+        (Extensions/set)        :set
+        :list)
+      :basic)
+    Descriptors$Descriptor
+    :struct))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmulti field-schema
+  (fn [field _ &amp; _] (field-type field)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn struct-schema
+  [^Descriptors$Descriptor struct
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [struct-name (.getFullName struct)]
+    (into {:type :struct
+           :name struct-name}
+          (when (not-any? (partial = struct-name) parents)
+            {:fields (into {}
+                           (for [^Descriptors$FieldDescriptor field (.getFields struct)]
+                             [(.intern map-def (.getName field))
+                              (field-schema field map-def (conj parents struct-name))]))}))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn basic-schema
+  [^Descriptors$FieldDescriptor field
+   ^PersistentProtocolBufferMap$Def map-def
+   &amp; [parents]]
+  (let [java-type   (keyword (string/lower-case (.name (.getJavaType field))))
+        meta-string (extension (Extensions/meta) field)]
+    (merge (case java-type
+             :message (struct-schema (.getMessageType field) map-def parents)
+             :enum    {:type   :enum
+                       :values (set (map #(.clojureEnumValue map-def %)
+                                         (.. field getEnumType getValues)))}
+             {:type java-type})
+           (when (.hasDefaultValue field)
+             {:default (.getDefaultValue field)})
+           (when meta-string
+             (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn subfield
+  [^Descriptors$FieldDescriptor field field-name]
+  (.findFieldByName (.getMessageType field) (name field-name)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :basic
+  [field map-def &amp; [parents]]
+  (basic-schema field map-def parents))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :list
+  [field map-def &amp; [parents]]
+  {:type   :list
+   :values (basic-schema field map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :succession
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :succession true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :counter
+  [field map-def &amp; [parents]]
+  (assoc (basic-schema field map-def parents)
+    :counter true))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :set
+  [field map-def &amp; [parents]]
+  {:type   :set
+   :values (field-schema (subfield field :item) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map
+  [field map-def &amp; [parents]]
+  {:type   :map
+   :keys   (field-schema (subfield field :key) map-def parents)
+   :values (field-schema (subfield field :val) map-def parents)})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :map-by
+  [field map-def &amp; [parents]]
+  (let [map-by (extension (Extensions/mapBy) field)]
+    {:type   :map
+     :keys   (field-schema (subfield field map-by) map-def parents)
+     :values (basic-schema field map-def parents)}))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod field-schema :struct
+  [field map-def &amp; [parents]]
+  (struct-schema field map-def parents))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.codec" name="protobuf.impl.flatland.codec"><h1 class="project-name">protobuf.impl.flatland.codec</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.codec
+  (:require
+    [clojure.java.io :as io]
+    ;; flatland.io extends Seqable so we can concat InputStream from
+    ;; ByteBuffer sequences.
+    [flatland.io.core]
+    [gloss.core :as gloss]
+    [gloss.core.formats :as gloss-formats]
+    [gloss.io :as gloss-io]
+    [gloss.core.protocols :as gloss-protocols]
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.util :as util]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(declare create)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def ^{:private true} len-key :proto_length)
+(def ^{:private true} reset-key :codec_reset)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn length-prefix
+  [proto]
+  (let [proto (protobuf/mapdef proto)
+        min   (alength (protobuf/-&gt;bytes proto {len-key 0}))
+        max   (alength (protobuf/-&gt;bytes proto {len-key Integer/MAX_VALUE}))]
+    (letfn [(check [test msg]
+              (when-not test
+                (throw (Exception. (format &quot;In %s: %s %s&quot;
+                                           (.getFullName proto) (name len-key) msg)))))]
+      (check (pos? min)
+             &quot;field is required for repeated protobufs&quot;)
+      (check (= min max)
+             &quot;must be of type fixed32 or fixed64&quot;))
+    (gloss/compile-frame (gloss/finite-frame max (create proto))
+                         #(hash-map len-key %)
+                         len-key)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  [proto &amp; {:keys [validator repeated]}]
+  (let [proto (protobuf/mapdef proto)]
+    (-&gt; (reify
+          ;; Reader method
+          gloss-protocols/Reader
+          (read-bytes [this buf-seq]
+            [true (protobuf/parse proto (io/input-stream buf-seq)) nil])
+          ;; Writer method
+          gloss-protocols/Writer
+          (sizeof [this] nil)
+          (write-bytes [this _ val]
+            (when (and validator (not (validator val)))
+              (throw (IllegalStateException.
+                      &quot;Invalid value in #'protobuf.impl.flatland.codec/create&quot;)))
+            (gloss-formats/to-buf-seq
+              (protobuf-map/-&gt;bytes
+                (if (protobuf-map/map? val)
+                  val
+                  (protobuf/create proto val))))))
+        (util/fix
+          repeated
+          #(gloss/repeated (gloss/finite-frame (length-prefix proto) %)
+                           :prefix :none)))))</pre></td></tr><tr><td class="docs"><p>Aliases</p>
+</td><td class="codes"></td></tr><tr><td class="docs"><p>Backwards-compatible alias for <code>create</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def ^{:doc 
+       :deprecated &quot;3.5.1-v1.0&quot;}
+  protobuf-codec #'create)</pre></td></tr><tr><td class="docs"><p>Encoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  encode #'gloss-io/encode)</pre></td></tr><tr><td class="docs"><p>Decoder for a codec.</p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  decode #'gloss-io/decode)</pre></td></tr><tr><td class="docs"><p>XXX what is this used for? Delete, if not used; add docstring if it is</p>
+</td><td class="codes"><pre class="brush: clojure">(defn codec-schema
+  [proto]
+  (util/dissoc-fields (protobuf/mapdef-&gt;schema proto)
+                      len-key
+                      reset-key))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.core" name="protobuf.impl.flatland.core"><h1 class="project-name">protobuf.impl.flatland.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This implementation takes its name from the original code for this project
+  that was done under the flatland Github org and which pulled in several
+  flatland libraries as dependencies.</p>
+
+<p>  This namespace is an internal implementation detail not intended for
+  developers. The API for working with all implementations of protocol
+  buffer backends for this project is provided in the <code>protobuf.core</code>
+  namespace.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.core
+  (:require
+    [protobuf.common :as common]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.mapdef :as protobuf])
+  (:gen-class
+    :name protobuf.impl.flatland.core.FlatlandProtoBuf
+    :implements [clojure.lang.Associative
+                 clojure.lang.ILookup
+                 clojure.lang.IPersistentCollection
+                 clojure.lang.IPersistentMap
+                 clojure.lang.Seqable
+                 java.lang.Iterable]
+    :init init
+    :constructors {[java.lang.Class
+                    clojure.lang.APersistentMap]
+                   []}
+    :methods [^:static [schema [Object] Object]]
+    :state contents
+    :main false))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -init
+  [protobuf-class data]
+  (let [wrapper (protobuf/mapdef protobuf-class)]
+    [[] {:instance (protobuf/create wrapper data)
+         :java-wrapper wrapper
+         :protobuf-class protobuf-class}]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -containsKey (:containsKey common/associative-behaviour))
+(def -entryAt (:entryAt common/associative-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -valAt (:valAt common/lookup-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentCollection   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -cons (:cons common/persistent-collection-behaviour))
+(def -count (:count common/persistent-collection-behaviour))
+(def -empty (:empty common/persistent-collection-behaviour))
+(def -equiv (:equiv common/persistent-collection-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.IPersistentMap   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -assoc
+  [this k v]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:assoc common/persistent-map-behaviour) this k v)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -assocEx (:assocEx common/persistent-map-behaviour))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -without
+  [this k]
+  (new protobuf.impl.flatland.core.FlatlandProtoBuf
+    (common/get-class this)
+    ((:without common/persistent-map-behaviour) this k)))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Seqable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -seq (:seq common/seqable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Iterable   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -forEach (:forEach common/iterable-behaviour))
+(def -iterator (:iterator common/iterable-behaviour))
+(def -spliterator (:spliterator common/iterable-behaviour))</pre></td></tr><tr><td class="docs"><p>  java.lang.Object   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def -toString (:toString common/printable-behaviour))</pre></td></tr><tr><td class="docs"><p>  protobuf.core.ProtoBufAPI   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn -schema
+  [protobuf-class]
+  (protobuf/mapdef-&gt;schema
+   (protobuf/mapdef protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def behaviour
+  {:-&gt;bytes (fn [this]
+             (protobuf-map/-&gt;bytes (common/get-instance this)))
+   :-&gt;schema (fn [this]
+             (protobuf/mapdef-&gt;schema (common/get-wrapper this)))
+   :bytes-&gt; (fn [this bytes]
+             (new protobuf.impl.flatland.core.FlatlandProtoBuf
+               (common/get-class this)
+               (protobuf/parse (common/get-wrapper this) bytes)))
+   :read (fn [this in]
+          (new protobuf.impl.flatland.core.FlatlandProtoBuf
+            (common/get-class this)
+            (first
+              (protobuf/read (common/get-wrapper this) in))))
+   :write (fn [this out]
+           (protobuf/write out (common/get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.map" name="protobuf.impl.flatland.map"><h1 class="project-name">protobuf.impl.flatland.map</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.map
+  (:import
+    (protobuf PersistentProtocolBufferMap))
+  (:refer-clojure :exclude [map?]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn map?
+  [obj]
+  (instance? PersistentProtocolBufferMap obj))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap p]
+  (.toByteArray p))</pre></td></tr><tr><td class="docs"><p>Get value at key ignoring extension fields.</p>
+
+<p>TODO make this nil-safe? Or just delete it?</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-raw
+  [^PersistentProtocolBufferMap p key]
+  (.getValAt p key false))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.impl.flatland.mapdef" name="protobuf.impl.flatland.mapdef"><h1 class="project-name">protobuf.impl.flatland.mapdef</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.impl.flatland.mapdef
+  (:require
+    [clojure.java.io :as io]
+    [protobuf.impl.flatland.map :as protobuf-map]
+    [protobuf.impl.flatland.schema :as protobuf-schema]
+    [protobuf.util :as util])
+  (:import
+    (clojure.lang Reflector)
+    (com.google.protobuf CodedInputStream
+                         Descriptors$Descriptor
+                         GeneratedMessage)
+    (java.io InputStream OutputStream)
+    (protobuf Extensions
+              PersistentProtocolBufferMap
+              PersistentProtocolBufferMap$Def
+              PersistentProtocolBufferMap$Def$NamingStrategy))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef?
+  [obj]
+  (instance? PersistentProtocolBufferMap$Def obj))</pre></td></tr><tr><td class="docs"><p>Create a protocol buffer map definition from a string or protobuf class.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^PersistentProtocolBufferMap$Def mapdef
+  ([map-def]
+     (if (or (mapdef? map-def) (nil? map-def))
+       map-def
+       (mapdef map-def {})))
+  ([map-def opts]
+     (when map-def
+       (let [{:keys [^PersistentProtocolBufferMap$Def$NamingStrategy naming-strategy
+                     size-limit]
+              :or {naming-strategy PersistentProtocolBufferMap$Def/convertUnderscores
+                   size-limit 67108864}} opts ;; 64MiB
+             ^Descriptors$Descriptor descriptor
+             (if (instance? Descriptors$Descriptor map-def)
+               map-def
+               (Reflector/invokeStaticMethod ^Class map-def &quot;getDescriptor&quot; (to-array nil)))]
+         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))</pre></td></tr><tr><td class="docs"><p>Construct a protobuf of the given map-def.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([^PersistentProtocolBufferMap$Def map-def]
+     (PersistentProtocolBufferMap/construct map-def {}))
+  ([^PersistentProtocolBufferMap$Def map-def m]
+     (PersistentProtocolBufferMap/construct map-def m))
+  ([^PersistentProtocolBufferMap$Def map-def k v &amp; kvs]
+     (PersistentProtocolBufferMap/construct map-def (apply array-map k v kvs))))</pre></td></tr><tr><td class="docs"><p>Return the schema for the given mapdef.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn mapdef-&gt;schema
+  [&amp; args]
+  (let [^PersistentProtocolBufferMap$Def map-def (apply mapdef args)]
+    (protobuf-schema/field-schema (.getMessageType map-def) map-def)))</pre></td></tr><tr><td class="docs"><p>Load a protobuf of the given map-def from a data source.</p>
+
+<p>  Supported data sources are either an array of bytes or an input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defmulti parse
+  (fn [map-def data &amp; _]
+    (type data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse (Class/forName &quot;[B&quot;)
+  ([^PersistentProtocolBufferMap$Def map-def data]
+     (when data
+       (PersistentProtocolBufferMap/create map-def data)))
+  ([^PersistentProtocolBufferMap$Def map-def data ^Integer offset ^Integer length]
+     (when data
+       (let [^CodedInputStream in (CodedInputStream/newInstance data offset length)]
+         (PersistentProtocolBufferMap/parseFrom map-def in)))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse InputStream
+  [^PersistentProtocolBufferMap$Def map-def stream]
+  (when stream
+    (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
+  [^PersistentProtocolBufferMap$Def map-def m]
+  (protobuf-map/-&gt;bytes (PersistentProtocolBufferMap/construct map-def m)))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
+  from the given input stream.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn read
+  [^PersistentProtocolBufferMap$Def map-def in]
+  (lazy-seq
+   (io!
+    (let [^InputStream in (io/input-stream in)]
+      (if-let [p (PersistentProtocolBufferMap/parseDelimitedFrom map-def in)]
+        (cons p (read map-def in))
+        (.close in))))))</pre></td></tr><tr><td class="docs"><p>Write the given protobufs to the given output stream, prefixing each with
+  its length to delimit them.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn write
+  [out &amp; ps]
+  (io!
+   (let [^OutputStream out (io/output-stream out)]
+     (doseq [^PersistentProtocolBufferMap p ps]
+       (.writeDelimitedTo p out))
+     (.flush out))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend-protocol util/Combiner
+  PersistentProtocolBufferMap
+  (combine-onto [^PersistentProtocolBufferMap this other]
+    (.append this other)))</pre></td></tr><tr><td class="docs"><p>A convenience alias for <code>util/combine</code></p>
+</td><td class="codes"><pre class="brush: clojure">(def 
+  combine #'util/combine)</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.core" name="protobuf.core"><h1 class="project-name">protobuf.core</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs"><p>This is the public API for working with protocol buffers.</p>
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.core
+  (:require
+    [protobuf.impl.flatland.core :as flatland])
+  (:import
+    (protobuf.impl.flatland.core FlatlandProtoBuf))
+  (:refer-clojure :exclude [map? read]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defprotocol ProtoBufAPI
+  (-&gt;bytes [this])
+  (-&gt;schema [this])
+  (bytes-&gt; [this bytes])
+  (read [this in])
+  (write [this out]))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(extend FlatlandProtoBuf
+        ProtoBufAPI
+        flatland/behaviour)</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def default-impl-name &quot;flatland&quot;)</pre></td></tr><tr><td class="docs"><p>Get the currently configured protobuf implementation. If not defined,
+  used the hard-coded default value (see <code>default-impl-name</code>).</p>
+
+<p>  Note that the protobuf backend implementation is configured using
+  JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code>
+  may set this with <code>:jvm-opts</code>
+  (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p>
+</td><td class="codes"><pre class="brush: clojure">(defn get-impl
+  []
+  (keyword (or (System/getProperty &quot;protobuf.impl&quot;)
+               default-impl-name)))</pre></td></tr><tr><td class="docs"><p>This function is designed to be called against compiled Java protocol
+  buffer classes. To get the schema of a Clojure protobuf instance, you'll
+  want to use the <code>-&gt;schema</code> method.</p>
+</td><td class="codes"><pre class="brush: clojure">(defn schema
+  [protobuf-class]
+  (case (get-impl)
+    :flatland (FlatlandProtoBuf/schema protobuf-class)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn create
+  ([protobuf-class]
+    (create protobuf-class {}))
+  ([protobuf-class data]
+    (case (get-impl)
+      :flatland (new FlatlandProtoBuf protobuf-class data))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-class
+  [this]
+  (:protobuf-class (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-instance
+  [this]
+  (:instance (.contents this)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn get-wrapper
+  [this]
+  (:java-wrapper (.contents this)))</pre></td></tr><tr><td class="docs"><p>  Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+</td><td class="codes"></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def associative-behaviour
+  {:containsKey (fn [this data] (.containsKey (get-instance this) data))
+   :entryAt (fn [this data] (.entryAt (get-instance this) data))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def iterable-behaviour
+  {:forEach (fn [this consumer] (.forEach (get-instance this) consumer))
+   :iterator (fn [this] (.iterator (get-instance this)))
+   :spliterator (fn [this] (.spliterator (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def lookup-behaviour
+  {:valAt (fn ([this k] (.valAt (get-instance this) k))
+              ([this k fallback] (.valAt (get-instance this) k fallback)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-collection-behaviour
+  {:cons (fn [this o] (.cons (get-instance this) o))
+   :count (fn [this] (.count (get-instance this)))
+   :empty (fn [this] (.empty (get-instance this)))
+   :equiv (fn [this o]
+           (and (= (get-class this) (get-class o))
+                (.equiv (get-instance this) (get-instance o))))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def persistent-map-behaviour
+  {:assoc (fn [this k v] (.assoc (get-instance this) k v))
+   :assocEx (fn [m k v] (throw (new Exception)))
+   :without (fn [this k] (.without (get-instance this) k))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def printable-behaviour
+  {:toString (fn [this] (.toString (get-instance this)))})</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(def seqable-behaviour
+  {:seq (fn [this] (.seq (get-instance this)))})</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr></table><div class="footer">Generated by <a href="https://github.com/gdeer81/marginalia">Marginalia</a>.&nbsp;&nbsp;Syntax highlighting provided by Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a><div id="floating-toc"><ul><li class="floating-toc-li" id="floating-toc_protobuf.util">protobuf.util</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.core">protobuf.impl.flatland.core</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.map">protobuf.impl.flatland.map</li><li class="floating-toc-li" id="floating-toc_protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</li><li class="floating-toc-li" id="floating-toc_protobuf.core">protobuf.core</li><li class="floating-toc-li" id="floating-toc_protobuf.common">protobuf.common</li></ul></div></div><script type="text/javascript">SyntaxHighlighter.defaults['gutter'] = false;
+SyntaxHighlighter.all();
+
+// hackity hack
+$(window).load(function() {
+    var ft = $("#floating-toc");
+    var ul = ft.find('ul');
+    var lis = ft.find('li');
+    var liHeight = $(lis.first()).height();
+
+    ul.css('margin', '0px');
+    ft.css('height', liHeight + 'px');
+
+    showNs = function(ns) {
+        var index = 0;
+
+        for(i in nsPositions.nss) {
+            if(ns == nsPositions.nss[i]) index = i;
+        }
+
+        if(index != lastNsIndex) {
+            lastNsIndex = index;
+            ul.animate({marginTop: (-1 * liHeight * index) + 'px'},
+               300);
+        }
+
+    }
+
+    var calcNsPositions = function() {
+        var hheight = $('.docs-header').first().height();
+        var nss = [];
+        var anchors = [];
+        var positions = [];
+        $.each(lis, function(i, el) {
+            var ns = $(el).attr('id').split('_')[1];
+            nss.push(ns);
+            var a = $("a[name='"+ns+"']");
+            anchors.push(a);
+            positions.push(a.offset().top - hheight);
+            // console.log(a.offset().top)
+        });
+
+        return {nss: nss, positions: positions};
+    }
+
+    var nsPositions = calcNsPositions();
+    // console.log(nsPositions)
+    var lastNsIndex = -1;
+    var $window = $(window);
+
+    var currentSection = function(nsp) {
+        var ps = nsp.positions;
+        var scroll = $window.scrollTop();
+        var nsIndex = -1;
+
+        for(var i = 0, length = ps.length; i < length; i++) {
+            if(ps[i] >= scroll) {
+                nsIndex = i-1;
+                break;
+            }
+        }
+
+        if(nsIndex == -1) {
+             if(scroll >= ps[0]) {
+                 nsIndex = ps.length - 1;
+             } else {
+                 nsIndex = 0;
+             }
+        }
+
+        return nsp.nss[nsIndex];
+    }
+
+    $(window).scroll(function(e) {
+        showNs(currentSection(nsPositions));
+    });
+});
+</script></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.codec.html b/docs/3.5.1-v1.1/protobuf.codec.html
new file mode 100644
index 0000000..a2dee29
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.common.html b/docs/3.5.1-v1.1/protobuf.common.html
new file mode 100644
index 0000000..bf44bc6
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.common.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.core.html b/docs/3.5.1-v1.1/protobuf.core.html
new file mode 100644
index 0000000..763181e
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.core.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.impl.flatland.codec.html b/docs/3.5.1-v1.1/protobuf.impl.flatland.codec.html
new file mode 100644
index 0000000..53c2723
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.impl.flatland.codec.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.impl.flatland.core.html b/docs/3.5.1-v1.1/protobuf.impl.flatland.core.html
new file mode 100644
index 0000000..1f33af9
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.impl.flatland.core.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-behaviour"><h3>behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.impl.flatland.map.html b/docs/3.5.1-v1.1/protobuf.impl.flatland.map.html
new file mode 100644
index 0000000..f4e2c81
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.impl.flatland.map.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.impl.flatland.mapdef.html b/docs/3.5.1-v1.1/protobuf.impl.flatland.mapdef.html
new file mode 100644
index 0000000..6421bb6
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.impl.flatland.mapdef.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.impl.flatland.schema.html b/docs/3.5.1-v1.1/protobuf.impl.flatland.schema.html
new file mode 100644
index 0000000..1aec4ed
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.impl.flatland.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.schema.html b/docs/3.5.1-v1.1/protobuf.schema.html
new file mode 100644
index 0000000..a06daac
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.schema.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="1200-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/3.5.1-v1.1/protobuf.util.html b/docs/3.5.1-v1.1/protobuf.util.html
new file mode 100644
index 0000000..d5c89c2
--- /dev/null
+++ b/docs/3.5.1-v1.1/protobuf.util.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html PUBLIC ""
+    "">
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index 82c6c9c..1365d64 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
+<html><head><meta charset="UTF-8" /><title>Basic Usage</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1  current"><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#basic-usage" name="basic-usage"></a>Basic Usage</h1>
 <h2><a href="#creating-a-file" name="creating-a-file"></a>Creating a <code>.proto</code> File</h2>
 <p>In the <code>resources/proto/examples</code> directory, the Clojure protobuf project provides an example “person” protobuf:</p>
 <pre><code class="proto">package protobuf.examples.person;
diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 74187c0..86a8d52 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
+<html><head><meta charset="UTF-8" /><title>Tutorial: Protocol Buffer Basics</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1  current"><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#tutorial-protocol-buffer-basics" name="tutorial-protocol-buffer-basics"></a>Tutorial: Protocol Buffer Basics</h1>
 <p><em>Note: The majority of the content for this tutorial was taken from the <a href="https://developers.google.com/protocol-buffers/docs/javatutorial">official Google protobuf Java tutorial</a>, with additions, removals, and other changes.</em></p>
 <h2><a href="#introduction" name="introduction"></a>Introduction</h2>
 <p>This tutorial provides a basic Clojure programmer’s introduction to working with protocol buffers. By walking through creating a simple example application, it shows you how to:</p>
diff --git a/docs/current/1100-extensions.html b/docs/current/1100-extensions.html
index c897be2..a7d5449 100644
--- a/docs/current/1100-extensions.html
+++ b/docs/current/1100-extensions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
+<html><head><meta charset="UTF-8" /><title>Extensions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1  current"><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#extensions" name="extensions"></a>Extensions</h1>
 <p>The Clojure protobuf library supports extensions to protocol buffers which provide sets and maps using repeated fields. Furthermore, the Clojure protobuf extension allows you to provide metadata on protobuf fields using Clojure syntax.</p>
 <p>To use these, you must import the extension <code>.proto</code> file in the protobuf file where you want to use our extensions and then include it when compiling.</p>
 <p>For example:</p>
diff --git a/docs/current/9800-marginalia.html b/docs/current/9800-marginalia.html
index 65c834a..bf57cf5 100644
--- a/docs/current/9800-marginalia.html
+++ b/docs/current/9800-marginalia.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
+<html><head><meta charset="UTF-8" /><title>Marginalia</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1  current"><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#marginalia" name="marginalia"></a>Marginalia</h1>
 <p>In addition to the Codox-generated docs and the Java docs, we also offer the Marginalia-style docs:</p>
 <ul>
   <li><a href="marginalia.html">Marginalia docs</a></li>
diff --git a/docs/current/9900-javadoc.html b/docs/current/9900-javadoc.html
index 207deaf..42aaded 100644
--- a/docs/current/9900-javadoc.html
+++ b/docs/current/9900-javadoc.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
+<html><head><meta charset="UTF-8" /><title>javadoc</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1  current"><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#javadoc" name="javadoc"></a>javadoc</h1>
 <p>Some of the source files in the Clojure protobuf project are written in Java. For these, <code>javadoc</code> has been run to generate their package docs:</p>
 <ul>
   <li><a href="javadoc/index.html">The Java API Reference for Clojure protobuf</a></li>
diff --git a/docs/current/9999-other-versions.html b/docs/current/9999-other-versions.html
index 9ab170d..18390f1 100644
--- a/docs/current/9999-other-versions.html
+++ b/docs/current/9999-other-versions.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
+<html><head><meta charset="UTF-8" /><title>Other Versions</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1  current"><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#other-versions" name="other-versions"></a>Other Versions</h1>
 <h3><a href="#api-reference" name="api-reference"></a>API Reference</h3>
 <ul>
   <li><a href="../current">Development</a></li>
+  <li><a href="../3.5.1-v1.1">3.5.1-v1.1</a></li>
   <li><a href="../3.5.1-v1.0">3.5.1-v1.0</a></li>
   <li><a href="../3.5.1-v0.3">3.5.1-v0.3</a></li>
 </ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/index.html b/docs/current/index.html
index 0a44927..3c996fb 100644
--- a/docs/current/index.html
+++ b/docs/current/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf 3.5.1-v1.1-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.5.1-v1.1-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf 3.6.0-v1.2-SNAPSHOT</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>A Clojure interface to Google's protocol buffers.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[clojusc/protobuf "3.6.0-v1.2-SNAPSHOT"]</pre><h2>Topics</h2><ul class="topics"><li><a href="1000-basic-usage.html">Basic Usage</a></li><li><a href="1050-tutorial.html">Tutorial: Protocol Buffer Basics</a></li><li><a href="1100-extensions.html">Extensions</a></li><li><a href="9800-marginalia.html">Marginalia</a></li><li><a href="9900-javadoc.html">javadoc</a></li><li><a href="9999-other-versions.html">Other Versions</a></li></ul><h2>Namespaces</h2><div class="namespace"><h3><a href="protobuf.common.html">protobuf.common</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.common.html#var-associative-behaviour">associative-behaviour</a> </li><li> <a href="protobuf.common.html#var-get-class">get-class</a> </li><li> <a href="protobuf.common.html#var-get-instance">get-instance</a> </li><li> <a href="protobuf.common.html#var-get-wrapper">get-wrapper</a> </li><li> <a href="protobuf.common.html#var-iterable-behaviour">iterable-behaviour</a> </li><li> <a href="protobuf.common.html#var-lookup-behaviour">lookup-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-collection-behaviour">persistent-collection-behaviour</a> </li><li> <a href="protobuf.common.html#var-persistent-map-behaviour">persistent-map-behaviour</a> </li><li> <a href="protobuf.common.html#var-printable-behaviour">printable-behaviour</a> </li><li> <a href="protobuf.common.html#var-seqable-behaviour">seqable-behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.core.html">protobuf.core</a></h3><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.core.html#var-create">create</a> </li><li> <a href="protobuf.core.html#var-default-impl-name">default-impl-name</a> </li><li> <a href="protobuf.core.html#var-get-impl">get-impl</a> </li><li> <a href="protobuf.core.html#var-ProtoBufAPI">ProtoBufAPI</a> </li><li> <a href="protobuf.core.html#var-schema">schema</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.codec.html">protobuf.impl.flatland.codec</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.codec.html#var-codec-schema">codec-schema</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-decode">decode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-encode">encode</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-length-prefix">length-prefix</a> </li><li> <a href="protobuf.impl.flatland.codec.html#var-protobuf-codec">protobuf-codec</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.core.html">protobuf.impl.flatland.core</a></h3><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.core.html#var-behaviour">behaviour</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.map.html">protobuf.impl.flatland.map</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.map.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-get-raw">get-raw</a> </li><li> <a href="protobuf.impl.flatland.map.html#var-map.3F">map?</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.mapdef.html">protobuf.impl.flatland.mapdef</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes">-&gt;bytes</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-combine">combine</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-create">create</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef">mapdef</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema">mapdef-&gt;schema</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F">mapdef?</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-parse">parse</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-read">read</a> </li><li> <a href="protobuf.impl.flatland.mapdef.html#var-write">write</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.impl.flatland.schema.html">protobuf.impl.flatland.schema</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.impl.flatland.schema.html#var-basic-schema">basic-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-extension">extension</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-schema">field-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-field-type">field-type</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-struct-schema">struct-schema</a> </li><li> <a href="protobuf.impl.flatland.schema.html#var-subfield">subfield</a> </li></ul></div></div><div class="namespace"><h3><a href="protobuf.util.html">protobuf.util</a></h3><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="protobuf.util.html#var-as-fn">as-fn</a> </li><li> <a href="protobuf.util.html#var-catbytes">catbytes</a> </li><li> <a href="protobuf.util.html#var-combine">combine</a> </li><li> <a href="protobuf.util.html#var-Combiner">Combiner</a> </li><li> <a href="protobuf.util.html#var-dissoc-fields">dissoc-fields</a> </li><li> <a href="protobuf.util.html#var-fix">fix</a> </li><li> <a href="protobuf.util.html#var-given">given</a> </li><li> <a href="protobuf.util.html#var-into-set">into-set</a> </li><li> <a href="protobuf.util.html#var-map-entry">map-entry</a> </li><li> <a href="protobuf.util.html#var-map-vals">map-vals</a> </li><li> <a href="protobuf.util.html#var-postwalk">postwalk</a> </li><li> <a href="protobuf.util.html#var-prewalk">prewalk</a> </li><li> <a href="protobuf.util.html#var-to-fix">to-fix</a> </li><li> <a href="protobuf.util.html#var-update">update</a> </li><li> <a href="protobuf.util.html#var-update-in*">update-in*</a> </li><li> <a href="protobuf.util.html#var-walk">walk</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 75c059e..d8cb3aa 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index d73e3bd..87b4ddf 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index c8c633e..8b148b4 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 0de3806..fae9e66 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index cc03827..01e2121 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 2eb48dc..2e120c6 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 2d9fd7f..f18a920 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index e451581..56cd344 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 88607ae..3d6cf92 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index e1c930b..9fc7d57 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 547f339..9e4c3d9 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 06d8ff1..4e954ae 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index a500e81..d98f8b6 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 71a7b3c..c4d7d44 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 25dc5ee..7a599f3 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index d17dcc7..e5dd20b 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:05 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 40d06ed..3ab139d 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -2865,8 +2865,8 @@
     build_tree: build_tree
   };
 })(SyntaxHighlighter);
-</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.5.1-v1.1-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
-</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.5.1</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.6.0-v1.2-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.6.0</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
   (:import
     (clojure.lang IDeref
diff --git a/docs/current/protobuf.common.html b/docs/current/protobuf.common.html
index bd97d67..908ec7b 100644
--- a/docs/current/protobuf.common.html
+++ b/docs/current/protobuf.common.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.common documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch current"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.common.html#var-associative-behaviour"><div class="inner"><span>associative-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-class"><div class="inner"><span>get-class</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-instance"><div class="inner"><span>get-instance</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-get-wrapper"><div class="inner"><span>get-wrapper</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-iterable-behaviour"><div class="inner"><span>iterable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-lookup-behaviour"><div class="inner"><span>lookup-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-collection-behaviour"><div class="inner"><span>persistent-collection-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-persistent-map-behaviour"><div class="inner"><span>persistent-map-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-printable-behaviour"><div class="inner"><span>printable-behaviour</span></div></a></li><li class="depth-1"><a href="protobuf.common.html#var-seqable-behaviour"><div class="inner"><span>seqable-behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.common</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-associative-behaviour"><h3>associative-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-class"><h3>get-class</h3><div class="usage"><code>(get-class this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-instance"><h3>get-instance</h3><div class="usage"><code>(get-instance this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-wrapper"><h3>get-wrapper</h3><div class="usage"><code>(get-wrapper this)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-iterable-behaviour"><h3>iterable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-lookup-behaviour"><h3>lookup-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-collection-behaviour"><h3>persistent-collection-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-persistent-map-behaviour"><h3>persistent-map-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-printable-behaviour"><h3>printable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-seqable-behaviour"><h3>seqable-behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 24786c1..3a9ea55 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.codec.html b/docs/current/protobuf.impl.flatland.codec.html
index f86f6a1..86ff479 100644
--- a/docs/current/protobuf.impl.flatland.codec.html
+++ b/docs/current/protobuf.impl.flatland.codec.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.codec documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-codec-schema"><div class="inner"><span>codec-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-decode"><div class="inner"><span>decode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-encode"><div class="inner"><span>encode</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-length-prefix"><div class="inner"><span>length-prefix</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.codec.html#var-protobuf-codec"><div class="inner"><span>protobuf-codec</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.codec</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-codec-schema"><h3>codec-schema</h3><div class="usage"><code>(codec-schema proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create proto &amp; {:keys [validator repeated]})</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-decode"><h3>decode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Decoder for a codec.</p></div></div></div><div class="public anchor" id="var-encode"><h3>encode</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Encoder for a codec.</p></div></div></div><div class="public anchor" id="var-length-prefix"><h3>length-prefix</h3><div class="usage"><code>(length-prefix proto)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-protobuf-codec"><h3>protobuf-codec</h3><h4 class="deprecated">deprecated in 3.5.1-v1.0</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Backwards-compatible alias for <code>create</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.core.html b/docs/current/protobuf.impl.flatland.core.html
index 0e08544..70a3db4 100644
--- a/docs/current/protobuf.impl.flatland.core.html
+++ b/docs/current/protobuf.impl.flatland.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.core.html#var-behaviour"><div class="inner"><span>behaviour</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.core</h1><div class="doc"><div class="markdown"><p>This implementation takes its name from the original code for this project that was done under the flatland Github org and which pulled in several flatland libraries as dependencies.</p>
 <p>This namespace is an internal implementation detail not intended for developers. The API for working with all implementations of protocol buffer backends for this project is provided in the <code>protobuf.core</code> namespace.</p></div></div><div class="public anchor" id="var-behaviour"><h3>behaviour</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.map.html b/docs/current/protobuf.impl.flatland.map.html
index aac1748..63dc6bc 100644
--- a/docs/current/protobuf.impl.flatland.map.html
+++ b/docs/current/protobuf.impl.flatland.map.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.map documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-get-raw"><div class="inner"><span>get-raw</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.map.html#var-map.3F"><div class="inner"><span>map?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.map</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes p)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-get-raw"><h3>get-raw</h3><div class="usage"><code>(get-raw p key)</code></div><div class="doc"><div class="markdown"><p>Get value at key ignoring extension fields.</p></div></div></div><div class="public anchor" id="var-map.3F"><h3>map?</h3><div class="usage"><code>(map? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap?</code></p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.mapdef.html b/docs/current/protobuf.impl.flatland.mapdef.html
index 8c0f30c..ad73a51 100644
--- a/docs/current/protobuf.impl.flatland.mapdef.html
+++ b/docs/current/protobuf.impl.flatland.mapdef.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.mapdef documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch current"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var--.3Ebytes"><div class="inner"><span>-&gt;bytes</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef"><div class="inner"><span>mapdef</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef-.3Eschema"><div class="inner"><span>mapdef-&gt;schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-mapdef.3F"><div class="inner"><span>mapdef?</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-parse"><div class="inner"><span>parse</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-read"><div class="inner"><span>read</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.mapdef.html#var-write"><div class="inner"><span>write</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.mapdef</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes map-def m)</code></div><div class="doc"><div class="markdown"><p>Return the byte representation of the given protobuf.</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>A convenience alias for <code>util/combine</code></p></div></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create map-def)</code><code>(create map-def m)</code><code>(create map-def k v &amp; kvs)</code></div><div class="doc"><div class="markdown"><p>Construct a protobuf of the given map-def.</p></div></div></div><div class="public anchor" id="var-mapdef"><h3>mapdef</h3><div class="usage"><code>(mapdef map-def)</code><code>(mapdef map-def opts)</code></div><div class="doc"><div class="markdown"><p>Create a protocol buffer map definition from a string or protobuf class.</p></div></div></div><div class="public anchor" id="var-mapdef-.3Eschema"><h3>mapdef-&gt;schema</h3><div class="usage"><code>(mapdef-&gt;schema &amp; args)</code></div><div class="doc"><div class="markdown"><p>Return the schema for the given mapdef.</p></div></div></div><div class="public anchor" id="var-mapdef.3F"><h3>mapdef?</h3><div class="usage"><code>(mapdef? obj)</code></div><div class="doc"><div class="markdown"><p>Is the given object a <code>PersistentProtocolBufferMap$Def?</code></p></div></div></div><div class="public anchor" id="var-parse"><h3>parse</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Load a protobuf of the given map-def from a data source.</p>
 <p>Supported data sources are either an array of bytes or an input stream.</p></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read map-def in)</code></div><div class="doc"><div class="markdown"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def from the given input stream.</p></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write out &amp; ps)</code></div><div class="doc"><div class="markdown"><p>Write the given protobufs to the given output stream, prefixing each with its length to delimit them.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.impl.flatland.schema.html b/docs/current/protobuf.impl.flatland.schema.html
index 94a337a..73527c9 100644
--- a/docs/current/protobuf.impl.flatland.schema.html
+++ b/docs/current/protobuf.impl.flatland.schema.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.impl.flatland.schema documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4 current"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-basic-schema"><div class="inner"><span>basic-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-extension"><div class="inner"><span>extension</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-schema"><div class="inner"><span>field-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-field-type"><div class="inner"><span>field-type</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-struct-schema"><div class="inner"><span>struct-schema</span></div></a></li><li class="depth-1"><a href="protobuf.impl.flatland.schema.html#var-subfield"><div class="inner"><span>subfield</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.impl.flatland.schema</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-basic-schema"><h3>basic-schema</h3><div class="usage"><code>(basic-schema field map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-extension"><h3>extension</h3><div class="usage"><code>(extension ext field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-schema"><h3>field-schema</h3><h4 class="type">multimethod</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-field-type"><h3>field-type</h3><div class="usage"><code>(field-type field)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-struct-schema"><h3>struct-schema</h3><div class="usage"><code>(struct-schema struct map-def &amp; [parents])</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-subfield"><h3>subfield</h3><div class="usage"><code>(subfield field field-name)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/protobuf.util.html b/docs/current/protobuf.util.html
index 5f42ee3..fc52a63 100644
--- a/docs/current/protobuf.util.html
+++ b/docs/current/protobuf.util.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.5.1-v1.1-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>protobuf.util documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2 current"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.util.html#var-as-fn"><div class="inner"><span>as-fn</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-catbytes"><div class="inner"><span>catbytes</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-combine"><div class="inner"><span>combine</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-Combiner"><div class="inner"><span>Combiner</span></div></a></li><li class="depth-2"><a href="protobuf.util.html#var-combine-onto"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>combine-onto</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-dissoc-fields"><div class="inner"><span>dissoc-fields</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-fix"><div class="inner"><span>fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-given"><div class="inner"><span>given</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-into-set"><div class="inner"><span>into-set</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-entry"><div class="inner"><span>map-entry</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-map-vals"><div class="inner"><span>map-vals</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-postwalk"><div class="inner"><span>postwalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-prewalk"><div class="inner"><span>prewalk</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-to-fix"><div class="inner"><span>to-fix</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update"><div class="inner"><span>update</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-update-in*"><div class="inner"><span>update-in*</span></div></a></li><li class="depth-1"><a href="protobuf.util.html#var-walk"><div class="inner"><span>walk</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.util</h1><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div><div class="public anchor" id="var-as-fn"><h3>as-fn</h3><div class="usage"><code>(as-fn x)</code></div><div class="doc"><div class="markdown"><p>Turn an object into a fn if it is not already, by wrapping it in constantly.</p></div></div></div><div class="public anchor" id="var-catbytes"><h3>catbytes</h3><div class="usage"><code>(catbytes &amp; args)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-combine"><h3>combine</h3><div class="usage"><code>(combine a b)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div><div class="public anchor" id="var-Combiner"><h3>Combiner</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var-combine-onto"><h3>combine-onto</h3><div class="usage"><code>(combine-onto left right)</code></div><div class="doc"><div class="markdown"><p>Merge two data structures by combining the contents. For maps, merge recursively by adjoining values with the same key. For collections, combine the right and left using into or conj. If the left value is a set and the right value is a map, the right value is assumed to be an existence map where the value determines whether the key is in the merged set. This makes sets unique from other collections because items can be deleted from them.</p></div></div></div></div></div></div><div class="public anchor" id="var-dissoc-fields"><h3>dissoc-fields</h3><div class="usage"><code>(dissoc-fields schema &amp; fields)</code></div><div class="doc"><div class="markdown"><p>Traverse the given schema, removing the given fields at any level.</p></div></div></div><div class="public anchor" id="var-fix"><h3>fix</h3><div class="usage"><code>(fix x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>Walk through clauses, a series of predicate/transform pairs. The first predicate that x satisfies has its transformation clause called on x. Predicates or transforms may be values (eg true or nil) rather than functions; these will be treated as functions that return that value. The last “pair” may be only a transform with no pred: in that case it is unconditionally used to transform x, if nothing previously matched. If no predicate matches, then x is returned unchanged.</p></div></div></div><div class="public anchor" id="var-given"><h3>given</h3><h4 class="type">macro</h4><div class="usage"><code>(given x &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A macro combining the features of fix and fixing, by using parentheses to group the additional arguments to each clause: (-&gt; x  (given string? read-string  map? (dissoc :x :y :z)  even? (/ 2)))</p></div></div></div><div class="public anchor" id="var-into-set"><h3>into-set</h3><div class="usage"><code>(into-set set map)</code></div><div class="doc"><div class="markdown"><p>Update the given set using an existence map.</p></div></div></div><div class="public anchor" id="var-map-entry"><h3>map-entry</h3><h4 class="type">macro</h4><div class="usage"><code>(map-entry a b)</code></div><div class="doc"><div class="markdown"><p>Create a clojure.lang.MapEntry from a and b. Equivalent to a cons cell. flatland.useful.experimental.unicode contains a shortcut to this, named ·.</p></div></div></div><div class="public anchor" id="var-map-vals"><h3>map-vals</h3><div class="usage"><code>(map-vals m f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Create a new map from m by calling function f on each value to get a new value.</p></div></div></div><div class="public anchor" id="var-postwalk"><h3>postwalk</h3><div class="usage"><code>(postwalk f schema)</code></div><div class="doc"><div class="markdown"><p>Perform a depth-first, post-order traversal of all types within the given schema, replacing each and type with the result of calling f on it.</p></div></div></div><div class="public anchor" id="var-prewalk"><h3>prewalk</h3><div class="usage"><code>(prewalk f schema)</code></div><div class="doc"><div class="markdown"><p>Like postwalk, but do a pre-order traversal.</p></div></div></div><div class="public anchor" id="var-to-fix"><h3>to-fix</h3><div class="usage"><code>(to-fix &amp; clauses)</code></div><div class="doc"><div class="markdown"><p>A “curried” version of fix, which sets the clauses once, yielding a function that calls fix with the specified first argument.</p></div></div></div><div class="public anchor" id="var-update"><h3>update</h3><div class="usage"><code>(update m key f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Update a value for the given key in a map where f is a function that takes the previous value and the supplied args and returns the new value. Like update-in*, unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-update-in*"><h3>update-in*</h3><div class="usage"><code>(update-in* m keys f &amp; args)</code></div><div class="doc"><div class="markdown"><p>Updates a value in a nested associative structure, where ks is a sequence of keys and f is a function that will take the old value and any supplied args and return the new value, and returns a new nested structure. If any levels do not exist, hash-maps will be created. This implementation was adapted from clojure.core, but the behavior is more correct if keys is empty and unchanged values are not re-assoc’d.</p></div></div></div><div class="public anchor" id="var-walk"><h3>walk</h3><div class="usage"><code>(walk inner outer schema)</code></div><div class="doc"><div class="markdown"><p>Traverse all child types of the given schema, calling inner on each, then call outer on the result.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/resources/docs/9999-other-versions.md b/resources/docs/9999-other-versions.md
index 9e4ac3a..a698afd 100644
--- a/resources/docs/9999-other-versions.md
+++ b/resources/docs/9999-other-versions.md
@@ -3,5 +3,6 @@
 ### API Reference
 
 * [Development](../current)
+* [3.5.1-v1.1](../3.5.1-v1.1)
 * [3.5.1-v1.0](../3.5.1-v1.0)
 * [3.5.1-v0.3](../3.5.1-v0.3)

From 3a0193836589e4bb6c859c31cab57a6f37a8d766 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 22:32:54 -0500
Subject: [PATCH 479/525] Added branch link.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87cf68c..e1592be 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
-| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java
+| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java (see the branch [release/1.2.x](https://github.com/clojusc/protobuf/tree/release/1.2.x))
 | 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
 | 3.5.1-v0.3          | Bumped to latest release of protobuf-java, re-added tests, Travis CI support

From de0dafc6a628eb65e421ef8115150632b9c93ffa Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 22:34:13 -0500
Subject: [PATCH 480/525] Regen'ed docs for new dev version.

---
 docs/current/javadoc/allclasses-frame.html                      | 2 +-
 docs/current/javadoc/allclasses-noframe.html                    | 2 +-
 docs/current/javadoc/constant-values.html                       | 2 +-
 docs/current/javadoc/deprecated-list.html                       | 2 +-
 docs/current/javadoc/help-doc.html                              | 2 +-
 docs/current/javadoc/index-all.html                             | 2 +-
 docs/current/javadoc/index.html                                 | 2 +-
 docs/current/javadoc/overview-tree.html                         | 2 +-
 docs/current/javadoc/protobuf/Extensions.html                   | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html         | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html       | 2 +-
 docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html  | 2 +-
 docs/current/javadoc/protobuf/package-frame.html                | 2 +-
 docs/current/javadoc/protobuf/package-summary.html              | 2 +-
 docs/current/javadoc/protobuf/package-tree.html                 | 2 +-
 docs/current/javadoc/serialized-form.html                       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index d8cb3aa..c06411b 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index 87b4ddf..e9e114f 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 8b148b4..0c74b45 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index fae9e66..3ecdf79 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 01e2121..1851b50 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 2e120c6..9d89c3b 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index f18a920..286113f 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:49 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 56cd344..1fdc976 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index 3d6cf92..e42d362 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 9fc7d57..cfd4091 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 9e4c3d9..6e2a1a1 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 4e954ae..fbbbd52 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index d98f8b6..36c2b48 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index c4d7d44..4df20f7 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 7a599f3..7c73319 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index e5dd20b..203e904 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:46:48 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

From 63d497986e0720a877427bc5dc11e5541580d8bd Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Mon, 2 Jul 2018 23:58:29 -0500
Subject: [PATCH 481/525] Fixed issue with default enum value not rendering its
 value in Clojure.

---
 src/clj/protobuf/impl/flatland/schema.clj |  4 +++-
 test/protobuf/core_test.clj               | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 test/protobuf/core_test.clj

diff --git a/src/clj/protobuf/impl/flatland/schema.clj b/src/clj/protobuf/impl/flatland/schema.clj
index d0d3361..9e5602d 100644
--- a/src/clj/protobuf/impl/flatland/schema.clj
+++ b/src/clj/protobuf/impl/flatland/schema.clj
@@ -61,7 +61,9 @@
                                          (.. field getEnumType getValues)))}
              {:type java-type})
            (when (.hasDefaultValue field)
-             {:default (.getDefaultValue field)})
+             {:default (case java-type
+                         :enum (keyword (str (.getDefaultValue field)))
+                         (.getDefaultValue field))})
            (when meta-string
              (read-string meta-string)))))
 
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
new file mode 100644
index 0000000..d9d1cad
--- /dev/null
+++ b/test/protobuf/core_test.clj
@@ -0,0 +1,15 @@
+(ns protobuf.core-test
+  (:require
+    [clojure.test :refer :all]
+    [protobuf.core :as protobuf])
+  (:import
+    (protobuf.examples.tutorial AddressBookProtos$AddressBook)))
+
+(deftest ->schema
+  (let [AddressBook (protobuf/create AddressBookProtos$AddressBook)
+        schema (protobuf/->schema AddressBook)]
+    (is (= :home
+           (get-in (protobuf/->schema AddressBook)
+                   [:fields :people :values
+                    :fields :phones :values
+                    :fields :type :default])))))

From bd51c035e8e4a36b65bb64b666637ff7635d5603 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Tue, 3 Jul 2018 00:07:01 -0500
Subject: [PATCH 482/525] Updated docs for fix to rendering default enum value.

---
 resources/docs/1050-tutorial.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/docs/1050-tutorial.md b/resources/docs/1050-tutorial.md
index b4914e3..9fa5cbd 100644
--- a/resources/docs/1050-tutorial.md
+++ b/resources/docs/1050-tutorial.md
@@ -291,8 +291,7 @@ We can view the full, nested data schema in Clojure data:
         :type
         {:type :enum,
          :values #{:home :work :mobile},
-         :default
-         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+         :default :home}}}}}}}}}
 nil
 ```
 

From 341f58f719266da1d372359ea73c57a01c7a0b7e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Tue, 3 Jul 2018 00:07:38 -0500
Subject: [PATCH 483/525] Regen'ed docs.

---
 docs/current/1050-tutorial.html                               | 3 +--
 docs/current/javadoc/allclasses-frame.html                    | 2 +-
 docs/current/javadoc/allclasses-noframe.html                  | 2 +-
 docs/current/javadoc/constant-values.html                     | 2 +-
 docs/current/javadoc/deprecated-list.html                     | 2 +-
 docs/current/javadoc/help-doc.html                            | 2 +-
 docs/current/javadoc/index-all.html                           | 2 +-
 docs/current/javadoc/index.html                               | 2 +-
 docs/current/javadoc/overview-tree.html                       | 2 +-
 docs/current/javadoc/protobuf/Extensions.html                 | 2 +-
 .../PersistentProtocolBufferMap.Def.NamingStrategy.html       | 2 +-
 .../javadoc/protobuf/PersistentProtocolBufferMap.Def.html     | 2 +-
 .../current/javadoc/protobuf/PersistentProtocolBufferMap.html | 2 +-
 docs/current/javadoc/protobuf/package-frame.html              | 2 +-
 docs/current/javadoc/protobuf/package-summary.html            | 2 +-
 docs/current/javadoc/protobuf/package-tree.html               | 2 +-
 docs/current/javadoc/serialized-form.html                     | 2 +-
 docs/current/marginalia.html                                  | 4 +++-
 18 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/current/1050-tutorial.html b/docs/current/1050-tutorial.html
index 86a8d52..cdf9cca 100644
--- a/docs/current/1050-tutorial.html
+++ b/docs/current/1050-tutorial.html
@@ -149,8 +149,7 @@ <h3><a href="#setup" name="setup"></a>Setup</h3>
         :type
         {:type :enum,
          :values #{:home :work :mobile},
-         :default
-         #object[com.google.protobuf.Descriptors$EnumValueDescriptor 0x1df8368f "HOME"]}}}}}}}}}
+         :default :home}}}}}}}}}
 nil
 </code></pre>
 <p></p><blockquote> There’s currently a bug/missing feature where the default value of an <code>enum</code> is not converted to Clojure data.<p></p>
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index c06411b..66c88a7 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index e9e114f..a336d9a 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 0c74b45..573d73a 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 3ecdf79..4877393 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 1851b50..3f24741 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 9d89c3b..4ede4af 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index 286113f..b855921 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 1fdc976..0eca789 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index e42d362..a4b6923 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index cfd4091..33c21e4 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 6e2a1a1..95653e6 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index fbbbd52..1b0e881 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 36c2b48..7c93d67 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 4df20f7..8cf40be 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 7c73319..73a982c 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 203e904..28e4fa5 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:47:35 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
 <meta name="date" content="2018-07-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 3ab139d..2d3f980 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -3079,7 +3079,9 @@
                                          (.. field getEnumType getValues)))}
              {:type java-type})
            (when (.hasDefaultValue field)
-             {:default (.getDefaultValue field)})
+             {:default (case java-type
+                         :enum (keyword (str (.getDefaultValue field)))
+                         (.getDefaultValue field))})
            (when meta-string
              (read-string meta-string)))))</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn subfield

From 569cae986a8539e7feeec67ddc28e954c1c09b31 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 21 Oct 2008 07:00:00 -0700
Subject: [PATCH 484/525] Initial Contribution


From 975c92e85fd093b657787a5a3821ea3b54008f8a Mon Sep 17 00:00:00 2001
From: Jon Skeet <skeet@pobox.com>
Date: Thu, 14 Aug 2008 20:33:26 +0100
Subject: [PATCH 485/525] Initial commit of C# code developed before installing
 Git.

committer: Jon Skeet <skeet@pobox.com>

From 34a35e526620e01a8269ba31e86e3b60384246f5 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Wed, 27 Apr 2016 18:34:33 -0700
Subject: [PATCH 486/525] Added README describing the directory.

---
 benchmarks/README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 benchmarks/README.md

diff --git a/benchmarks/README.md b/benchmarks/README.md
new file mode 100644
index 0000000..c902780
--- /dev/null
+++ b/benchmarks/README.md
@@ -0,0 +1,28 @@
+
+# Protocol Buffers Benchmarks
+
+This directory contains benchmarking schemas and data sets that you
+can use to test a variety of performance scenarios against your
+protobuf language runtime.
+
+The schema for the datasets is described in `benchmarks.proto`.
+
+Generate the data sets like so:
+
+```
+$ make
+$ ./generate-datasets
+Wrote dataset: dataset.google_message1_proto3.pb
+Wrote dataset: dataset.google_message1_proto2.pb
+Wrote dataset: dataset.google_message2.pb
+$
+```
+
+Each data set will be written to its own file.  Benchmarks will
+likely want to run several benchmarks against each data set (parse,
+serialize, possibly JSON, possibly using different APIs, etc).
+
+We would like to add more data sets.  In general we will favor data sets
+that make the overall suite diverse without being too large or having
+too many similar tests.  Ideally everyone can run through the entire
+suite without the test run getting too long.

From c95b90bfd79c24d15369bd07b6f11394b527cb34 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Fri, 1 Dec 2017 11:55:38 -0800
Subject: [PATCH 487/525] Sync internal benchmark changes

---
 benchmarks/README.md | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index c902780..0273e38 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -7,19 +7,42 @@ protobuf language runtime.
 
 The schema for the datasets is described in `benchmarks.proto`.
 
-Generate the data sets like so:
+To run all the benchmark dataset:
+
+For java:
+
+```
+$ make java
+```
+
+For cpp:
 
 ```
-$ make
-$ ./generate-datasets
-Wrote dataset: dataset.google_message1_proto3.pb
-Wrote dataset: dataset.google_message1_proto2.pb
-Wrote dataset: dataset.google_message2.pb
-$
+$ make cpp
 ```
 
-Each data set will be written to its own file.  Benchmarks will
-likely want to run several benchmarks against each data set (parse,
+To run a specific dataset:
+
+For java:
+
+```
+$ make java
+$ ./java-benchmark $(specific generated dataset file name)
+```
+
+For cpp:
+
+```
+$ make cpp
+$ ./cpp-benchmark $(specific generated dataset file name)
+```
+
+Each data set is in the format of benchmarks.proto:
+1. name is the benchmark dataset's name.
+2. message_name is the benchmark's message type full name (including package and message name)
+3. payload is the list of raw data.
+
+Benchmark likely want to run several benchmarks against each data set (parse,
 serialize, possibly JSON, possibly using different APIs, etc).
 
 We would like to add more data sets.  In general we will favor data sets

From 8389d460a7a3a9558fe4706f9cb1ee4e6285b88a Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Tue, 12 Dec 2017 12:05:29 -0800
Subject: [PATCH 488/525] Add caliper supported to java benchmark

---
 benchmarks/README.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 0273e38..00a6370 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -7,6 +7,18 @@ protobuf language runtime.
 
 The schema for the datasets is described in `benchmarks.proto`.
 
+The benchmark is based on some submodules. To initialize the submodues:
+
+For java:
+```
+$ ./initialize_submodule.sh java
+```
+
+For java:
+```
+$ ./initialize_submodule.sh cpp
+```
+
 To run all the benchmark dataset:
 
 For java:
@@ -26,17 +38,24 @@ To run a specific dataset:
 For java:
 
 ```
-$ make java
+$ make java-benchmark
 $ ./java-benchmark $(specific generated dataset file name)
 ```
 
 For cpp:
 
 ```
-$ make cpp
+$ make cpp-benchmark
 $ ./cpp-benchmark $(specific generated dataset file name)
 ```
 
+There's some big testing data not included in the directory initially, you need to 
+run the following command to download the testing data:
+
+```
+$ ./download_data.sh 
+```
+
 Each data set is in the format of benchmarks.proto:
 1. name is the benchmark dataset's name.
 2. message_name is the benchmark's message type full name (including package and message name)

From 97cc408c7dcb81eb4cf5a33995593b89bde273ac Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Wed, 13 Dec 2017 14:34:52 -0800
Subject: [PATCH 489/525] Fix bugs

---
 benchmarks/README.md | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 00a6370..f266d41 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -5,20 +5,31 @@ This directory contains benchmarking schemas and data sets that you
 can use to test a variety of performance scenarios against your
 protobuf language runtime.
 
-The schema for the datasets is described in `benchmarks.proto`.
+## Benchmark tools and build instructions
 
-The benchmark is based on some submodules. To initialize the submodues:
+First, you need to follow the instruction in the root directory's README to 
+build your language's protobuf, then:
 
-For java:
-```
-$ ./initialize_submodule.sh java
-```
+### CPP
+We are using [google/benchmark](https://github.com/google/benchmark) as the 
+benchmark tool for testing cpp. This is included as submodule under third_party
+directory. To init and build this tools, you need to do this under root dirctory:
 
-For java:
 ```
-$ ./initialize_submodule.sh cpp
+$ cd third_party
+$ git submodule update --init -r
+$ cd benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make && cd ../..
 ```
 
+### JAVA
+We're using maven to build the java benchmarks, which is the same as to build 
+the Java protobuf. There're no other tools need to install. We're using 
+[google/caliper](https://github.com/google/caliper) as benchmark tool, which 
+can be automaticly included by maven.
+  
+
+## Run instructions
+
 To run all the benchmark dataset:
 
 For java:
@@ -49,6 +60,8 @@ $ make cpp-benchmark
 $ ./cpp-benchmark $(specific generated dataset file name)
 ```
 
+## Benchmark datasets
+
 There's some big testing data not included in the directory initially, you need to 
 run the following command to download the testing data:
 
@@ -57,10 +70,13 @@ $ ./download_data.sh
 ```
 
 Each data set is in the format of benchmarks.proto:
+
 1. name is the benchmark dataset's name.
 2. message_name is the benchmark's message type full name (including package and message name)
 3. payload is the list of raw data.
 
+The schema for the datasets is described in `benchmarks.proto`.
+
 Benchmark likely want to run several benchmarks against each data set (parse,
 serialize, possibly JSON, possibly using different APIs, etc).
 

From d358755f665d67ba48d78304718ede975b8244ff Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Thu, 14 Dec 2017 17:26:16 -0800
Subject: [PATCH 490/525] add cpp

---
 benchmarks/README.md | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index f266d41..9621053 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -5,21 +5,17 @@ This directory contains benchmarking schemas and data sets that you
 can use to test a variety of performance scenarios against your
 protobuf language runtime.
 
-## Benchmark tools and build instructions
+## Prerequisite
 
 First, you need to follow the instruction in the root directory's README to 
 build your language's protobuf, then:
 
 ### CPP
-We are using [google/benchmark](https://github.com/google/benchmark) as the 
-benchmark tool for testing cpp. This is included as submodule under third_party
-directory. To init and build this tools, you need to do this under root dirctory:
+You need to install [cmake](https://cmake.org/) before building the benchmark.
 
-```
-$ cd third_party
-$ git submodule update --init -r
-$ cd benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make && cd ../..
-```
+We are using [google/benchmark](https://github.com/google/benchmark) as the 
+benchmark tool for testing cpp. This will be automaticly made during build the 
+cpp benchmark.
 
 ### JAVA
 We're using maven to build the java benchmarks, which is the same as to build 
@@ -62,13 +58,15 @@ $ ./cpp-benchmark $(specific generated dataset file name)
 
 ## Benchmark datasets
 
-There's some big testing data not included in the directory initially, you need to 
+There's some optional big testing data which is not included in the directory initially, you need to 
 run the following command to download the testing data:
 
 ```
 $ ./download_data.sh 
 ```
 
+After doing this the big data file will automaticly generated in the benchmark directory.
+
 Each data set is in the format of benchmarks.proto:
 
 1. name is the benchmark dataset's name.

From c748d4f1f272d50844e4162f5e1459a95a790cee Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Tue, 2 Jan 2018 09:57:04 -0800
Subject: [PATCH 491/525] Changed README

---
 benchmarks/README.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 9621053..09c0690 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -22,7 +22,17 @@ We're using maven to build the java benchmarks, which is the same as to build
 the Java protobuf. There're no other tools need to install. We're using 
 [google/caliper](https://github.com/google/caliper) as benchmark tool, which 
 can be automaticly included by maven.
-  
+
+### Big data
+
+There's some optional big testing data which is not included in the directory initially, you need to 
+run the following command to download the testing data:
+
+```
+$ ./download_data.sh 
+```
+
+After doing this the big data file will automaticly generated in the benchmark directory.  
 
 ## Run instructions
 
@@ -46,7 +56,7 @@ For java:
 
 ```
 $ make java-benchmark
-$ ./java-benchmark $(specific generated dataset file name)
+$ ./java-benchmark $(specific generated dataset file name) [-- $(caliper option)]
 ```
 
 For cpp:
@@ -58,15 +68,6 @@ $ ./cpp-benchmark $(specific generated dataset file name)
 
 ## Benchmark datasets
 
-There's some optional big testing data which is not included in the directory initially, you need to 
-run the following command to download the testing data:
-
-```
-$ ./download_data.sh 
-```
-
-After doing this the big data file will automaticly generated in the benchmark directory.
-
 Each data set is in the format of benchmarks.proto:
 
 1. name is the benchmark dataset's name.

From 002382891aa08bd41c7e2916a325d258d8e7658c Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Fri, 5 Jan 2018 11:20:40 -0800
Subject: [PATCH 492/525] Add python benchmark

---
 benchmarks/README.md | 69 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 09c0690..71104d6 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -17,12 +17,25 @@ We are using [google/benchmark](https://github.com/google/benchmark) as the
 benchmark tool for testing cpp. This will be automaticly made during build the 
 cpp benchmark.
 
-### JAVA
+### Java
 We're using maven to build the java benchmarks, which is the same as to build 
 the Java protobuf. There're no other tools need to install. We're using 
 [google/caliper](https://github.com/google/caliper) as benchmark tool, which 
 can be automaticly included by maven.
 
+### Python
+We're using python C++ API for testing the generated 
+CPP proto version of python protobuf, which is also a prerequisite for Python
+protobuf cpp implementation. You need to install the correct version of Python 
+C++ extension package before run generated CPP proto version of Python 
+protobuf's benchmark. e.g. under Ubuntu, you need to 
+
+```
+$ sudo apt-get install python-dev 
+$ sudo apt-get install python3-dev
+```
+And you also need to make sure `pkg-config` is installed.  
+
 ### Big data
 
 There's some optional big testing data which is not included in the directory initially, you need to 
@@ -38,34 +51,80 @@ After doing this the big data file will automaticly generated in the benchmark d
 
 To run all the benchmark dataset:
 
-For java:
+### Java:
 
 ```
 $ make java
 ```
 
-For cpp:
+### CPP:
 
 ```
 $ make cpp
 ```
 
+### Python:
+
+We have three versions of python protobuf implementation: pure python, cpp reflection and 
+cpp generated code. To run these version benchmark, you need to:
+
+#### Pure Python:
+
+```
+$ make python-pure-python
+```
+
+#### CPP reflection:
+
+```
+$ make python-cpp-reflection
+```
+
+#### CPP generated code:
+
+```
+$ make python-cpp-generated-code
+```        
+  
 To run a specific dataset:
 
-For java:
+### Java:
 
 ```
 $ make java-benchmark
 $ ./java-benchmark $(specific generated dataset file name) [-- $(caliper option)]
 ```
 
-For cpp:
+### CPP:
 
 ```
 $ make cpp-benchmark
 $ ./cpp-benchmark $(specific generated dataset file name)
 ```
 
+### Python:
+
+#### Pure Python:
+
+```
+$ make python-pure-python-benchmark
+$ ./python-pure-python-benchmark $(specific generated dataset file name)
+```
+
+#### CPP reflection:
+
+```
+$ make python-cpp-reflection-benchmark
+$ ./python-cpp-reflection-benchmark $(specific generated dataset file name)
+```
+
+#### CPP generated code:
+
+```
+$ make python-cpp-generated-code-benchmark
+$ ./python-cpp-generated-code-benchmark $(specific generated dataset file name)
+```
+
 ## Benchmark datasets
 
 Each data set is in the format of benchmarks.proto:

From f001b8a94367616249059cc05d070b95949426f3 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Tue, 9 Jan 2018 10:24:50 -0800
Subject: [PATCH 493/525] Fix java benchmark to use parser, fix cpp benchmark
 new arena to use Reset, format some files

---
 benchmarks/README.md | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 71104d6..459c7b9 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -7,45 +7,46 @@ protobuf language runtime.
 
 ## Prerequisite
 
-First, you need to follow the instruction in the root directory's README to 
+First, you need to follow the instruction in the root directory's README to
 build your language's protobuf, then:
 
 ### CPP
 You need to install [cmake](https://cmake.org/) before building the benchmark.
 
-We are using [google/benchmark](https://github.com/google/benchmark) as the 
-benchmark tool for testing cpp. This will be automaticly made during build the 
+We are using [google/benchmark](https://github.com/google/benchmark) as the
+benchmark tool for testing cpp. This will be automaticly made during build the
 cpp benchmark.
 
 ### Java
-We're using maven to build the java benchmarks, which is the same as to build 
-the Java protobuf. There're no other tools need to install. We're using 
-[google/caliper](https://github.com/google/caliper) as benchmark tool, which 
+We're using maven to build the java benchmarks, which is the same as to build
+the Java protobuf. There're no other tools need to install. We're using
+[google/caliper](https://github.com/google/caliper) as benchmark tool, which
 can be automaticly included by maven.
 
 ### Python
-We're using python C++ API for testing the generated 
+We're using python C++ API for testing the generated
 CPP proto version of python protobuf, which is also a prerequisite for Python
-protobuf cpp implementation. You need to install the correct version of Python 
-C++ extension package before run generated CPP proto version of Python 
-protobuf's benchmark. e.g. under Ubuntu, you need to 
+protobuf cpp implementation. You need to install the correct version of Python
+C++ extension package before run generated CPP proto version of Python
+protobuf's benchmark. e.g. under Ubuntu, you need to
 
 ```
-$ sudo apt-get install python-dev 
+$ sudo apt-get install python-dev
 $ sudo apt-get install python3-dev
 ```
-And you also need to make sure `pkg-config` is installed.  
+And you also need to make sure `pkg-config` is installed.
 
 ### Big data
 
-There's some optional big testing data which is not included in the directory initially, you need to 
-run the following command to download the testing data:
+There's some optional big testing data which is not included in the directory
+initially, you need to run the following command to download the testing data:
 
 ```
-$ ./download_data.sh 
+$ ./download_data.sh
 ```
 
-After doing this the big data file will automaticly generated in the benchmark directory.  
+After doing this the big data file will automaticly generated in the
+benchmark directory.
 
 ## Run instructions
 
@@ -65,8 +66,8 @@ $ make cpp
 
 ### Python:
 
-We have three versions of python protobuf implementation: pure python, cpp reflection and 
-cpp generated code. To run these version benchmark, you need to:
+We have three versions of python protobuf implementation: pure python, cpp
+reflection and cpp generated code. To run these version benchmark, you need to:
 
 #### Pure Python:
 
@@ -84,8 +85,8 @@ $ make python-cpp-reflection
 
 ```
 $ make python-cpp-generated-code
-```        
-  
+```
+
 To run a specific dataset:
 
 ### Java:

From ea21ae33863ba9226f2e1b1f443529b4f8d9c238 Mon Sep 17 00:00:00 2001
From: BSBandme <chongyilun250@sina.com>
Date: Wed, 7 Mar 2018 00:35:42 -0800
Subject: [PATCH 494/525] Add go benchmark

---
 benchmarks/README.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 459c7b9..183280f 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -36,6 +36,18 @@ $ sudo apt-get install python3-dev
 ```
 And you also need to make sure `pkg-config` is installed.
 
+### Go
+Golang protobuf is under [golang repo](https://github.com/golang/protobuf), you
+need to install golang and golang protobuf's proto and protoc-gen-go before
+running the benchmark. And we're using [testing package](https://golang.org/pkg/testing/)
+to test benchmark. 
+
+To install golang protobuf proto and protoc-gen-go, you can 
+```
+$ go get -u github.com/golang/protobuf/protoc-gen-go
+$ go get -u github.com/golang/protobuf/proto
+```
+
 ### Big data
 
 There's some optional big testing data which is not included in the directory
@@ -87,6 +99,11 @@ $ make python-cpp-reflection
 $ make python-cpp-generated-code
 ```
 
+### Go
+```
+$ make go
+```
+
 To run a specific dataset:
 
 ### Java:
@@ -126,6 +143,13 @@ $ make python-cpp-generated-code-benchmark
 $ ./python-cpp-generated-code-benchmark $(specific generated dataset file name)
 ```
 
+### Go:
+```
+$ make go-benchmark
+$ ./go-benchmark $(specific generated dataset file name)
+```
+
+
 ## Benchmark datasets
 
 Each data set is in the format of benchmarks.proto:

From e52ec443621cf508c797c909e085df0ae212fe0f Mon Sep 17 00:00:00 2001
From: BSBandme <chongyilun250@sina.com>
Date: Tue, 13 Mar 2018 01:18:20 -0700
Subject: [PATCH 495/525] some fix

---
 benchmarks/README.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 183280f..74c042d 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -37,17 +37,20 @@ $ sudo apt-get install python3-dev
 And you also need to make sure `pkg-config` is installed.
 
 ### Go
-Golang protobuf is under [golang repo](https://github.com/golang/protobuf), you
-need to install golang and golang protobuf's proto and protoc-gen-go before
-running the benchmark. And we're using [testing package](https://golang.org/pkg/testing/)
-to test benchmark. 
+Go protobufs are maintained at [github.com/golang/protobuf](
+http://github.com/golang/protobuf). If not done already, you need to install the 
+toolchain and the Go protoc-gen-go plugin for protoc. 
+
+To install protoc-gen-go, run:
 
-To install golang protobuf proto and protoc-gen-go, you can 
 ```
 $ go get -u github.com/golang/protobuf/protoc-gen-go
-$ go get -u github.com/golang/protobuf/proto
+$ export PATH=$PATH:$(go env GOPATH)/bin
 ```
 
+The first command installs `protoc-gen-go` into the `bin` directory in your local `GOPATH`.
+The second command adds the `bin` directory to your `PATH` so that `protoc` can locate the plugin later.
+
 ### Big data
 
 There's some optional big testing data which is not included in the directory

From d8bf9bcc4920df7c4e994cd05a91ac7d64530444 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Thu, 22 Mar 2018 17:08:06 -0700
Subject: [PATCH 496/525] Add performance.md and add instruction for linking
 tcmalloc

---
 benchmarks/README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 74c042d..ba906c1 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -3,7 +3,9 @@
 
 This directory contains benchmarking schemas and data sets that you
 can use to test a variety of performance scenarios against your
-protobuf language runtime.
+protobuf language runtime. If you are looking for performance 
+numbers of officially support languages, see [here](
+https://github.com/google/protobuf/blob/master/docs/Performance.md)
 
 ## Prerequisite
 
@@ -17,6 +19,11 @@ We are using [google/benchmark](https://github.com/google/benchmark) as the
 benchmark tool for testing cpp. This will be automaticly made during build the
 cpp benchmark.
 
+The cpp protobuf performance can be improved by linking with [tcmalloc library](
+https://gperftools.github.io/gperftools/tcmalloc.html). For using tcmalloc, you
+need to build [gpertools](https://github.com/gperftools/gperftools) to generate
+libtcmallc.so library.
+
 ### Java
 We're using maven to build the java benchmarks, which is the same as to build
 the Java protobuf. There're no other tools need to install. We're using
@@ -79,6 +86,12 @@ $ make java
 $ make cpp
 ```
 
+For linking with tcmalloc:
+
+```
+$ env LD_PRELOAD={directory to libtcmalloc.so} make cpp
+```
+
 ### Python:
 
 We have three versions of python protobuf implementation: pure python, cpp

From a0e3dcecfd60c0505f7d0272e9d5cbf8f814d2b4 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Tue, 10 Apr 2018 13:26:17 -0700
Subject: [PATCH 497/525] Add script for run and upload the benchmark result to
 bq

---
 benchmarks/README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index ba906c1..21cd735 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -120,49 +120,51 @@ $ make python-cpp-generated-code
 $ make go
 ```
 
-To run a specific dataset:
+To run a specific dataset or run with specific options:
 
 ### Java:
 
 ```
 $ make java-benchmark
-$ ./java-benchmark $(specific generated dataset file name) [-- $(caliper option)]
+$ ./java-benchmark $(specific generated dataset file name) [$(caliper options)]
 ```
 
 ### CPP:
 
 ```
 $ make cpp-benchmark
-$ ./cpp-benchmark $(specific generated dataset file name)
+$ ./cpp-benchmark $(specific generated dataset file name) [$(benchmark options)]
 ```
 
 ### Python:
 
+For Python benchmark we have `--json` for outputing the json result
+
 #### Pure Python:
 
 ```
 $ make python-pure-python-benchmark
-$ ./python-pure-python-benchmark $(specific generated dataset file name)
+$ ./python-pure-python-benchmark [--json] $(specific generated dataset file name)
 ```
 
 #### CPP reflection:
 
 ```
 $ make python-cpp-reflection-benchmark
-$ ./python-cpp-reflection-benchmark $(specific generated dataset file name)
+$ ./python-cpp-reflection-benchmark [--json] $(specific generated dataset file name)
 ```
 
 #### CPP generated code:
 
 ```
 $ make python-cpp-generated-code-benchmark
-$ ./python-cpp-generated-code-benchmark $(specific generated dataset file name)
+$ ./python-cpp-generated-code-benchmark [--json] $(specific generated dataset file name)
 ```
 
 ### Go:
 ```
 $ make go-benchmark
-$ ./go-benchmark $(specific generated dataset file name)
+$ ./go-benchmark $(specific generated dataset file name) [go testing options]
 ```
 
 

From 52595878cf0ba087e7c4b9eaf0aca251fa187e60 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Mon, 11 Jun 2018 22:59:03 -0700
Subject: [PATCH 498/525] Fix incorrect link.

---
 benchmarks/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index 21cd735..ae5c7dd 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -5,7 +5,7 @@ This directory contains benchmarking schemas and data sets that you
 can use to test a variety of performance scenarios against your
 protobuf language runtime. If you are looking for performance 
 numbers of officially support languages, see [here](
-https://github.com/google/protobuf/blob/master/docs/Performance.md)
+https://github.com/google/protobuf/blob/master/docs/performance.md)
 
 ## Prerequisite
 

From 3192aeaf4e0d7ebe550d0c129db140f55530589a Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Tue, 3 Jul 2018 20:12:04 -0500
Subject: [PATCH 499/525] Removed everything but the benchmarks.

---
 benchmarks/LICENSE | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 benchmarks/LICENSE

diff --git a/benchmarks/LICENSE b/benchmarks/LICENSE
new file mode 100644
index 0000000..19b305b
--- /dev/null
+++ b/benchmarks/LICENSE
@@ -0,0 +1,32 @@
+Copyright 2008 Google Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.

From 7807dca432f60ad311009f4ba0b532bfe6a09aa9 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Tue, 3 Jul 2018 21:47:31 -0500
Subject: [PATCH 500/525] Added ignores.

---
 benchmarks/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 benchmarks/.gitignore

diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
new file mode 100644
index 0000000..977a5b3
--- /dev/null
+++ b/benchmarks/.gitignore
@@ -0,0 +1 @@
+dataset.google_message*.pb

From 0d1f096cc8fb6f78768cba7491b5745d0d072168 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Tue, 3 Jul 2018 23:49:15 -0500
Subject: [PATCH 501/525] Converted benchmarks to be run by lein.

---
 benchmarks/.gitignore                         |    5 +-
 benchmarks/README.md                          |  130 --
 benchmarks/bin/compile-protobufs              |   13 +
 benchmarks/bin/java-benchmark                 |   21 +
 benchmarks/project.clj                        |   39 +
 .../resources/datasets/bigdata/Makefile       |    4 +
 .../proto2/benchmark_message1_proto2.proto    |   78 +
 .../proto2/dataset.google_message1_proto2.pb  |  Bin 0 -> 289 bytes
 .../proto3/benchmark_message1_proto3.proto    |   78 +
 .../proto3/dataset.google_message1_proto3.pb  |  Bin 0 -> 289 bytes
 .../google_message2/benchmark_message2.proto  |   76 +
 .../dataset.google_message2.pb                |  Bin 0 -> 84625 bytes
 .../google_message3/benchmark_message3.proto  |  534 +++++
 .../benchmark_message3_1.proto                | 1280 +++++++++++
 .../benchmark_message3_2.proto                |  499 +++++
 .../benchmark_message3_3.proto                |  466 ++++
 .../benchmark_message3_4.proto                |  491 +++++
 .../benchmark_message3_5.proto                |  473 ++++
 .../benchmark_message3_6.proto                |  454 ++++
 .../benchmark_message3_7.proto                |   56 +
 .../benchmark_message3_8.proto                | 1900 +++++++++++++++++
 .../google_message4/benchmark_message4.proto  |  454 ++++
 .../benchmark_message4_1.proto                |  474 ++++
 .../benchmark_message4_2.proto                |  292 +++
 .../benchmark_message4_3.proto                |  751 +++++++
 .../resources/protobuf/benchmarks.proto       |   63 +
 .../resources/protobuf/google_size.proto      |  138 ++
 .../protobuf/ProtoCaliperBenchmark.java       |  214 ++
 28 files changed, 8852 insertions(+), 131 deletions(-)
 create mode 100755 benchmarks/bin/compile-protobufs
 create mode 100755 benchmarks/bin/java-benchmark
 create mode 100644 benchmarks/project.clj
 create mode 100644 benchmarks/resources/datasets/bigdata/Makefile
 create mode 100644 benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
 create mode 100644 benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
 create mode 100644 benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
 create mode 100644 benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
 create mode 100644 benchmarks/resources/datasets/google_message2/benchmark_message2.proto
 create mode 100644 benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
 create mode 100644 benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
 create mode 100644 benchmarks/resources/datasets/google_message4/benchmark_message4.proto
 create mode 100644 benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
 create mode 100644 benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
 create mode 100644 benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
 create mode 100644 benchmarks/resources/protobuf/benchmarks.proto
 create mode 100644 benchmarks/resources/protobuf/google_size.proto
 create mode 100644 benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java

diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
index 977a5b3..06a1fc1 100644
--- a/benchmarks/.gitignore
+++ b/benchmarks/.gitignore
@@ -1 +1,4 @@
-dataset.google_message*.pb
+/resources/datasets/bigdata/dataset.google_message*.pb
+/src/java/benchmarks
+/src/java/com/google/protobuf/benchmarks
+/target
diff --git a/benchmarks/README.md b/benchmarks/README.md
index ae5c7dd..543bf08 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -7,57 +7,12 @@ protobuf language runtime. If you are looking for performance
 numbers of officially support languages, see [here](
 https://github.com/google/protobuf/blob/master/docs/performance.md)
 
-## Prerequisite
-
-First, you need to follow the instruction in the root directory's README to
-build your language's protobuf, then:
-
-### CPP
-You need to install [cmake](https://cmake.org/) before building the benchmark.
-
-We are using [google/benchmark](https://github.com/google/benchmark) as the
-benchmark tool for testing cpp. This will be automaticly made during build the
-cpp benchmark.
-
-The cpp protobuf performance can be improved by linking with [tcmalloc library](
-https://gperftools.github.io/gperftools/tcmalloc.html). For using tcmalloc, you
-need to build [gpertools](https://github.com/gperftools/gperftools) to generate
-libtcmallc.so library.
-
 ### Java
 We're using maven to build the java benchmarks, which is the same as to build
 the Java protobuf. There're no other tools need to install. We're using
 [google/caliper](https://github.com/google/caliper) as benchmark tool, which
 can be automaticly included by maven.
 
-### Python
-We're using python C++ API for testing the generated
-CPP proto version of python protobuf, which is also a prerequisite for Python
-protobuf cpp implementation. You need to install the correct version of Python
-C++ extension package before run generated CPP proto version of Python
-protobuf's benchmark. e.g. under Ubuntu, you need to
-
-```
-$ sudo apt-get install python-dev
-$ sudo apt-get install python3-dev
-```
-And you also need to make sure `pkg-config` is installed.
-
-### Go
-Go protobufs are maintained at [github.com/golang/protobuf](
-http://github.com/golang/protobuf). If not done already, you need to install the 
-toolchain and the Go protoc-gen-go plugin for protoc. 
-
-To install protoc-gen-go, run:
-
-```
-$ go get -u github.com/golang/protobuf/protoc-gen-go
-$ export PATH=$PATH:$(go env GOPATH)/bin
-```
-
-The first command installs `protoc-gen-go` into the `bin` directory in your local `GOPATH`.
-The second command adds the `bin` directory to your `PATH` so that `protoc` can locate the plugin later.
-
 ### Big data
 
 There's some optional big testing data which is not included in the directory
@@ -74,100 +29,15 @@ benchmark directory.
 
 To run all the benchmark dataset:
 
-### Java:
-
 ```
 $ make java
 ```
 
-### CPP:
-
-```
-$ make cpp
-```
-
-For linking with tcmalloc:
-
-```
-$ env LD_PRELOAD={directory to libtcmalloc.so} make cpp
-```
-
-### Python:
-
-We have three versions of python protobuf implementation: pure python, cpp
-reflection and cpp generated code. To run these version benchmark, you need to:
-
-#### Pure Python:
-
-```
-$ make python-pure-python
-```
-
-#### CPP reflection:
-
-```
-$ make python-cpp-reflection
-```
-
-#### CPP generated code:
-
-```
-$ make python-cpp-generated-code
-```
-
-### Go
-```
-$ make go
-```
-
-To run a specific dataset or run with specific options:
-
-### Java:
-
 ```
 $ make java-benchmark
 $ ./java-benchmark $(specific generated dataset file name) [$(caliper options)]
 ```
 
-### CPP:
-
-```
-$ make cpp-benchmark
-$ ./cpp-benchmark $(specific generated dataset file name) [$(benchmark options)]
-```
-
-### Python:
-
-For Python benchmark we have `--json` for outputing the json result
-
-#### Pure Python:
-
-```
-$ make python-pure-python-benchmark
-$ ./python-pure-python-benchmark [--json] $(specific generated dataset file name)
-```
-
-#### CPP reflection:
-
-```
-$ make python-cpp-reflection-benchmark
-$ ./python-cpp-reflection-benchmark [--json] $(specific generated dataset file name)
-```
-
-#### CPP generated code:
-
-```
-$ make python-cpp-generated-code-benchmark
-$ ./python-cpp-generated-code-benchmark [--json] $(specific generated dataset file name)
-```
-
-### Go:
-```
-$ make go-benchmark
-$ ./go-benchmark $(specific generated dataset file name) [go testing options]
-```
-
-
 ## Benchmark datasets
 
 Each data set is in the format of benchmarks.proto:
diff --git a/benchmarks/bin/compile-protobufs b/benchmarks/bin/compile-protobufs
new file mode 100755
index 0000000..344fb24
--- /dev/null
+++ b/benchmarks/bin/compile-protobufs
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+OUT_DIR=src/java
+PROTO_FILES=`find resources -name "*.proto"`
+
+mkdir -p $OUT_DIR
+
+protoc \
+  -I=/usr/include \
+  -I=/usr/local/include \
+  -I=resources \
+  --java_out=$OUT_DIR \
+  $PROTO_FILES
diff --git a/benchmarks/bin/java-benchmark b/benchmarks/bin/java-benchmark
new file mode 100755
index 0000000..18bd493
--- /dev/null
+++ b/benchmarks/bin/java-benchmark
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+CPU_COUNT=4
+ALL_FILES=`find . -type f -name "dataset.*.pb" -not -path "./tmp/*"`
+ALL_DATA=()
+for FILE in $ALL_FILES; do
+    ALL_DATA+="$FILE,";
+done
+
+echo
+echo "Running benchmarks against this data:"
+echo "$ALL_DATA"
+echo
+
+_JAVA_OPTIONS="-XX:CICompilerCount=$CPU_COUNT" \
+java -cp target/protobuf-java-benchmark-*-standalone.jar \
+  com.google.caliper.runner.CaliperMain com.google.protobuf.ProtoCaliperBenchmark -i runtime \
+  -b serializeToByteArray,serializeToMemoryStream,deserializeFromByteArray,deserializeFromMemoryStream \
+  -DdataFile=${ALL_DATA:0:-1}
+
+#-b serializeToByteString,serializeToByteArray,serializeToMemoryStream,deserializeFromByteString,deserializeFromByteArray,deserializeFromMemoryStream \
diff --git a/benchmarks/project.clj b/benchmarks/project.clj
new file mode 100644
index 0000000..54cdd68
--- /dev/null
+++ b/benchmarks/project.clj
@@ -0,0 +1,39 @@
+(defproject clojusc/protobuf-java-benchmark "4.1.0-SNAPSHOT"
+  :description "The benchmark tools for Protobuf Java"
+  :dependencies [
+    [com.google.caliper/caliper "1.0-beta-2"]
+    [com.google.protobuf/protobuf-java "3.6.0"]
+    [org.clojure/clojure "1.9.0"]]
+  :plugins [
+    [lein-ancient "0.6.15"]
+    [lein-shell "0.5.0"]]
+  :java-source-paths ["src/java"]
+  :main com.google.protocolbuffers.ProtoBench
+  :profiles {
+    :ubercompile {
+      :aot :all}}
+  :aliases {
+    ;; Dev tasks
+    "ubercompile" [
+      "with-profile"
+      "+ubercompile"
+      "compile"]
+    ;; Protobuf compilation tasks
+    "protoc-benchmarks" [
+      "shell"
+      "bin/compile-protobufs"]
+    ;; Deps
+    "check-deps" [
+      "ancient"
+      "check"
+      ":all"]
+    ;; Benchmarking
+    "java-benchmark" [
+      "shell"
+      "bin/java-benchmark"]
+    "bench" [
+      "do"
+        ["clean"]
+        ["protoc-benchmarks"]
+        ["uberjar"]
+        ["java-benchmark"]]})
diff --git a/benchmarks/resources/datasets/bigdata/Makefile b/benchmarks/resources/datasets/bigdata/Makefile
new file mode 100644
index 0000000..44fa9a2
--- /dev/null
+++ b/benchmarks/resources/datasets/bigdata/Makefile
@@ -0,0 +1,4 @@
+datasets.tar.gz:
+	curl -O https://storage.googleapis.com/protobuf_opensource_benchmark_data/datasets.tar.gz
+	tar -zvxf datasets.tar.gz
+
diff --git a/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto b/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
new file mode 100644
index 0000000..2126190
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
@@ -0,0 +1,78 @@
+// Benchmark messages for proto2.
+
+syntax = "proto2";
+
+package benchmarks.proto2;
+option java_package = "com.google.protobuf.benchmarks";
+
+// This is the default, but we specify it here explicitly.
+option optimize_for = SPEED;
+
+option cc_enable_arenas = true;
+
+message GoogleMessage1 {
+  required string field1 = 1;
+  optional string field9 = 9;
+  optional string field18 = 18;
+  optional bool field80 = 80 [default = false];
+  optional bool field81 = 81 [default = true];
+  required int32 field2 = 2;
+  required int32 field3 = 3;
+  optional int32 field280 = 280;
+  optional int32 field6 = 6 [default = 0];
+  optional int64 field22 = 22;
+  optional string field4 = 4;
+  repeated fixed64 field5 = 5;
+  optional bool field59 = 59 [default = false];
+  optional string field7 = 7;
+  optional int32 field16 = 16;
+  optional int32 field130 = 130 [default = 0];
+  optional bool field12 = 12 [default = true];
+  optional bool field17 = 17 [default = true];
+  optional bool field13 = 13 [default = true];
+  optional bool field14 = 14 [default = true];
+  optional int32 field104 = 104 [default = 0];
+  optional int32 field100 = 100 [default = 0];
+  optional int32 field101 = 101 [default = 0];
+  optional string field102 = 102;
+  optional string field103 = 103;
+  optional int32 field29 = 29 [default = 0];
+  optional bool field30 = 30 [default = false];
+  optional int32 field60 = 60 [default = -1];
+  optional int32 field271 = 271 [default = -1];
+  optional int32 field272 = 272 [default = -1];
+  optional int32 field150 = 150;
+  optional int32 field23 = 23 [default = 0];
+  optional bool field24 = 24 [default = false];
+  optional int32 field25 = 25 [default = 0];
+  optional GoogleMessage1SubMessage field15 = 15;
+  optional bool field78 = 78;
+  optional int32 field67 = 67 [default = 0];
+  optional int32 field68 = 68;
+  optional int32 field128 = 128 [default = 0];
+  optional string field129 = 129 [default = "xxxxxxxxxxxxxxxxxxxxx"];
+  optional int32 field131 = 131 [default = 0];
+}
+
+message GoogleMessage1SubMessage {
+  optional int32 field1 = 1 [default = 0];
+  optional int32 field2 = 2 [default = 0];
+  optional int32 field3 = 3 [default = 0];
+  optional string field15 = 15;
+  optional bool field12 = 12 [default = true];
+  optional int64 field13 = 13;
+  optional int64 field14 = 14;
+  optional int32 field16 = 16;
+  optional int32 field19 = 19 [default = 2];
+  optional bool field20 = 20 [default = true];
+  optional bool field28 = 28 [default = true];
+  optional fixed64 field21 = 21;
+  optional int32 field22 = 22;
+  optional bool field23 = 23 [default = false];
+  optional bool field206 = 206 [default = false];
+  optional fixed32 field203 = 203;
+  optional int32 field204 = 204;
+  optional string field205 = 205;
+  optional uint64 field207 = 207;
+  optional uint64 field300 = 300;
+}
diff --git a/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb b/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
new file mode 100644
index 0000000000000000000000000000000000000000..f6fe7848cb889b65fb2c9465780c2e82b398639b
GIT binary patch
literal 289
zcmd-QOV7_w&q<BXO)V}?Oiwk8FDS|{$u|;GNJ`C1&d5zH$}ZM}2<f?lRr*2|N<CrZ
zVi4evINe{T#AfWRZKkR06=`UoX;hjST$&%@V;HAdR-2jZ=3p0~k!4e&Tvt*Rlap?5
zAFQTflTl>u8dj{HQ>|{A;GUn69Is(pqL3P_P+T4FX`ks_p6DLyqplTDYO0}D9&cq*
zT^E(Wn88rMSQW`3DWFp2tYmK%5NQ(YW0Y)DTW4e)6B6bYUmh3j5Sf<bnXFZ&@24H5
zn;%)47#>w*;%sf2nN*`y>=5MalvG+)6lk2Tk*(vmk}>4JGsitCF7*wJYC9MiI~W-z
ZF>+Pg29~F#)+y&z&tU18n7DvV9suhNTo3>N

literal 0
HcmV?d00001

diff --git a/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto b/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
new file mode 100644
index 0000000..090b554
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
@@ -0,0 +1,78 @@
+// Benchmark messages for proto3.
+
+syntax = "proto3";
+
+package benchmarks.proto3;
+option java_package = "com.google.protobuf.benchmarks";
+
+// This is the default, but we specify it here explicitly.
+option optimize_for = SPEED;
+
+option cc_enable_arenas = true;
+
+message GoogleMessage1 {
+  string field1 = 1;
+  string field9 = 9;
+  string field18 = 18;
+  bool field80 = 80;
+  bool field81 = 81;
+  int32 field2 = 2;
+  int32 field3 = 3;
+  int32 field280 = 280;
+  int32 field6 = 6;
+  int64 field22 = 22;
+  string field4 = 4;
+  repeated fixed64 field5 = 5;
+  bool field59 = 59;
+  string field7 = 7;
+  int32 field16 = 16;
+  int32 field130 = 130;
+  bool field12 = 12;
+  bool field17 = 17;
+  bool field13 = 13;
+  bool field14 = 14;
+  int32 field104 = 104;
+  int32 field100 = 100;
+  int32 field101 = 101;
+  string field102 = 102;
+  string field103 = 103;
+  int32 field29 = 29;
+  bool field30 = 30;
+  int32 field60 = 60;
+  int32 field271 = 271;
+  int32 field272 = 272;
+  int32 field150 = 150;
+  int32 field23 = 23;
+  bool field24 = 24;
+  int32 field25 = 25;
+  GoogleMessage1SubMessage field15 = 15;
+  bool field78 = 78;
+  int32 field67 = 67;
+  int32 field68 = 68;
+  int32 field128 = 128;
+  string field129 = 129;
+  int32 field131 = 131;
+}
+
+message GoogleMessage1SubMessage {
+  int32 field1 = 1;
+  int32 field2 = 2;
+  int32 field3 = 3;
+  string field15 = 15;
+  bool field12 = 12;
+  int64 field13 = 13;
+  int64 field14 = 14;
+  int32 field16 = 16;
+  int32 field19 = 19;
+  bool field20  = 20;
+  bool field28 = 28;
+  fixed64 field21 = 21;
+  int32 field22 = 22;
+  bool field23 = 23;
+  bool field206 = 206;
+  fixed32 field203 = 203;
+  int32 field204 = 204;
+  string field205 = 205;
+  uint64 field207 = 207;
+  uint64 field300 = 300;
+}
diff --git a/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb b/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
new file mode 100644
index 0000000000000000000000000000000000000000..4955bed31b5aee2a257a4979edd3c1b6291b335f
GIT binary patch
literal 289
zcmd-QOV7_w&q<BXO)V}?Oiwk8FDS|{$u|~KNJ`C1&d5zH$}ZM}2<f?lRr*2|N<CrZ
zVi4evINe{T#AfWRZKkR06=`UoX;hjST$&%@V;HAdR-2jZ=3p0~k!4e&Tvt*Rlap?5
zAFQTflTl>u8dj{HQ>|{A;GUn69Is(pqL3P_P+T4FX`ks_p6DLyqplTDYO0}D9&cq*
zT^E(Wn88rMSQW`3DWFp2tYmK%5NQ(YW0Y)DTW4e)6B6bYUmh3j5Sf<bnXFZ&@24H5
zn;%)47#>w*;%sf2nN*`y>=5MalvG+)6lk2Tk*(vmk}>4JGsitCF7*wJYC9MiI~W-z
ZF>+Pg29~F#)+y&z&tU18n7DvV9sunQToM2P

literal 0
HcmV?d00001

diff --git a/benchmarks/resources/datasets/google_message2/benchmark_message2.proto b/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
new file mode 100644
index 0000000..820630e
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
@@ -0,0 +1,76 @@
+// Benchmark messages for proto2.
+
+syntax = "proto2";
+
+package benchmarks.proto2;
+option java_package = "com.google.protobuf.benchmarks";
+
+// This is the default, but we specify it here explicitly.
+option optimize_for = SPEED;
+
+option cc_enable_arenas = true;
+
+message GoogleMessage2 {
+  optional string field1 = 1;
+  optional int64 field3 = 3;
+  optional int64 field4 = 4;
+  optional int64 field30 = 30;
+  optional bool field75 = 75 [default = false];
+  optional string field6 = 6;
+  optional bytes field2 = 2;
+  optional int32 field21 = 21 [default = 0];
+  optional int32 field71 = 71;
+  optional float field25 = 25;
+  optional int32 field109 = 109 [default = 0];
+  optional int32 field210 = 210 [default = 0];
+  optional int32 field211 = 211 [default = 0];
+  optional int32 field212 = 212 [default = 0];
+  optional int32 field213 = 213 [default = 0];
+  optional int32 field216 = 216 [default = 0];
+  optional int32 field217 = 217 [default = 0];
+  optional int32 field218 = 218 [default = 0];
+  optional int32 field220 = 220 [default = 0];
+  optional int32 field221 = 221 [default = 0];
+  optional float field222 = 222 [default = 0.0];
+  optional int32 field63 = 63;
+
+  repeated group Group1 = 10 {
+    required float field11 = 11;
+    optional float field26 = 26;
+    optional string field12 = 12;
+    optional string field13 = 13;
+    repeated string field14 = 14;
+    required uint64 field15 = 15;
+    optional int32 field5 = 5;
+    optional string field27 = 27;
+    optional int32 field28 = 28;
+    optional string field29 = 29;
+    optional string field16 = 16;
+    repeated string field22 = 22;
+    repeated int32 field73 = 73;
+    optional int32 field20 = 20 [default = 0];
+    optional string field24 = 24;
+    optional GoogleMessage2GroupedMessage field31 = 31;
+  }
+  repeated string field128 = 128;
+  optional int64 field131 = 131;
+  repeated string field127 = 127;
+  optional int32 field129 = 129;
+  repeated int64 field130 = 130;
+  optional bool field205 = 205 [default = false];
+  optional bool field206 = 206 [default = false];
+}
+
+message GoogleMessage2GroupedMessage {
+  optional float field1 = 1;
+  optional float field2 = 2;
+  optional float field3 = 3 [default = 0.0];
+  optional bool field4 = 4;
+  optional bool field5 = 5;
+  optional bool field6 = 6 [default = true];
+  optional bool field7 = 7 [default = false];
+  optional float field8 = 8;
+  optional bool field9 = 9;
+  optional float field10 = 10;
+  optional int64 field11 = 11;
+}
diff --git a/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb b/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
new file mode 100644
index 0000000000000000000000000000000000000000..3fa0e49e57db704a0f371d2b58a2d5b315acd554
GIT binary patch
literal 84625
zcmXtfXMj`H*0zm{B6F|h+KnceNtyII={aeWK9f4>C&{Gu-pe?OB4ESbP>QHX7Zp)K
zL5e6U*buOxq5`6#TtyM#+b8pW|FhRwd+pVpXRXZmPduNGXQF{@v|JvKM_HGlL(yC~
zksU9k%d|o%U&*s*n%+-F{_hvp9(Z8dWe;3Db7AVU1CO>vKfFfSeBTdSCHL2apMCb#
zw{ySueEIsX500L{;+(gm*PfZCK3UNZ_f@~tx;9cIwfS|*YX^V7>D5hoOJ?xD_n~0y
zgT?=S8++i%cA@i7l$*HpuIuJ5cusiXZFdMsf9*RIG?Gp|`tYusS6=e)_0e0;?{{8t
z*!%cj7frr+_|6{_&xs%3@$e<|bo%iRhA+-Hrrr6;tXmS_UU5lB7gsJ<KR@H(HRpYN
z+VNiHqYXc{uDbG`x%1nE%P&fvvjcyJe)PFxTX08qM1RXZb<xoDf3IG1^6@`ouY9qN
zcEgkB)~*(<E?j)mt{+ZrpKp2oiR*tV9iMsXHS_K}?)&z^UBdgO8@BztpZWVEq}!Em
zZD7uL_ND8#Y~M(|Z~AL*Ww2imkDgr_eSP@OH@6-=xqthu>rXuL#N<(0b4K-({jY3d
zUAq0lSI=9Zyw+CQe%)`*z3+V!?=!zee}Bnue-(e{-Sgd@@6Uf8hr4m>;nMzL(yO~g
z7|yf56<1_Z-~2&;>mu^#w_EQLjD((EyKL)H+?PKeS$epClWEI63n~Z4al7fiJ73v2
z@W;(h+<f!?_N=q?cW2+-`OBhNYWVCf8{r!FkCMGNzmPeac;#ebdVKMrk0kT6&w4&w
zw)cxwFXRqBw8S%u@X&&#=Nh+ujr#c3`TB$B#V<5%eYJS@ng`EWI&DK|PXAcnEa+kl
zO{{!wyZE2};rriP`>%cKuNGcL>`Y$@t7k+Xe4ajQ$KpS3+<*B^m#ld6y5eh>@~2nV
zd|t~Iue@6}@5|E*gU=dIY<ZXb>JMjGfqP=H@dpnZ|9##s-+lbb6=QeAzZ~VxDjKfa
z-Tg~7bL8%|%dh-$##-u%#rOTZps=MbTv=OWy>RV6pQEnT-*?q7)6aV;$R#Zq(tjpo
zuX^giPd@WFmB#nef6qR<Qn>k-=;QaVn|JJo|J*V1aE-kEs!z`MsI|~>;m1n^550PT
z+f7ux)h8F8x_a5qyWYQO<=!RFeEa-q>xufBO7M+KEMpX|V-NkDJ*EctLirP(3YJOO
z_3-h%g938ppB3jyzdHJsZOcP-L1*s=j#T@^C1WU&mHx2mm8j$5>z{u0Jlv?zaYIZ0
z=$Fe+uK0cXW9e1uYi~GMSo3eqGkrg$=6N4@^P`p1>9|iGoG}Z2mUqnbzg<WDd*>~{
zzO<0???x7;+f3oZm}~A6-(I-&a`>|8d%cdUF*i|ey$JXG$@uwK!NgVei(DU{Pdy-5
zy*D~-&h{mbIM!k8qBVqf+*=D+62EY{FLvRDYtC~HN)LZ9cEbfv9JB9U6%l__TKdgh
zE!oBm|E|WY%di_CJ#6!yywdvR2P?*Kx4!4S<Kj=}{4avX+<s-|wgcW@-u1TVuYK>n
zNVVz49hZEKyOw|Sg`=L<jWk#3t#?)P<~MHn`m4W|+b^rI&b@!v$4^`Vg-&xGBNQL7
zij1FXZ@g>!E0kxHwDZXMZ$Fi8aQ|R;zY5=;)QtUZxpd^N*ZrM$>`TS_pQO3Jm+<bi
zY(4ynDD}e$)X_)!yOE(W*4NeSrLn%Fm!tmu5;<7Yv0l4?m2h2(-J1#=+<5crmBc>6
z1v}qq9ewG{(>HjTJ2#d`e|<A>{!a(?SRZ<3I)!?l|IrbvpmcLWc5NrM?zbIJFIkew
z-gEkj$d4oJD*NMa=I*(C^PAsRXPx`r+?!RiZy|hn$MN%{n>U{qy7fr>m~<v5!$0xp
zldKE2P;X2v`d4eu7YW?h5yhVF&Py(ZrKkEH+PcMl#mxH-&s}*teebXX{r3+qTzqE7
z5$vyzzeb*W=f^wVx^d34Up*h)YPe~^ve4zHc%|c4)aL#2pWO$Z3^y%t|LJ{O66-gv
zmg#T#W%ErW+2$`6&)V>4%`g7+k`3?5Mt>}Qi(a^A@d{;Y>zZ9B9;3~F`mrx>+xOn;
z?YA{=o&U@Q-<<RJL*38)cjRwm`7iqY=!(?h=O!;_jqkjCDc5_A<NE6s)V^N58%9}}
z*O1<@wzj@<;K0>q_nft$zgu>Jjd(5m{Jdq-&=rhwnrJb4?V7==+{qCSl>#Y>tueWC
z$$M`cdEjX6)VcrZyYit42({|rOQ7NKcXh~aBRb%3-pD{96op}I3u-(%AJ$WC3a&}1
zavD+*zM;dzr-mAniynI5x%ulB7f+pgY2UJBPKvtzlHVl!bBB+jE=HtC;O{@(E)8AT
zqIz|*fqs|P%1cVLUZ#pm)zr|9$%6-edSlMspU#|n>fD)q^}+!$>SV|X@y`KAtMDI(
zH%mhljZ{2QF4(vU8YwpJ$Lc4<#ta`9^{Da2Ce7ulQ2dNRF0X2=3~PWsv-kYAW%cBP
z_w)o_`P#cu)cUK1Qvy5iTcVjz2#>XONo0j<+?7$f33NNxgB`7N;%aog=o=kH%Q$Vf
zW1xy@OfK8?=A6$CJfKEYTYZZOLS1&*c@Y0xpqdq4d-)DY=qjQ}${(+$LJ1rspmv%3
z=pf5!p!ph;n{WB})8Fo2w5g}XACF!Mp?Lapr?fD@+wT3JH1yw~CO9ar`E1IJi{sN*
z1>#yQ*O+|w>BlzjS@|LE)VVYI>~B9ML7_CerQnNXSor50N$6T%6V3;i4i=XP!;Cz^
z9+rz;%4{gc76E;4-M)X@l4b9LkIv}(%<!QUrMY$(d4#Ls$*-=4LJW+oKhT*7hrC#<
zM#1+|@OhylLW+fQLp86;N!Rv|dL>lG;27E;7?Y`GBfvwRxPS4p#~w8x5_vS76m^5|
zUx-94{PM@ArJ?IQ<*EzH$A|>!K*_Bvc_kCoSj2(XG346D<eq&W&HH8B6D7oc68mRT
z)UG2^N$+W=!<RmHB^2T{w4P`<11UxtkT(>=8Vdr3H=pd!7`0tZ!H*s63WF_v)y*7J
z^5AH8#51gQBnPx{px68p@9ens(f=Z%*Ic|)ilQ}4Q|29jZ`@*mLe#n?TOEQmI0B~?
z=;94l6~W(BV6+6@fZbvl)B7Y!Ur`%3(Q$Su+uNADXa3<2{+ir!H?ZBbzT_XXCE$`Y
z_*(Bn($MuDbkr@=*N8EgNvzl`Nr~K}b(4I~(Moo_F?s9fcdT4>@QdpaRc5iim!cx@
zzoq<hcV2K65P^a(DJGy0+8*xj)T4=Ul7v9VWOUMmzBz7I(8vZKrz|qDtH4-G-(7TO
z={I)7()+H*K&aYvHN?`>;Ri8yOG7ASXuP1c3e=HIIYm)gdA4Duy=E3#D#PwUCV2b3
zcmKI)-S3-w4tF55U5fhY7T1(TropLeb^r-+UY?LIhhuq&NT&p05;tj9lr)Ssw$9*k
z8k2`NeDKG%9e2Fcvp`_}b%+HxaB|TrlF)VC6gni81=vYFGd*O~T8C-)V$cHN%eXqo
z0E@pqbaL)IFQU05{ihVQ@PnR@aN!>h0rOoK#8WG<x~9$3iJb|0S|1B#`E8rVsBZ#)
zKRx^LZAV|;x47rCJDxZoMa}=Virm`+Uz6xcL)Ty{BsyfRba^n=tW)44d}BKmrb85e
zV{*=iKfbeS{ug_DXZJFI>HlNmAZPWkvx$d7SE9@MLW?xuC3CWQjMP%?Czb}$?Z)K3
zeXs4`y8VlrkSCj6$wH`Ef*DhRt%2XewLpq6!vyBA%SXjI)$M>+9`BT>Xipqg<VWFw
zvPC>-Ban?0;5K)zx&7In|9o{r&uI5+_9LO{fLDCART^UC^}(u6>EX2kVY?!Mj>u{)
z7vCn5Xk6y9N2ZNPxiwa>F(A<S96r@VSl*c2@cPP!pFi>KtGx?3-u_66!mqp+5vhcC
z9XTNlk%(k5T{&7PMSbp}i6Lqs)2}H8>D~_9&{k*~Hm=GWB6<2HdiF5zh>w2x<lD#o
zaU;+2QQ#&B6}r3UP%M~hdmC{FhZ$Cu0_plFWY*)_VTsNri=q36l97%dB$N3YHoW!w
z=B=;wbos{%9FpO>Pz-cI!;%LsghB%W37pKaxO$04WG$(9!Qn9t4vt#|Wq%c8Hk73N
znhFM{{(8si9e1t2=+wE>`yRO9|Ex@bGtl>v5M4B`Z4DKjYBvGzVpZxXRfQpDH;b{h
zpf%z46k52Z98Z$?(h^Tqm5$;Xi~f22rGrOLu9(#`_xqcEL2Q$S&znn!Lf61LTveV6
zcH31~y2~Y5dDcPz&sTO`jm=wL*|X@bcW2!Oj!o~w3x5aU2@c)>zf|@}L&SzP)?i!E
z{pcZ`G*FFX>$Gup#^hmnR5-juB9F%79Xt+)aWy87e|_Y!yY6{kiR6gm4?B>rE8w5v
z*Fzy3H|87>B*{{KzgkzbNwS7UG*k&YYIT32NF5BiJLpb1)0li@)tN_*9QjR;NLX{z
z2;!_NIDHQU!USs!%WX7sj7@Qk<RTVE(C$I=nRG?QPy=Oh^+R*#{ju)t-fM8yd?`hp
z_j&?(jXW&7?tE$JMy9zmR2);8_@qXgK&FWdVG5RMt>-0jJAv1b013}6`tk1fZ@C6>
zhr@ejNm23q&&UOE@Ta?<l!oX9p@c*y$7wv4Fevtrqm@F_@5DAt7ztmRiG@A6f{r<i
zDdLk!Cz()60b{Jb{hh~8zPhKUlFVj-P|w3xAQ!^JAHVYfu&c!v$;mQ<#iCAT9tji;
z%m!5ImdhDkR!g&ZO&pz=$RxY-z^;o{?O%QP$UDFHL@iSdi%|c1(~2lZhAl@vmxeF|
zpBfG6%Y2;{j@MLHWeXZ=knv1M5ONI0THS!PF?npkZ?}K<{k=@&euFo@EJX#Evk?*J
z!GA5kR2rhPnBF$X2U<2)%xMSO8VN?9htQ>@c|_OcSg{IuhKiHWaS{rTEC&y@?9`6g
z4}SP^@2T%z)<*6{gf}zUQ0QthUKU|yS(1Xmsxz>ItY(pJsgY<Puk1PY^Y$}`{<sWr
zvuhq7no7TU_~sWbfI{rfgo!L1G>rQg6Ro&0WGx5!_4JZImri5qDyK0jNtX;*36sPz
ziO1;<I;__U8k1jc+V;rtpPrhI+=@LYl%V)~zC><Cg>Qks1?>P7ghq)r$v{}(Yq@wP
z$4G<gAM5zJUS(r)!F&52-hX5p(u2(C)7)K#P<-Q4$YCyAcz_0lhRV7)Mcx_523fpr
zrNJIxH$r11cE~QrkV;{kJSuV~EO`>mm9E(hl8J;^D-~kA1@K&J4xaesuUm9T`dsn@
z8A4H#|JPxKVAuMUAh(oq5^upWE};k6#MEGt?dJ_Ccv+n)36XT5v3g+p#(ST5?$8}T
zvuS<ZQwGGkX7~^D3UD+NZMz!owAet2kyt|(f&w$rRugfmdcmybgM6}h*NdC)I<OQR
zo!PhRj)x?ug;#{8a(4i3oZEy#*D5ofh)<7C2SY;Vpi|)|NCWjqz!@YCf~>atsYh=A
zYXR_*nSFOTu9cv=5r(wal4Rkx)E7aa>vaN}ASTY6A+d5C=4*0Q@5ERw#|v?rKF~2Q
z*m3{8Up~KJZcp<MmR^h$$x(R6Q)no3Lq0~!>4>%D2+gS#SFyREood60yl#xXKZ9h{
zM^?-^xpn`WNUfOBcj@WJq^QFysmRs+uzSP>GFXk|RAs_kVqz#a4An9vO9k(+k!;y+
zWAf`mkG?zinfHMo%<N<Q{ILXOdiK|;R>}ioU%XEmx;8e3BS(mISw7D$DOk90wV<u5
z-3)Ph43zeto_S;2&+Eg8Uw*d!y{Ys!0$<Vhi6n%s4zvh)VTzcP+lOKhkLhj5*n&i=
zOjX4px+LKQq4n<RzkmMz5DNMDs$)V3#T7m|C4&RUaYrPfYdAVm0(KOYy0%S4Giua%
zs({eYTMP|g@l~tN{B`)K2>JHjORt!Es&nC&e*an&x)!TTnj=-BnZ(8>Tj^AiE@tE^
zbUVaIG$z+B-*NYCAFZn*U){X|51~pg*rp<C0={cO82GP3+aS5&xLE@A<8X9SG)NPR
z(o9mZtb<xzU9irfXe`Ab!(t1V$0#NtM!@U@Dq--58{XdX^_E?C_8#Jy15_z$hI%m)
z7#G1ao{LLEI))@;Ey1LGJ>Ds!yQvr@Xp5@o(qP(%?l<-G*eN}l9i#Z_7{8n^mUPAk
zJDt&lJdd6rN7X(8R52%r_O4@MVxTek=l^D%+WG84Buh@~yL3;lJ@LUiTcc1&j#G|~
zN*h*OT&HtSa6D?RuqidfZ5(ab+Ue@4J`%eT<JG0qOfD|<HzyP-XI7R_%fxvB-lHBP
zNW{QMEB0<YdtlvnJ@Luor;%HPVa98qV<eR5l6KnSo8a0<!gSZLH(d@Fy|qpu92<)1
zF(o~lVAh&dAZ;D~{r)FkSiSJqo{%F&?o<*ttU^H{OxRf+>Wq(@YN<NhW*K-mQN_+4
z?>7^O9g?P&qe($Jc;S<6w?4MwX>fdIUj%cj6t&@k*;D=j!NnJ6gHnJ?m|K3K&c+>}
z)LhxP25VQ*Ky@Ud+evAl!P42Wx%7Bc$pye^&5k_}pI&D}%yo^f2O<6Nr=7Wy5K4&V
zLXPrKSSwe`n3`6|Oe%>B<8sGDD<T3N@GT3zdH=41_g;Z$@z<<#A=IIl*8G1h^oL9!
zF`#4mSUNO{VZ)<tK`Icj2K5{#49mQ9kh&jTv;N4te>ITU4A1-*gd#ELBF0R?TV9wZ
z2}zVecdLz45M1&gtznkwO=evuU=?xY#6hwz-i|3eq`E&J_S4;kVr?{%7lw7{d`VFl
zR=G;R#H&|rd+^tzOVG%*;F;e{NjCio+H!0&B^}nJ0-0n6AJj@qN<qFZY1c-10;`ah
z57p^tBY5VOlWSLfdrJp79_I8Ohz;|;|5_U2mFh`04lky6@KMva+G5dSMR;<>tnJ{-
z)j&&5>*P8Uws=w79JF&RGK|GHGSJjONJFq>=Nq#hdh;}Rwi$ibpZr9MI%m&1L@^Y+
zbbA{L(V4?0Y}jEfYAxL$qeRBaL^U5yAz;?jF`pUjU|C8-cDKdU%+QErlOhQ^g01W4
z-L~*WfR|_Vop*^>Iy}?y03y%~KchTH8j9-O^(;j~mgFmPZ8J?1dmY+rx}B>DY2!8@
zOUqRn;<c7WBUZCWwRC_HW*h5pDGQCH(6+9}5%3u)1Ec*sIh#gNy9zb3r_+V#LXft|
z0!p*24dyH(`hW*yoL$FGP3}L0z=COg7u-!o+_?pN=l=tIC_EZdN4=#=1MTCP72`>h
zGC@*95xtY3H0qHC@5DWe?s@WT&y~+V@`x1GA6ht7A1;7Dc3ldEt`d2uDjy%$)b=|u
zq<Doat`;N81W51uPCxa;d*3ZQ+WYJm_YslLqTxG@pcT4K*9=R`#<ZF)?~)5Ll~_H2
z=ZEd33AG8t&wXFs_SD>8S3Lp_PVc+IGHoi!5#X`!1OPb>7rp3kBxIAyqDg5Iqnt2S
z@~&>EjE~fnG<P}Q*!<%!ukQc+%-(6pbwA?IMl24)mt8gig>H-}o#SF_Q;{1C`bL{9
zoNk1orp1~Q8L28_tVSD?zn;2#)|^jI_WFyPE+9xyf;UzoZKV|+d>VxR^<|b7KLFv{
z{lW@com1N>P`;~kRXS8|73B6g`%Z4(wRzJTp!tlx?{qgpsF%mCLhdbsJ*xrqyUNKJ
zYT@O%@oviklB#c%Q4cW#Okk`9YmcAVfAcIN60E2A|AtUs2r{5F?7UzIoW2Bp<qyCP
z$Tj1ddJaSsu8S7weM(!WCeX1$6_Izi(io;%hsTC(IShZa135|&hB68_Fs&MWd^nP!
zh_neVrw$%;(fdEV^2l!+-|uO76;2GH?lt(4qCFEP(E%64w}iE#K~J7e;`xUrR4ngM
zX(EfMwDIggMN=^53))npypfVCS%I<r2@5wD$tg=XkrhxphmXIt?&H~S1Q4_DRBb@a
zJ_C;Kx(O)GuT*UAZpdA2Q56DiLs_hggC#3h&rEvx#e#{Pa+%Tb5nU?hZ6t$eS6)F&
zW^u!mXh5gPD|GPzePhvkPyF`L(PQ^sfLIp4{l5?j#h@XUb;C<<1FRg@s~WWwc`kjD
z!AMm@_#j?oOvxl<mv*>Rk;2+KMF%|cxi=nJ`rfIny~`6(Z-bsc{WPMd5`N^^#Q?OF
zsT@Bu;IIyKlWi8K?vx0sg9cTYOpf#YMn+I>%{zT$083Y_dv(oc_kGlpvu%D3LOo5%
zBFbdohnIQ*uav9W$A?1f0*9>85>2{6n@(NBmn9ml+$%KtWgVW|o*C1b?FLWF-XO(^
zARoTH^2CvM4m}1$PU~w<+=}?zzu_lt`v=f1mS(Eyq6*4{y2_r?Ge(<U+hDzD(AN_q
zAX?^c-F@WvBc~CPYg*r@tcwsmE`lGQ_q{YkwigVNtcRmv_(rTl!->&`faV-QJNzRM
zHWz3LZG{H9*)0ViH5oYX;cs?t+xpO%sZMh1?VF{j_qf@q*i*u&%fLGhb%!C<XvZc<
z=SG~WI9J{bid9(?-j!p>2||&bY|01iO`4)@3^My!F^n?Y(DCZj#^ixd_pbP2(@R$&
z-W@Xk0Vv2Xo}DU18u<Ok7Xm=zF?P)YInj;}Xi`#Hohro+6X;!qydYuA{VXoq)tEf<
z_2N~(+;cYw&1rr2oU;mfw{zeVM*!5t1QU7KDDJnwbq5Da7t2OyzCmB0O^a4RRc8s&
zfRy?8*%d!LvgrUqB~0r>>jn@rVPMTK{|3liJ3cPWv4_1BZ-2c+s)VWom`t!frgcdT
zutV&y^rvtJ5IP6v@BZfI*?;w3ed9I_gu3H=6Cy?kU;7uxgx6VJg1kjWREaTauc2(F
z2qNZq44225%Y??}1qWZAedy-bdkt%M0^rr>zL8HE_Xc>u5Qsd<5KSs_5;_WjKuE7R
zYc?o|6Nhsn369jq?{C_wbOI;B$_HT^@N9d<BW9Qf3Akon9k3JlAhHjCzi;D?^*aFT
zG_5c9%rl622I0Tvfs`p#O=J{IxoJX^faK#GC@dpd3&uQ`mj(QUhMmLFaP&&HF+q0|
zV5VuH3&rh&-t-9Ho*c7NLNQPUmLGomj!)kNAbm!k=!_FkQt#)Gi(}!BW?4b2?ZxRT
zYNB#T#q5tK@Dg-skR=FYJY+rqU30emc-IGuKL5FAwWszTk)pOe=S2=f@VY+^N<nVm
z7UV*SKV;Pol@zf|8mEeeNl~;lr<3~nxiwWKma^0${o`zPAg^ukm3n6ePfkfK9El}A
zf$@vYpmP7TfA_4P-_IgfzhHI?kv;;yK(9d|NK}So1Ew&ZK3HKkS$a)@Kd9x4-7I#9
z6;nWtmQO<u86yOt$1uS5`f)i<+3zZ|LR|rsDwA|VjmgP{%QyXe@&lxb&FI_goDQMf
z*aGqe6@2}d|AIpO{jnCAnayPQ!(%p|(mE3867*rF7IH*8zBng1PO<`SVC9<ixBql%
z9YP*W>$~mp{FH#lvL8xASL0OGXvyIYH}xF4tw_ukr5>BUz!+$3etyZ$Mf2`|^Hy+b
zW}je&075-+b#TgQ{tZ7f2TYrocss>`#b@>QL<fsyS#gv+Hr${|C)#XIVVo9XxD=`Y
zwv)%A)rsPmHrKHLB>&7)Z#}v0u`Z&@=<;59ng+uw_JGO4u)ofwda}iKLXFR81KA>$
zhDL`iD!_26hNR&!e}WY<>MIHiy&q6nfByWzC+kk$y{c!LQc(|~jz6eCZZ-k`_mvx^
zp#i$TrR!IZQ>=+FLFa`B3hIHOwoF4!ck{t=e;{Dv;sc=5T(aoS#~-}q8z5$S-_0ja
zf?)}eL4`kMoDV>xqZwp~9JXPXNfl18vb+q8bD(*n!~rYE-VuV+Z+)`r_Dw5c#6*@6
z1BANX#hk)aOnBx|a4CMQZPJKDBCDvC>gQ?NBV#Euq<2yhiV2N0>BRJBG^PU8Cycb)
z8Dfkfwo7?KH4d&#1F3cK^G|#~XWoxJ&5le+AT%<D!NG+)0#JzDiH90-ZoWo>>ZX)(
zG}(_~ju$5^a#Aj?m!Z|JZefBwNS|mKeQeOME_rCtiTl=p$<mCz3#TuVqAol9ArhiP
z@J;Ih^>DpWnTZtLm=0H-s~c4gQeA3ps)WH3W~fI+?|*mY?)Set)U));r>=oeH{VD{
zs<sRE>;~K=1K(-0gHdG;(}~OQBLw^)x?3F;GeeEASCwIU#bm2m?XC?usU)SOZf$~r
z!OAB;+IQf$M=wW=e!bu_DFZRO0p5%90|=b1B~t=Hht$R9WO|N`5HPY5>V&dUP7Wu^
zJin<i`R4pL_uPH!y@+d0>$^-fIhAg1SbQT$H(oE~6O7OZw)Tir9T*9i^8S8nzBXEB
z55<&_1Q4700jhnp?h&bKVuFI5>`t&;B4Rq6PvCfJkTTBBdwt8FpY}4@b;mu3Xd8Un
zG63QDx>1hS+LT4LJpBYKUBGr!5ZUd@`5|#y8)Q2ed<<Ob$_%(dsZ@}K;Wme(g(|jS
z9ysg19m_v|>!pu@!ZZ71zW+d|fupZYF$R|brXvmV_W&m#j4^1P0bfHPh(^0oFP!HX
zlRQyG2FQvJPo93}-c3LB&I?T*DT=;!|5PV@J^Y6#1<r$+HF$`T><~Sz_6VAT!6Bnl
z5_0OaT`a(H8xMcD@7t{@<nxBlR|9JPYUPxlGT<=@2MTfJvKleNhZ&fT7{rHuIAmp}
zd~WU#J5FfA#u2+F#BX3RrEXR&iV6)*iBsp}f~ID2?)$Htc<cC7{eSbbn-I4Mzz?7K
zMG|5K%Q!~ZYBR;hs2b4S2UzVP$!I%9Pb%1X9x3ZHXXVsvmQ;!lS*rR99^V4o$oGGI
z_uljC*W8FGdSH1!gsT5xoys{T_~rRSpi81uhGo()&lfY*LTFn-RZx!cb%jV-Of8R>
z7+E|M#xyiQvE6ShJ9hGP2yywpw#<M~mSZ?Xxh{;kHUuJ@*6b>9ns6~~C@X|Qx_N+^
z8%sFG3ucA2)+T_E*|ccYZ9mSM!VmUary-f8AD*|o4+;@N$!ddO>|j(1W=;`J)*=dy
zmgMA93ghKWHSCoWBTki@1o*AbpL_nDPu`nHLvC~3$}1q$PsIN#yMyrGy9l5+9iIS1
zr`#wh=t!0%Vc5kW1){kaOjU_J{9;})+!&#c6Z{1QZD2@bEam&d360O}$~EQwL_EgP
zqk*QA3tqhA*RK|T)(g)WUxVSM>FfIux2?b-9AHR!X0t%-Oqmn`i@|9h)J7^YKS!pm
z61`0~mz@yW$!LC6!N&CKCb~mnnqTge=XkzxMPu@#lP_<1bkiGC#GvHN^@t6wf@ge2
z0qEVw6w+$En!%R0%7c(6Dbx8=Mj;O_GynuzyzQ&c?_SdDmPJ>kA=FCT0Yo7S{9uv*
zDz=DeRTk+5!o+ZhY{sE!bxaN8Zw<5MpbtFw#JqWb{`3LD(9G=9S|699<X5()JfI7|
z!@F1#;#Px03~DRxG0FYINqWpxNDWraUNe+}Fb%71Fr^M~^I*c%5r{2f5n9V)^&42E
z#^f6>&idbPPdz>p$r*indJl?)H(pAYhNLxBrkN$Q`Q<LDSxaG(6dz}h-Jh&xV<tj1
zAf>kaH9fmu&lwxgV5EEzU$5;NB#d^+QzH|cWf0!GJ~^}LtCdtl^km+R+;t58GuQx_
zugfcsjSVs<taNYOIcDJbM#hV|WT-zct|@%upv1ra_pXP(|Lm)45l0Q)^nw&so7cnr
zSlGXm2{>g{xmXrReHmU+YWK>9N|p?jW6MVc%xq(F+fVQR{^+qkRsv&9>-*_{F64oP
zaN7SV0J-WRk-8N3WL#!yCEe{PVq$$RXk+6{Hc(p*E?@u36MNU~>RI`Qi<l6q``w|b
zo;U)(=~x50_ne-{=NL!%5snY<ABc-{gn?mStcV?|N!?g7)hf4ltmQ#VuI&JX%CRSx
zesbWC#mj-b>3!!eylg7Bq~V`)XQd&gT2xZhRbhe?kCo8MTsM9&JV@YZqhlN$K4mrV
z@HtkDpYpT|m1Y*t2@*iUTf6b$KPSI^4MfhgzPqirBNi3I&z-#!Tr8$#7Acuf%O}Qp
zQbSO1R4yEe@tFco0L<*x9y_@1p>Jmc(qmfR%hmPBIZ*nQ2LLrA=ysrCbeY_(Vc4z;
zThx&a7t!4b>&Q@@XVlYN^-{{0sWpObuGkU9xs+<9lGQGPRC4&$+50!{eWAAmaAH#j
zLVfu_k1|TbH+X<M%ZXmUHLejxNRAP_Cc;kzwP~%-mM0S0KD@yMD{u*CXDpeOq{@PP
zRgxNVd);HO)?!OJ^yw5w;0E~Mr-x2|aAf`0|3=g{r+yRxwXN{?>^=}ILQc&+0w;uM
zW|BE<%vA^xAFrP^A;o|x%fWlMt$6zG#en*s(YNm9>mXEXXb|y%3cNyT07+d;8I)>5
zEqW>;NU4GzRZJf)sFdnKBFE`!;b|V?@W_Ces%8PGHj-3(U^OjAZ#E|Pe|UWTjt6g>
zfrQ|z(mhhtZ66_Y01$i*{QKv5X=s#1QgFg<I5fd_5MBM2NX}B12Hj0ohBpzwbnQ}c
zjYCMtsAY1<qs!sAWUbtx&IIjF218@;bjLA%UV1#IYmcf1SltOw&_Dm`>!<hsbJuF%
zKQsCw%OwyhYFmS#&@4RZZ37hQSJTWMg}3Ic2l-TtJLMGE#NA;6CO+Z-;B52JPu{uv
z<JF(^j{oor*bQ-7DTpEX@O95XAO%LTZgY$Qv8>9maB85filmGqV|;;>5~rlFyd;0f
zte!v%^F+>|0c(+Tv~Erd%WeZ2bKfUlFW<iEE(!85(i`Q7%zk(#_YL5O-2odz<dTdC
zd>xgpsS+46yi6_?Vr0btwEVH@@Sf*?**d$Y(KCs=q^RTEWr#P{;fH)>5EGGFaUjrO
zXxaHt%9k?}bK{YK*=S?Q74nG!pVbUS{Z<0xw)(Q}31ZFG1#SG!(`%nweCYPxPQp?+
zB}J{9dnKaK2)vXu4=~J8z9JBkIGE0+FHWp6I+#%+vwyr~C+TuZHmlz))1lQ24YCe%
z^8Q!nZd`~*F7@8LDk4JwzhkWeZ}TgloHv^R)m1YzpvsK#N7x-z4Xc5{)N}2E=a2pN
z&D?K$ciM>?g-{nhc@1(n4UeXQyIse10KA*@u<UBPh*W2_Fp7dI8y_jgWx&O^-Sz!%
zPaj+R5I8-p@6F8u<lqG`^DBVt3H_BY)9+$<(moOF$a`ugLo1<+8@nTeE<>T9Gg{Q<
zVRaNZ{DRx>T>aH62YUte-pm+;`YsJk6$d}O^eF&{t|is56s<Or6po3sk?<Hgl4!EC
z6o!-wklM1z2R?f7mPMc^nAR70B86z6hl{haAWe^tM+^$40|H0Kc?C{8i0Q~lU9v6Q
zjfHA8u-)*;*S~K3YVO@r9oS<Eg%tHbYaPg#J1;N-F>d%@wK?Eb<x1T!WF94#p+SBw
z-sEP(4rW}XFKNt)nyK3H@HGKfJp#LN&Ox=yPplO|4F9%#_xy)GJq7GCvybxYg%IjC
zEOx53Q^1dX17?*sw(Db^T+HF^%10+O1et`0Z&T=^0bxR09Iz=s9oX={w@)m4YIkpr
z{lYb3<YGk_GY|B2^q?Z1D~_~DIFdh*GsAi!epntXi`c^z3&Crv@h!?gQ#M3`*^Dlo
zl;{VLX2;oszrJ`{g%}BIi6F8n@Pe25faNmFY}hoxuIseRBNo;$O<xF;itRYfR3Q_6
z#V#`pR9X4h%1_?@@M|^_$j7u92sL|74-!-0+;!u?M~dkTWn3CEwj*xmI5ShSxm4C_
z+mIn6aQFD~w~zg}_nltT#=V&hp*qhS5d}o>^h;P^tUlN-NCxuwd`3%CVg({}wN->%
z*=`j=W5V7Bm{QI8;nQ1Q-|+f_Jr|YeC#0y)7k@ETJZ{Vg!PplX&4w-Zs4+uG7J}oY
zc$4ZBb(`IRtejo;cge2wSU^poX8MU{BA-jgHgFg)1(`SdmTm8^o&O)iB=7$1Ml`w_
zp1xZOg;*+cvcixRvbh!$N5U998OX*ODMqt?sUYi1U}CPUu%h7kLPO&M@c^k-cY{@s
zci;MY{bw8RT;F@~+XPww>cPyvmtV2){P|#;1D$FO74ZEGd{b`_#m4yd@j^T0(k5+c
zIhzL!Y2A$tJD+^`g{}Vsb#8j!jt3x!fnY;6yy&&-#UX6k%d)WKF4)T)pq7Zn{?VqK
zIj#%m8__VP80#8}V060d=<3z)efY<3y>LXmHI5i*9DZyG;>E)RMm5Et4;ra$2R;+$
zN)<JQ(+E4$WtLM2v3LTGO^8mzwm?oWHXsZ#!4PlGk=X|}>|8&!e(;~yVp3H5P>&2G
zz;}k;lZFO^4Xtai)^+5lt%$h5H*zguWhl-fSj{YS*+1xSlx&`&dOT`xOrH3B|Ln(p
zc(2!}{SVrQ6vInk<BA)AU7$|BKBNxin&C!Nj&p@OA$q?krIWz!Y`&9q#~YJdUs|x~
z@s;0#4HrPaFFA@_>st6X88GUQg6QL^bAV_no8?5TV>mx3wb`r!pR-gT4>AIk0#07R
z)qKXZFq9lL##%gftwRA6!NL1huekf6Unh_NJ#o|yp+5b|Je73pu&M(j^SdRSj^i=)
z2ghX%V=*Sko2+C?rCbq=CzyB(et<VPQs)T9Mmu5QSP4*#_2`6T#I6R+>)N*-{Ndi$
zR)XE9X??#8QxJ9k3qQ%828AvwO4@XfD5y~71{}=+s>UO2EV}v8NB*9(bIbXND*sd7
zFGbyPk#H(kVBn_*)`G<fOTrNvA8rf`_WS%Xa?>fMRtAGwrB2-)3DU|k#em0G40i()
z)d^!2pxs3~?m9KO?wAz$KB?TRnNoPu;@71inXcRKq6Y?5RB^b*t8zmEH)VuamX1_e
z!IlwQmvqJ9ia1$m*^G{0n*a~;*wnHOBOLROg*sho4KUS{x6Ix9+dVti_IzwnWEXO~
z8tj}`0&5#gXm~WjXnG|+bI$Gz3CjI|L!xm(>3r_c)~#EYJPEpwX?+jg*~`)`c#{)2
zQP8dzk5NHB&cJj9!Oz1Elr(A`JS6kB>)1iRHp8~zi%=_A2&4?$@^DpI14Nr?tX*Tb
z8_Z-SL*vTnHs|p8Aj<)k2Qfx2&Q7kjxDpubcPKHVcu-^KzxmPbU*<3Pr>F9=ho3-H
zo`6ZaKxrWiDN<&$8{NoBA}mvg%uUo-=mB$E8<!HordFVgX-<Ta9u=q+i#NUc>fEC}
zI8b}F7g`MXpR^S?Fkh!HOB4kRp41(Q4$BiPi%4673yiU_#z3<afCh(`y?tQEj&~5M
zU`F5LPck6XmCW9pdIF}$9!92D2^rjUC$I*-L{nhq8m*ScDU`aK!zB>bYY#8H_0*eZ
zkOjVJeP7HUMf6X=)B10egh=BGV?5qUHu?$FK|QHo0%3~bC{c|e(}(#4oGItydT>fD
zzQX{7!Ls`n99eST*T{y`%)UJhFu(o9eZiEcT@EWA9fLv~`51>MBa7WFz0YO06uS<o
zkvrOLRGVdM*j%mDFk@A7fj4TdV@Qqkh}O?=H9&pX^T0bNcQ5_GkKC?(EvOH>@M{qz
z>2Tkt7?7YP5`)u49I!_mU5|_k<=T>w^2DIQP_ouL1O}07E!&#dy0nf{5^DN^yupQZ
zMjOr^e&wsb-$Ld}Gr^3}520}L&rW63Yhd$YH>f-42#$dtv5h2%2Dd8H-?eAGSUV;c
zGAaR1zxBlG@9%x&<hq{C|D60?ih9lbBBIs#@Unwo?GX<Vv21?4TeWF}Eme`jh<T+!
zG*jHID#9Tp6|KRu1>z*wpWLwKj-`kGKHx*FzwJbCp)3ji_YF{a#3K}_B=ykiaG_r|
zL`(OJtNkL&uvSoEIP2<q&0G+M7=G-)pw%!+Q${)@Q`C}6*f_*6zDsRPZhUj?p0Dn|
z6<M{L-goB0?$qUA*gvZXyvkx~8N4cCv6;ZtfI#+$CNNBhiSZtTbD&BPf|h>S2lw5%
zcHV<u_ilLRuQ4gg;P4=Y>^j&q$1DboUs=ZM<We+-j*)5Fas^p2$*Sb(X>JQ7iF>xZ
zHhF4J9(l8C*Pf7~bm1QnF6A=#pA$7nNZQ|G<!lg@RJYW0Sj|w|svp$I30QJAY{OvM
zlKy@rr4WyZ%&b^3&{0!V-3b{M6A8B)cyulW^2C|7@BI49?H?f<AYghR>+MBe2M;d-
zJm=MFSfpZS=uWPiE2pU)^nR>Ih?NA89f37>{`2?gZ+aUk?&CBFwe)^u$7|;WFi`D6
z_(cj13|A_KLG&omm9mz!roouA?&f)j0ACgcyJVw<I9{N)p-N-&*{z=+f90`5xAm-3
zy!Cx4>c`hNAUC`SHvae(pr(h28dqja3nfTga>rq}@@wWcg|BBgAgX4(%%)lWdA^w^
z(u61pupYEw@2hX^e&LfTzWtpSg@~Q6g4cfY7GR~5inPf|l5}An#;8HVl^WhDjfyd7
z50O7HY6ur-aUax}y!Yi5Tjsp-*}R@bKKY)FNYKKRz<v<_vVupz&7wo2CHye8=pT`#
z%BF&3lxbstdEDez?;ri)<nL42WALZfq^KMFddoC180@l0LpPY{-AXW?%n-)RUX>&y
z8l-mtw0B??x+rcG0Po|EFT7>)tG`IdTg!JcrKrCsa}i7A;0w-+K_OAMoJ_kg1dS+D
zN^_0<V{FK*(mGof9yTJ04MBE`CZdKE!=jj9#2NLOT!tjMFg7wW+~9%AzV?gXj(m6Y
zL4a4M^{w3cFcM)Q_{3=v7+MaDNCerKcc{?d`VwM**DRDmhcr6T-;^2&nOwIsF%)Ae
z#|t@|pa$i`AZXXVw)*s4pPc~2$+W)r<pD%k9abfIl8_h-wwqlkx2&bp21rAJB(7T+
z$_p{tf)h;hxPnqCl^qa^6D4X!6Hsx}gN$ZBM;T&QYJx$80e)}eV+Rf&LI$kU`d0mO
z>i;J29HTVku80_r#%oM)yMx%0Y`~Km!wQ)LqYOubf@RA&BswQGh%*LlM&X3Y#l((r
zN4!L|5>rT{6QiSgdnq|lg2$R;lJaP_Ixy%Mt~oN1D4CRI0}|=%y~{V9y$9^POzXRF
z*JH?i{sn)_=R%=D77iOBd)yKwT3DBG%yv?GT&r-@eR(QeA?UrZ*&WoS7>&^maDYQM
z|M<_syDvuGFLMl_iDxdp6!9JfT$LID9?;ZWLqw{_BlA*Jl}<Z6)KK{}AuA!-EU^uu
zemSW>8WR`fBmETtPCN{D0~X!#!{5K$yP=7wHQ?*fW*E2{0~>NfZe~RlR+<eop_-0!
zrUV5ZN2799-4>lOrG)E2mQF|K_%X_qip}yyIU^RbE+hsUiyI$bxPHrLe+dzhBkk3Q
zeFxxt>Onx#6os`Y(WHoUJX8;kHB|7Tm7z|WJ0ak4I4W6JQ*NZA1~8e-SL1G|iXSrQ
zIbgjUIR2f_+_vS5wae%99__cALWs|n;V)19C<R=bkSg<fqfxTjq;iA<MSQ<EpkQ<p
z4T?1>_C$kr7Z|X9zT}}(Up%;uhbYBpun?PR;B^Ns1ToWbF`Bs+9*%V*Jgkm47!a$}
zqr|q(9L(iAJn-!~hwuMl^X4ae-)8S0M4nCtZ#onQcofF7xU@`ZB$ak3LOh8nO_9=k
zWnWYWSh%(G_T7K#!_Ai>Z{?5zK>rh=*MUK>;u{ITTlOe9#i;3M4jWp`C{nu)>xh9=
zPzVxQLmD0QWkq14?SXrjZ(ca}gIjvv?z;nv=&ghG13!Ve48<ky#@t?qu_R*HL#%#Z
zSXsox^*(B~#=?;E=3$b$JV+tMeXN$#oF{`avEkR#dq242hf%}`@4tC7auE(3ICn8%
zVE9qJk{ZqzLfSETe=?~POB-gFmy=5uDPVnR=V#BnzVGvwz)s_gK6+mRLcK7f$4vy`
z$tZxKN((O#z($8f0x;-w+oQN~pGaB@`^;X4&}qR(3mMpK8B7SBHV)*#uvn5|J`ob>
z(isnZKySz-SyBa3UB7zi*q48=Y9ZSF%3&f;d@X#wz6vH-bwxNCQsGQmRfj3)s_lwG
zsMd_+C{aCy4<h>5n&qnwo&jrYGy7IPx=D)iU0IuIX0C#_O@gM1PVYDagIasQgC7CA
z(6x+lP$tH(tj>NOFH^u#Lld2>t`mw26hg3CNdlJIxAN|fR(<yys6NyB&be}pbms+W
zpiUY7@4T7P&``Z1Z0jbx1!gQaR!{k?!z1~GoY0IB6OD#MYMh{<lO!;%>)>ldkHJ<b
z8Nq5K29)`okL_Nt>f^trMs3qfZV0uFRzjXs1^@WF9|{QrxN%!im{Zr$mb`7W7}9ki
zk*$t5R5I=^hSQ+ax=>B2<U(F*z0`7clysfE=;29Y69C5kIcwR`*A{O6u;(h<Q9;Ch
z4)|Xikx(8E;T6F#T2qRTPx#enwpo(nW*sHGt>$;usSyU8igDA<s)oZM3rQYlJ(i9@
zTz%u<6CXUg@29z&0M$RUulB1ILOu5WSg#1jf$(wovztK-V8*ZvnNwB{q||kd8tpQ;
z+I4BHK-La7+3~t6oumLtYSWhw+;Z%M9FencHUUEY>m1!wk5dDX7<At(L73MXPS>+K
zt%BEI(bL1#c*{p6$A&#LVO6d+`*pBqv=a4>kP}inHC`SEZ1A67-TKR$XP^EP+;~Rc
z-_(bts23|L#Hl;*<*Wz*ZWO0!ED8JS1Z>gi9?A!D46@Oz%CPuFfy=HTNrN^EwhPu*
z^X#BFWT*OyK{6R{Rsoc<_TDX@ADcH9d8uiApHX{2fdFs44~*jE$^m7dZmr=WnekB$
z#U~D#OreM`Ru*@8bb68(#P)mAd9;e|Bi0AH-deLv=oe<(te9j}*$~F7O?zYWf$jGn
z|7g{Mn|qp{dH1*!_4_w`L~{ka^;0Lv<HisP!uulQl>k8^BE;GyO};!L^BF1?X2;Z_
zMKyr$V;F5?SdTkY?121sc>TOhd)I$-xF^wUH397C?}g~4@aVd6FjkSl3JT7zXXs<B
znpsxi8;8@wB?0(%OVd@;Dw4JQpeh*{5t*?HvPe75G!xjeOd2!{f4u+F{`Dt8Ll0Jm
zt`#CWUIbe-fDdGuhRJwqoX{2$G;NY|f+SL!X=A#9I3dr)w#kD4LNbU9y~)!rrFxR~
zj#mySpvi@A?Y#5PSLBEz{Bd9-=rw0krnu+p;eov=NoY)_=!UGg33|r_Q`FUFzFZ;k
zMB1*k=ne?nQJyMJj%5sKVi)TAgw;I9kO+*XvfV^osn6GkqjnyTuM*KIN<xNGlcd8w
ztcq=Ff`2M*+x7XzCqF*~HlwHYeRceDB<RNBbz|$1QHU1ZraRr*VXV*45cx!!ZV<00
z2eKI(lj}jJg6@Vaq$K%lk_upV9(nhxC2xLx+KI@yWcp2r94##59s!(Jz2wi1R72HJ
zf<^PHm08tLtAK7b>S7r+J{IlfhKK@1n<Y-wu)ZdvjiELP82v!R&~8S})I>|xNh<3$
zDyG0{(3_yrFM4eIGp9ayZV>s<YC;G3kRMKMMrJqAM0PY{OPRf5EjLKVwu1piW?%%}
z;AYL`)Ck;~U}O`NB5%m42DI+{y~{TpUi-<^j>+q$t02^8*P;<=a@cAehC(K4M+9dZ
z;=)8lP{mdwG{14kEEnW*ng+)=Mu%MDSS-VwpyEpH1kWkwj0fWkvI?y&(Tv=3*e}Z2
z18yO`)(JoipUUJwO#RN9BTsyMy2sJnH=l=mO9_9suMCL#>;#7`l9v3D1Ygb$HbV7y
z!;(yy(;Q{L!oj7}8R3yUWRSE)d|s81(}o;nsWgQKME%Q))@^=y)_n*-n$~xM_ZQ-a
zT=<^<0DAfAy3j;0xrq!DSR*v(IzwiwC#-5hz<D=6{rHLnD-Z1N1%>0S7=$|b_ZXrN
z1I8}}lR?O;m(>iaV2T+RP52uoqq$hlCIh48u&3J!D_zOZL^~cgOyER%C?$<V(0Pc}
z-*OBW+eTJF9R<_beeW#T{rM+{Vu)J1Phk<Y<nVON{nC)u-;RZG#he9#!uD>ZLsByB
zS&EyK7V&BRF@@Ee(cuP&9tx8(fVc4K?3T_G2Ek0j6`R_0n9=TJh;e(qjzwtCPak^n
z^$joemeZCmd>#3S6aG7~25d@Ooi^nFi_`Q27%rS(QCTu$i#Qme)BR+#t2s7=!GnJ>
z;^LMTMpD7Uf_${>2v?&Mx}u6bj0YfV*-L-lwS74<T%Oi9=l&NE(QeqUeF@NnDI&*M
zk5Qa0G(MFlT2!JW=r154eo%ugD)d7Ew^d}vDYH}^xfN-^SW&RC`IV<0SoH4WOOUiS
zt#8Yp8pPCfc+>6uU;_;@>9bU&IU?km62nYMrX#Jj9L=cGPSLBP40%9|6=L(z8d{>E
zR}3wyF)|V!FHPW8Njx7}vHNtvlh42U-LE~8_M6qczX;8Q3%da4jLsRAHDPB+UGvdW
z`MS&93Gj{njJRFlCq`-nmJaCk%h}Dl{yuYiPp>Oqx(aDYP4MR1P69@a4t6Dt!j`<|
zZqWSdrat23Vi{@-hMh3wb&*I;Ox9_JViQX62RR{tZhzkW=4%h1oNq#I_}RM_<c1J@
z{Z7yo+!zmQQ!Yu|rjdkG<Ql6oSg^INoUX6H;L2m;V2<_YmZyJz>7JDU0!;6_@$(4?
zjm+Gf@QtGcap-E%KqwO|WpyG~w7;a{CWJP(Et+m>8<X!GTE6l9rF#KkI-^gqZnqTm
z+u0s%?t|BGc~FRwOl!GJH;x(;`iE_DzMeTMH|G2XB273tC=3hn#E3Z~$p%vluMKII
z-ad54yE~Wmx~wCc|AV~v)$keIA!%rMyj!j71r-t`!&gbI5*F>0Wb=B8GUE`l$ZQIl
zIG_<{6y9u3ZEVL<0ZziqSLT%Np@NlE>V&!!HZF??B-NkK%$d9W<u`ZstX)|jLOx-E
z7d%seLfX-;uFLRYYXqIUm0*T-41<uDC{Q%Ac(CINutaVRG|b=!E5ufXuVm`WgFYpx
zIn06!Sf8dnAl2}sGFd?)01mP2e+PE2S@J1pNvHMQF>5>Wk^jP$yTD&PjO}tiO`I;Z
z#RM6LJ8q|X_>F#_5rZp`uqlN>Ha4URb|ywibf%n4?~uv#1X*l0kQt+;j)avYxC*gU
zCy#N`D6~WoEP-v9yXn_AcOCB0eUU$UL--l6^DkietGgxa5G^-I<}e2_jM^~haJ5XD
zhz9c2{10~Q{%y`nQ~UnEY-LGN{~YaYExX|D2X6zELxqZ|xY$*ke7rth^yEe;tszC+
zLeN&nLXm=?V^9~N0V2g28XZtOK^1;+_Mg8$^8)gR;~9OiWoH4u<Llw;F*teW(*O&E
z@?0`xQsP`)teMFsMhwCUQA&kYSW97&sje1ahpF1Qj394yP1G@#1newr_+`%T+yCCN
ztoKT5U-UscFPH{wcpcm}Jp%B6$|lVforW}jEZ~ffr1AbXnGHkfN--k?dpw8t-TLH*
zJDxt?JNz}P=Z<E0+g(9GY%@D>A?L2fJ!2tF&Yp>wK?Xa1V&`MuKKa%ZZ*k_XD1=)3
zNd}3X^WY^{fJGU}Kup^n;8kjddRm>#HF-F^!b$L{@Zt$Cjzo>M=u$UH?JJn0@X#oh
zhOLZQ+_^EGL#>eeabA$eHl986&7r?jh%?Nq^oThke8Fm|G=wV*8Myg^mRl(5hAaKF
zPIS~|t*N4MR(zn7u2c$j3A641<~aMt&%6FU3#P9#`)oB4gwlNq8WUvfVuU~Ug3Y9>
z9TfD4)J&|%*lB^m6v7hI23@=D8UYT!`<Z7yI{PA+&&}++v<kX<!SpP^A3HC&2pkW>
z{sW+Eq{t;fx`!!<8p3G1kK7;Cl)P{`%7}Yx)~ZoBo^^_J?WBxQ$l@m=psu{PeBrL2
zK1RldGy1N$;v*@l^h9rxONHz7i@|OtDQg8JFTepdf?vsJV3=*$IKGWfrE;05KFxMA
z<Z>fjIl{|k3mG(1p9T18=h<g}eEakp2YQdjwG1Qn7r?j5!Q{mlFw$Z%zi_A;qR336
zm}<C~9VM1{Btgoh>eiyzc-vHFMKoa+rcRE4+iPp2LaS{}a|VoUT!q&K4WO+{33c^@
zVo((~&-r})(X9sosW827@iWt<z17Azd}VY#_>XzDO-NVpX<aBl<LO~>qCs<)+F=nJ
zz=Zk#Y<ubS;b%FBAukhpAk+`HkicH#6!^LrX6cDwT<Q<f8w?hqKTQ%E?a>J^1;lic
zO(`>2@{e%HfS+5m;nbeFZ+-+ec4zk8`_|<U>dcmZ0NB|1|5*A8hC7RE>)zg`v?*`D
z-rHO6TaLTCySw{y+}-`08)$J0!GZ)05Q;k#3l;(dw;)ABA$TcJoNqtpy+7d0nP+Ct
z%$~K^TJxhUe6SL^>W({M!GsIs5UFixB#mZMiqWL?a@vJN;g2*^bW5Me6wKlU`GDVb
zmO26{sbL3LW9$33Uhw^Edp1&#X9_Dhv<tzW1Tp_dvzsR8xr)X-W)zk1tOS!^kZSit
zMvBY}3e2ZIyZp^FuX=oCS};271enWf_HEox#mGY^9<9nc>kbcqst!k~IF4a^29wPt
znc{uYJa05BaBWdQ^$aur4CYnOa5<b(BwlY0IWD1;UlVg|1-XK0wc%Xmu8UwVCLu}P
zeb=ogJ^ioyR(s=HjU~D_#*z2VgN61x6;&V4s8eNnxtNn`9psh<4||wk0@&a&Cw%tk
zWv}h}2;$?=wP)-i_4*ahs5X-GCh|-JNH%i6&kIVtl#N=E>JfUSLX(Aq7C{D%Y^$sp
z8}q~(KDQ)jvDt&McwP-Qg4C#Ep<Jq4G++^3@Zy%IK6&!UG`dK)+P^@1#YO1ngPQX<
zt~QCG97S+_tJ&m}S*-?DET6~1wdSN_Pk7^ly{`cZxOt6o5r`o^dw)gFZz5N1zFL))
zCd8C<MQSq+5J`Vd%Hcvo2f>sMTe_)%)7a(B2@*p>TZl_qcwd2-FD4b11g_hh%us6Z
z_Iu8L<Njke_9WdDSS3fl@-TX7W+6u@fZL_Q;BB&YK21uuWPHAk+0ik_V$Mti{wGSy
zJUjCByLgwZ+QZF-rCKo+3peWWB!^zZ*JRuns-Au5<sJWi<iH23Lg#1wRm##stZxEg
zg|5`7kWg4UkWB<uE7)>G*(QmuLRw}q5os*PEccgMse~=c8l@0;A3yNoo!hT@=7ZI`
zz0l!D*DVt{{>N~!H<y;F<S2v~{ZjQb1RR%O-4?KtG!E-H*QJaE91XiIoe%{)akPOM
z3z9kGLQd4zO=*NDSaty&BeJ4qW&!e=?Vn%z%)#q!(V~;{AB+`o8-uvmJ5*U-OQP`$
zrAr4b!LIpBKy+&fR1PI?Qi+O#DWvM4yF(UbatRzw?xL?FB^NX(s(y6SS+9M2HOfHS
zw6^(;l`M>n+`X%*&Kg=?qOlyqTI!BYHbvkTRg{+7#-<Bk)kMNUB8|dJ5_H49A!~Ez
z8N4jcDXO_!U02%J*67HVme^E^!lwI|edj)R&T9v*Tm1tT`%^TWILOCNP=IN8_S!OK
zqI7azy0#pY33Cg?8}uoqQL$1V5hgSpgF;VoVU}eV5>UFFZHJ*^a&_7%md|LW<|HoI
zD?h#Y={tAc0!BNV)_%BVLWf+1y!P?^kmgASEWtckCiP1*df7hU+k~B^FCp|(BYlF9
zg$CB!pPhZ;omU&tnEm>1VDw|TZ?AIikL=Kf1^Jhx35Qa^+N4&hrl2&Ls1xzYk-HsF
zN9p=<u3aEo=&7!HKBz*O?&F8<JOAUy&h4QKGWfktz0UhvbYnrzkyqY?f}?9J5p(F6
zxLZ6M#4SXUVN6srS&NE;%<T0elu9SAfb2FECDr5RfmQ3sPd%-gtCgNQE7S#}Fko}>
z7)CrelGr2~Z>R?`d&AzX51o782K73A=&H66KyoKzVXaLll7+4sci}Rj_!zuFaz>4Y
zY7B?8LMUlPi+bg}))?|r0uRF{N;lNfx{{qRsEK|cfNg*At~dVr<YystI3KR9uAl#f
zY>@#pM{>|C6TWgL8)#s*Tl0=~;2Q|FL@RZ%7>QM)uy2IN(g3J_`N6yIf9cL|R#dIm
z@BRTgBWy(S$^ve%gIRJYaZ@s^Dn&%16BccOnt%_}MqGYvS|Xb9AO@pUxdm4<$g#N;
z?ct1WlXBEEWxG%yWEo?Mj+kqwXZ)lS7}@3&(4L?8_KrJWeE;p$?EklNmAAE#?*1hd
zFcVQ$hc9J{2=+`Z8z+;k5sU~ktX0)C*MO^NW$FxtQ^50te0esnM)0)N;U(}VuYB|V
zC;oBvrK?!wD_6WlKXU6q==`7Z4V{-#6%mWE<sztxc12`sR$huM<&i`%s({4g`bST^
z<<$2enl`N!9=RM1^Isw_d<QNI)KIDeiY9r|9Ilb3-a@`C7)`Ttp-$vtrENAcNLor0
z3@lM7dh9>)&kygqYWoI(<NL{#s`a0rqeHJjze6tY=OH3NfZg}2O+0JF>ava!G5*{`
z7y2r-96uoQlM@0qwvC6Z@q+ulyX}j!KDD5+edrq{;9cLSMyCRcJo{4|nh~?y9(oZ|
zHS0X&C0&E(s4EOaHv@R`#@jAG{pv>^+2D}g9DQz;Afam_i=4BEpw9j;snm`5;|e~x
zE-fdeIWn%0tr<ge#v;y@a&k#CrlKebjG<g{CYg2m*^F0g)D9M6SG5ouS#dZ$t5fRF
zr`<SfLA0naQp(6(94nPxoVPx6RuEZk(raLtjeO8h<_$+pPQ~t9j%8G0Ta(wZmj<9}
z?fm}X1G~R^UW1NweYw*8(h=85a7iRsdD023$_)f)QEE29#fp;}Yr8p5T5N&Pa+u|X
zHATqMw_p0_i|@MbY*bsiY3)A2Y7=cE+mFJ4DHt{2DHdW$UtJe#>xMwRk9ktU@$L`L
z-G0oc{{TRK^V+|PKUc3WBP;P3AGwST@}0g{H;A;76|P#L5{?^HTsf|2x6)aLE<_fL
zUCXXoMODQ4zA2d-(#V(TY>(F-YXTwoiAWL(h}%lrAewU-0~AdqNz=9TeZ8ibAbKlB
zNuo2C8NA~>4v4G^V@=V<R7VBHxTAwo)vlW_+jHObw?n?NY3;|K{1BbrKOmpn4VCgg
zj_DoX7lrCGNx`6A${U8sL@n?v8(#H@4(n#`tFL^2|2L?$2vG1ISXqLQkh5=kMwMlG
zs>7MU=ab~|1Yj@CCLur2i+VUS13&i0?EUIg*$a?Wk+wM#<2pcv{l)QL-gd{Udmo3k
zHn08RYz}B5Mt7spKSx+ykhGEXT6{ZRa<@1UYyxZ~LVc&HBc9GX0BTN?<}x!e^jL<F
zLL70?69-P*dIYG!H?LjzfK$Ex^`;dtszk)kJqNr>iIJ$m@dt(MjIOX4I1Amt&n-2(
zOI@Osv<RcJvM*<Ej2bY#XFhcFy|+CC8r02exIe;f{5--&$L1%9;0ZD8kKQPmP;mAJ
zctz6UBQA`3k<y`S`3C7c$4ahSNac*P6s(P=+N{Xlm5oaii{7h`G}4eT@B8S;N8kA7
z>ffT{mPYPCKl6vk2lvD2OS3jay-2bZ7B)jl9X%N(;fz(YJ82nY*xg!MZy6?rJxo{@
zr=T_Szu$WNXYW6-0p~oTU9mR{NON0Ql~rJ!EE0w_7xpLYI_P(1)qtI4%JZvHSE-Vb
zREhCSI+M?*g|>8Qp65jk42FTtMCuBe-r+^LJ~!<7<mBx)tY-GRv;1fe4akSL0;fa8
zqH*Pdx|j%V0r{DbXzuHgU@taY^z<f;gw+%=>CGrc$yW7L^5KN6At;G)TyS3U@pz{8
z3ZXpi{d2#1;<bOQ+CC??0t^L+!1y7=Texkqn?ih5CZNI)>Ub@V@2jQRI=QJngtF9Y
zH$L~_8<*UG#v7P?oB?&IV^8}LIwe*FQTzbv9uAiq=^(_0NX{4VSkVTd7v;vP7AK7m
zNexVSe90YB`g5FsV{Yw%1Tv{`L)L^+d~Vrx*JZbzx?$1)ZWL&nKSj=OoukN7e08F6
z)CvMbA6CdTSwbGs`jz<BL}&EH>AF~7<mKqxWI`0u@Ewo5ap1idKzF@)?UC!i6ly)X
zj<%!)IO8;BmWdJijNOz-?aR66G@MT{AyCO#Qi-kcCn6<CGF4q28zT~D^nqL>4JY79
z7asNWXUA;NSaw{oN3|Y&Du^bmTI8G`p9`6ZZtAh<Ck{P9g-5~)BN-8=bc$TfoMY-H
zt|`RFYoDHe@6DH90|s-O*8bnG&qaSLK`uQ$q0Z(Z;c{7EYa1mCbCV@fWExnQB#V-V
z1Gq<J+d@n$j$JB2na|fPFE~?gpO58@tbBfhBWbZq<T9Vtni;JNBh#f}$kjz+9J}bV
z#7I`u)P!9o&(KB-z!mhH%b(ox>f^^T&<=QhwgR<(flPM21Mw*Up(lkjbXj-;R+$%@
zc^HKt#WX0+p%_sCQf=Rt^78mm_OQc}bG0n7JEG)^gStjuWrv*WgqQYh-LwBKu$tMl
z7Iv;EvN7auV-WdKoFS>uOQ|Tlp`;MB(Q%nI&5e4DDo&>k1knnIm1x8$qXHa~w;nwI
z#9JTv?%*mA>pyIu=Oa|m&S63;Lq?EZX&EL2&<}AY#H4Hx2-lqCSZ(anWo6n(GiS!j
zGgJWFuYL7jUtaa~j@1$A$OE5n7wLO+q+Lkj1Yip3+E!MFL?1h-JqvNFYALYd3RlIj
zdvW?mErFeB?fr>M?@q8R^g?SnSL-BEe^_fZ<>rZ2*2id(N3dV)z476*_U(LnLznfl
z^zmr>9ONkR^{T88w$pf-XNvm>c##k1G+?k!p{JM{$K-NkIMhoQ!!&N5PYaY<S~aPN
z)T2I97{JLBw%z&E-?tt-b+wkVq!8%N-_fAUypG)b8yEov#xW@8V(E%Frm>sk8p((q
z@5xjdC*IJmrJH0IN0AdK{RtPXPnbJc4A5?fQh}K<Q?caXezE)13(oxPoWoaF(%q+|
z(Pi*6<owh2gGSZgmeE4=souw^7-TtYUrY>WBBn7ML{A)d&37k0`vuBkJ#;NC-K|*v
z!yjJTs2i4%EB_mCDo$Qhi(6w|ET69LFfBZ+iD+t4a;jpJF(eBD8B#!G_D7O3BTm@1
z&I?k{_<|3vKI656pI^UGdwb#hta|<BPyUGZhmCyv_Ghq<F9nz(p{B@H>q(1JIm9F_
zr7E`G>Gmqru92jgD8oUVDemtqG9n8Pld@<%T1O}1;6X+5{qMKzdi}ejLHM|7?Q6|H
z&;Y_A!?QS0+O;V2&OAL|>PK<CL0uKJrhBxsr=RPPb98-55|wfSdhf*1pQIfFb$C`|
z#zzho8#A;3fN;#V&u_b7>viZ^c<5UFRh)YLJkFCF<G?|TH>FY9kR_HEPYEvmf{np1
z^fLNzUM$vZRCWRwUO;i)fA$mCqVOS9@eaKh%Gp)ungV&$ah)owQ%HitxhTL3TO=F|
zre{rPJg#`c>7RRoF^r$1_cU@<i$mGdRar`(jLI&1x^vYcpR8cV_Vk#GmjK7=n5!Q9
z+n#qmL2uLGCDT)&kwZkDEnTn7^06FTg3)rZF<FzT?Mm|qUMdl5@^$!@2#tuuM%}bK
zJI!=@oG3;_kWsQaB4nD|9=-IF6A#|FZPj4wrkl_Z{}b}#PtH<iP0<9$k`?J`I<m{p
zSuDi5q@ZsyD(Yj+poFPAn(^p>Sdp+3H8;Wv6o)xO-RbOUQ+$oit<}V7fmmu7q5y_`
z;QCkoefb&xQlK0339RRo>nA_|J=$@&ru`N=jvtnoVy=a&<Ea-@**KFomFfzPf#UBs
zHF3K}zfed4+kE+k*Z=bBj^m-SxOpvjgaeS?Q$9jFOGXZP1GEQhmSiN1=Mo7cpQO!5
zhu&mFrzHmmohb&vaztLat;ZZXIwLMGE0RcYaML;Z!+S5d?c*~x?qDwpR!qfpMCSp1
zk1AT4wj(-{G)9U$*qO?(!B`S&X)fEKM#AHKEIGCgeJ)%eU<@nhAt5>FraJ~&4rUap
z*`+zS*X}>|^rx<SbQf&EP)j%f1+o7){w?&2r^t&}f*}_uD@5jM*p}k!Nnw_ROm2vC
z%CdDa%Y<aDq1cp)WwbR(Hmw?ZY5|WxiH)0l$zrl1ugVGnMYJ@V8|U_cyn!MBXTNvz
zyU)G=+aS1(O;`9l4|(T@{|mV=VzoIX623cM9M6U%%zS3YDN3+K-1ySVN9}wGK-@#u
zZu}NpIDT^d+Z!U<8dAc4pv;mrVKYT5@g=k^$qa9lh=dMIpe1WFsXD5w(NPP{%<fQ;
z1T^=xcP@MB-~)G|P$&2?=I&RmKZsq~Mf#B!Ux%yH?{e<N&>hhtBDsuMlrEMmeADg5
z`THP3IpNw@Uwd@R*L1WS!>?QF^*-kR1aBndC#Ta?S%E2@wMO*3rNEt8(z|sIJ{1mV
zBkV+aMlrCH)zX;JwGvu}*o+WcHt-f)o;@4@et6s4&maEK?PRn|jHA`+^}n9JDj$^)
z)1yG=IgD6J$QsRHZcJP*^$ebD9#JgV&4iznT$Xw^s3~l}@4%NgowXCv37~3y6-Q%i
zirn}DxCe>JB{fSxkoOiAoCcqZt683wLP(<uSj|S$+09H$OqwrYqfC0!Bn_{c;U#o@
zO^|{y-}~r+qaS{M=N#=6Jx5Znt6%vNZFq^K9tJ02y3lT<7b)X@gqq1&1{Rrp!D)6Y
zAziDVFB+LWuPvLi1pNA`kp$P~?cd+}$*o^LxN(HU?gJ0nEuXDC@L0$XKHmwOwb<!N
zPB|W14=?ZNxNf_UBQ0<-`B6-0t!pe}kJsoP#sxtcSK{}IJz+QjzPSC(?RUO<&MJzO
zhprNaA@cbD9u9>&VuB$qMF{y~j%KG-)U!;uiHR=!V>>@ZMTBClD{b!sh=${|{Z8QC
zJbmNM_ndyo4I66LADsFm8ubdKumfrY_Lz6h8X+Vqzv>@P$R2xnW>MO*R!hBAwh^nk
z8h3=x%6K8Xu}X5psG<rEYhWzc#UaJ7rSxKWv$<Hr;p^O>!3dkm7suXn((cEPfl9)r
zwQmY|^kkVL)jSlYc-iREf;Wj8SPnf_XuDXI5*VCn1qDH?Q4EVIQhE__^?6Gyca(3B
zc=r523^(qB58n6Zhwp+T1*{g+uwox|F3>jnh@}8%+V8Xm37;Q!iz<|kYste%!sSGF
z8rL-dKKkN|6Q8^J!H-aa{-J9>J^XRydPezwcF%_*zbI(ID@?|(E2xP@)soIk%cQKs
zJ6HypTEZfavvHfw<RCo=$+?38lvuX!`0A@Y2cLAHpLO{KW3&suM}GPv7(TWn9WALx
zp^3&v7_*uoGPgdP;Ht8Y%Os00^)n8$lP8$7?cp#VWVRE4^WS>${%7}{b1!P{aOm3J
zzwA`4S0sUrYD*ruB6GPsOOUc0rlMq&m`-M)UQI#uC0$b@UMXZ?+p@8eGvTniKqq<P
zi*GLe{{FYmUp2JU5@A34kiOB-5c%XBkj=5Dl}KpTZi#E0Noyi(i=_n<l1o%@#{4MK
z=`9E#dGg1D1dKK9SuQmK=-i$i58r;n`%glfhpfG}Bfe3l<p7HxxY$a(JgCG3x#F?d
zIOGoMES55sO`G_5Mg>oB%L*Mg0Sk{R_(+Bti6@IRC_a)aU`R{i6dzXz_o!zcIqisD
zf8TiuG`?w#B+#J4=tF+~OEgjSo0(wdVyFaEeKn@!n@v2{8rRvZ8j);R=@%2s=^{5R
zu*3L0d)X7GTzcmbC$3s~>(?uIvV#2dyj#HcOD`u^lG0FI*-;b2T9-vwcVI}Zp$e;!
z6$pxq8F84Xq0tBr1&*LL9aZJ=1G%yx_v=e#<+2^dvPWj9xOS913*JW4&eg>!24gf*
zo1AXG!HN;+_`K07g_PpigKz(3*Q0l>x`4FrN0$=~v4&(osEn9<m9_;}wTAGmP^{7b
zf8Z3JEj5fx#;Ffj2gf}2{lD)0_#1TAHm`m7@qek;pT?}b87s(}Dp)6+g^;MWW$}4D
zR_>t2<C%am#k4S89UGn`(W#(R)u@Jj(fAx=6YAq*Ii#0cPdIAZnXg|9NGUi*NbW;>
z6G0w&=?K{BF=>6f!0VafRc+qS$je&<_9T;KE+AF^;OR$pzjfZ<e}Vq$@Sio&Uulr{
zDS*(kirPh7z$95GZFOF#5mG%(mjL7H2+KjG-#CuW^vRw@M^P`5?E$X|QFF{$7rt@X
z-eVz^fC{ARCbX#mvN@RpgwLob%8L?rxr?-X1guD>4cco3v&$1?hoN9U-g5k<Pd@qV
zwa1~e3G#+B2kP~`f^~p-_x?x^t&kDbYXw!7Paeg`5n+bKsQ0J#&Y;g=&FjKKDAm%d
z{Jo*yIc7?cR+q`EX|399Zk*<m;JCm4sqN>ScG?50+VyXSKS!fYgUA*DWI8pPDMdJB
z$plgpP8AUoCD<ya2X3tlNdM{<-pIllD|?lp93cxRicE|$1w+7!n~tY1W;JQUQ6;$|
z?Bs;wqPev-xRE?}>IGljy5n#lyMk%nlPkPmf{b>0U?>BI8o$FD<NDk|gN|!Ot=Kxn
zX2G<ILK#yvU8=l`oFx?&s8h^JNd|YhEpNSh_otUVhq}~nUc2+RpQzTajjxEwzd^!3
zAi+YRb+kIVerAt%YuPa`EN3cBlMdLJD-lVMB&x@l%D$Z)ix2@oKl+N}zrAb!Mjr55
z<1^*@<A3@sItnsm#}!bxQ(D`>tf2#jWHp6hOmNUmMgxfxj49|0Z(b`b@G<^gJ=4h;
z5}v*%OcDj@V`ZLi%yos5kOabR%Li}o`|9nxr07@cuUPrh{1CZw#}aZ!s=>fXS^T-B
zC6%V;iT!ERJi;tvEo{glw-R~9o(<;bom0MlckfAGKEIm!=jajj`fleV8>K-Ff|D7b
zG=>$-@I1QTqtmxF6e6`8U{Nt*DNt0Od+y+QH{SH<pU|i&J_|Ms$BrEv#esF?0traG
z+=L)&$XZm9TGQ66kkeXI)o2*W#TvJ_C@s*94kc6B$XLcCCB39Z=nkHw=fz4|wvwu0
zPKdq3v}GPlltI(cR+H=gVFobVe?I=$mB)Y2K|goPRz8|27?J6jKT~9}orqrG%mmy$
zth`y{lLzTQ%W4z^*rPHcFwyZ5*sQ-eXZyvUyn2rooz@SQZRPsIn2XRRevC-J(?L;;
zGU4lL(||`7abU1bJ}sIc2;@1uhEiT+>2lVxGjt4ucuOQ|hVsuTCw}_Gu?H_eDLtFl
zww<6+ud_~k6kT<PB9<5!P1B4(XT`M~`axHUpLYyPn}bEuD*GXUJ=zm4!kJ`6;WrlM
zSQ`bVao?vOefH{3)QNEO+Q++YR;@oqS(V4R$hL2xJT5KbTrrt=*&%0D{Gc$*8p%R>
zexM!Axfv;`(pPV`I-R0kVM`5#ZIahi>rBWb9?r~#tnK3$&%XMU=bznxlCC+Vh(=!y
zx#+S_L9(Tal-XWGL02%L#dEoO>E}^3b+yPIt(nuQw!^E^sO)J!GX*T54~~56fw!*S
zwc4wymmY#Pqep&z*xis8lT?g0SDVXJy%JvzjO8-KAjw|W&U?xw!7_w8h0gDkHzC~4
z{oD4d4?KC_3gQ0rLp|C?1^M_7z$f@alQ^2kgSrB7?np@H?0Hw4lysYprbbU2@BZ`m
zr$2no7uWnJ8frhk1N2v%Pk*^_%94;59)SYx@1)-0RHJi|xbdc_AagU?F(xepZhNSZ
z<CF*P`0}{RJ?M`Q5ge{s7ytbq8zBxZ!2g5`H-E^+EbU^fZ^_|ic!@}i676GWLmnaQ
zRd({ASWvNs<bs^gZ;@GJ<FY>UU;xW{=bfvMe__w(HFU~8AAt4O7vF@@57HtZT?VW`
z+H7hXkJ*hL!>%LbJ^fm6$?cV;$w*$S%}seyM`B2?^l8(y6evFXUw`9~n@>EWgtqmk
zDx~}-;;KfKLX02wAk|#bbuxQ0F3QRqf^eNW8gmEcx{)@t6Ff1e9n76*+HhplXkgN2
zC+vk=zq{ze_dY%og)KI(eR0y?RO^qYl4#$4g`CHQGn&;c6*QIz#?~}3u_aLm^s+XO
z8ml9l7y$AFGYKm_JQu~%r7)9fN}-H~7xz7K`crQK8-4TIUcFSc&fi@|+gnF|{Tx(X
z{?s=oaUC##SH$%(N!}ewAdzUIni=y(Q<E7Er>)<;c<yQceEu!y(5AKDkfp%&al+3B
zi1$?+AUnb;wGa+x3=F=nm0_FZK4lz3&F5QVi^xl9CNb)<tmYqLaZ^*UkfKP%n32@H
z7-if<Nu32}%(uHg+xh;{8!jd5vz5q|h}^d8Y(OOfUU#_{FU1s5LYBScwAo7!8%T*}
zQMCXU=QFOm`MsNtC7_++T)&c>)seL$0c$#}N|SJz5s%KmLFk6wQbVFlm)azwpmbBb
z)IL-P-Z^c{{--WId;`%qum0M`d3)}ypl@b|2X&kTNiY^8dcr5RCb{g6n!fOM6YizN
zm1U*vQIl0d%xdyJW&;-J*7Hw!Z_Ag*uH<jWkk{1fvwt0fHWxtdzpo7(QMo1*VMg?0
zLn*0G$SPLOsEskw?Vebqol94y`G~|^r*<86qAE2_Yx*5RDHAs*TkIZb;V-2igMVk=
z`v))i#{pEnxM|J$4?8+@BjgYFn;=RJ-I+#d$4^LhPg9y*B*$d6VqylqT7N_^l8LNh
z(6gkN3~U3+2|D)DeYZY(E$U^qX^m%E6{uK9|BZ$!o65B-Se4I_Xw9NHh1tIhER8x!
zmbVOfGwhKN2?XmLvdmEOrfCJgkw}}zjqHjN!^9vJYpt!!$5cdzOKi_^M7{K4o{W0T
zd7lpe{Xmj!aZhFdK3{q8uc!R$;pbLc|EIkN(E<87lDakvY6x{Cmgl6GKC7CIUvfrz
zdW9RbHHIxRjxUt*6p@ZqI;vrGZIY%gbTh0fY&a0%2hcR|;FB+Wyl({wVp=QQK7{1Y
zw?G1zU^>eZ5kABT4woUiS?#7`Gn#3nC&(nS24%7&#_EK61vv---ZNvdaQD1p-|qb{
zzWJ9`1?4l@YPB7L+$0AtBei>JOZy{%P(;n`4%ww(nK$F%>@G7V@8G5RUaxo|76;Sm
zYRNO}6ex4C)RtZjI|#vzOE>6RxVdjX=CU*Hx#!jm;Qe(9Fh!0(Y?a|Sk=r)cp(s4^
zEXf|O&FhM%M<u~n=<~%4YJSnb>?DoR5Rv2{s7tnpvtVWfdfGB+U`cm@!0_6QSDv)x
z(pC7s@KPB)3IB*7FMt;-HdnS&5HDdk3dL->KBqD!^yWOI%M;Z~^KrI<fuP!d->x$s
z-EsflAQ%o^`{<K(^*Z^(g_;6MqXrtPAm{(p4|PkuFrg?Yby)FWEaXUxq=B^EE|V96
zdXz7gaw`@=Ix-*cKH-d0u03$=u^Wi!<yS&Jezk8UtsfvaZUTKIp_s>20<9&<Pc0-D
zR=LRRrqgIe65Wk)C(R^vePqVz;NtY`HP3x^#kauv+Pt>?@HbTJ-pop3ltpge83G$7
zZk|G@h(wA)grsh$mdH@%*QgO^c~l6R$MU%th8nvd<tq|x+97e$DEJ(KowN3QVig0Q
zYC`^S!6$#d?dWX~f}7WV_R#^=`h~7lIi-v|cqD)zilK3yYz4~X`5fc1#+`bBxb7R_
zjFr?RL$xkM9gB;XArkqqiFOba)iY+EjRm(~QXj)#qLX~_Cp-Rr);5&=v}x^<%U4D_
zKIHJnphoX1vdB|QRmH~h!a;h=-w{iPizbf9uqZPfqOvH<4I7j~abaeF`#{cJW+$1+
zNGZwAQ6^p*#ZD{O6&(TA2CnGtcB^B9V7=qOr7yjCF=`R9Y3(n&S4>DF^6f2$Ko-Os
zCYe4$iMFf?d#ZHL$}%AVCLhaEN*by*;*A7@5*}Gufrl!fwt3oT2T#~}`Qs}%Z|hAb
ztJaU+vjR4LjXWgd0Lyf0R$xJ@xEQ!wGLc21k;Ii{b4J%rv?-!esyiSjbO2wgf*h$F
zP_w-kA2|2%b1zy^EK0xs7G2{O<S^n-m01cxBPXe*l7wi7iX%%TOpJLEVslwi79%WE
zP0y4P!-=q<4%z#ypPlpJlUKaDk?$OK$<t_Dvypc<7XZCv^piLoaSYx*^Cqy2wT);;
zLKd>y!Dzxv_hx4{YRpUt(lwoCTTUr^C0$!bE~Ynzg}U8hf!p)T|9<(o19!fC(`wuv
z`mF`sNx>}g46`CD(PMIBso3c?N(|j{ooooCQ|7!{p3BH+nUTgs!jcT0z=RX6=kozy
zhmh0~W<`2O0UEn4C*5)Uw;#Q>Q8nFl04&q|l*15z7;Z@^W-UtSs5%*Quo-m|W6Nlf
z+Z5R}U43%Gs%UC~4A+jOr!#zvR#X+}#6+>eI&YZE8CxOE)8~eyGAKGDk=~dvZ}#|s
zB-Y#?IET%G%u)#&mTrK#Uw-K1ZTCI;4Y*HjT8pi(&aq!1%<Fb2vfQzC>_}SNqgJHn
z9FUV$SKZ2<1QPuw&OHt=eKw%9g`5^K(KP6%{qmF&D15tLx$)~WKD}h)Q<!hAoW_*M
zZ}<ORmi-NeY^V_u@o`9>C0eaI4Ou}78cOi}dvDqI)s1(&xdGkJuU^qi=?F&+crZoF
z4Yz7U8_uq&SgSEc)60$1+RB;KBp<~<6Wq#DrNxDB^|siq_xGN>=Zz)0I{%b~=dgxf
zu5#Ta^6{mR3Mjj>sbuVRs)ZSXP-Ss5n^kLkTu5sS?S(8xx0+@%A7-Xgxy5d$S?EpD
zOkH-|q1Q1Z(JmP-$?v~)+18h@z6*$eo7T>HYE>g%L!Q+E5cms3qU*akcKg_16-((|
zIMSc^?AY%Pzv^+6p1gT&`bRWj{qYKFnIOWS0l<KrL?T9$4p>w8s-7K|C<Mc7mg8HD
z`)U`apH!p%obT^H?XuVQTyop0jh8qA_4@e9)uxa^o;v4yAem7bGyYtI^l1KQKQ$vt
z;-*;2P42n1id;jO>qUIIMz1&vB;;7(#E4nyhy8|vKwV-dj!rt!Oae{w+9#em?z}&r
z{_HB8|9IP@s1*tmxnu_@Wz0;DC)u9sU7ayit5grv{gB_9uTP}3-qNmZ%8UqJSk$v^
z<h+NC(R=iYk;+Z6k3<@w*gv0-7`S9EE2Xlb_VdK!*WdHiH>a%xT*DWBj4o<9ayAbb
z%~F11GKhMzKD?SYF4X&8M$AdA>zUeQoysfg%hLrP2c^x4U1p$W9F@6UkZ918x?#%=
zIn9^1+;-DrcW?0fNdMDCn=K+=P=S4?aF>%o(ZpNjiK;1F(=4;~drf4)2q21>g2&I$
z7=%j9N*A{5X`B&ni~C(cLRLF3dlHaXkGFh!&lOi+bn?q9-P4}WSGsQ-GK#@A{0D#9
zKPS{$sw6=_pB22k6uF*YEz4}V6!cQhobvrs*Pi(03by}$PkB}Ax5Q81D3SdM`CbiL
z85O>x8zw=jSHLSHwZJf(mx|5PR$!#hR2y!(-pA~Zdu%y2OdDFJwjlWWmYg_glfhG1
zee+xoHrxAOc=M7A_wCr&efIqU-F<?{UrvWSPG}#-@n)+ysU(=Ajs}lZDkd}%WvLL#
zmk3>9x*<zb!xWqbzT88uWajw_!a(KRJ5Rjerc2)4f|8;@^Lp(n2l{X1Ui@!WSySJh
zP4jDHeN<h|Mdt-$IEd8JvwjgL6;QdYDSK+=2N8X+Va>92Tr3Cpj)rnq>llTm$RxCY
z35=K76}Tu}aLl(KY`gcJH2N3$n<D5;{Q&vvhXHlgubbDr0W39;rPx4vF_$ef`MAjD
zF)o4<Okbqol<*4|gJ6ueadN7Pt6}ln9HL7f89I!<Wtoz+mt<CP%*mQ4s8s>mM6L^{
zK$E$4=jH#{a`D4xwzO$&*Y1<h0|1YF_%swjEe0D2SMVCUC0$dCFH!wDjj(Kt=u1Rp
zp_-CPjgBy(=C_$G10nbz6YvCjfJ$h26;+aIZm!07E~*tqMX?0@@r!@G_t-P%zxw&=
zUldQRDE|%Q>96prtT*H{V`S+RjUxz5Wzqsvi4t<0zcgTnwT)ntj!%Nc;$Y6CO)08g
zf5Nc_%e4_Z#K2d)t&FPe*HArjCV{7RcYW%Kpo<Zj#=GEI%)5{H$4U;IIsSjqF)ScF
z;~~l{f!C#AxMc&wR;7ZCn*qTa^i~BiA>uU#o|xPeDJlku@s>Sz?0ob30~enS-92Qj
ztpZ9ss{Iin?<@gS=IhNxp;1JMhxPuhuD}$v8@f)<%hr49>3-2V@JwAJq>rhE8a@25
zTQG#mCP=q-o^j6i*IkdYOE#@7@BaZBjb?=M`@bl&nT|x4j|6#rCK&nj>TXR7SHokR
zVo%jVqpQhbjL||ec;$Rde9^bI>YlQc<dx^VL_MZ6;n>LmVjt_Z6={t?qiV*68>#t7
z+mQwpimoneNNMnXKfn=t@4ey9t4=%jz18^VPFzF(zKk5RX&c=7h**|*?if)CRUUUP
zp$X*fa6Sp#D3$=sT)unt-JS1#|14O*0#oBBDfD+XL=8xI7G70N!)Rc`O+#5V<T`Z~
ztD32qQRDNug<8&}MRxpHBR5t(Qh;uEy>RxGFFyS2>#P6of3qTmcaS|~0Fr17f2xhC
zLmbIV#GY0<Y%;RGZcoA_8IVTT!Y>yD?Y?!G?q)D(S>wwWZaDZ5T3X+<hW%nyuCXC!
z89T7Udo5xeC7#gr#WG(d&dP@ul!Yqk(L0CsW~(cS1zH_p$gK&{b?QiT$Ry_H=0qSe
z?2Nj74yW$JK{E8k)pzc_@857Jf+NQNtnLgm<e7V0aAybI0~zslr|MBTSTWMNwiszT
z!YFewwn^CnZqu!&-FErS7eC}ge|kTmgO1Y>IqpYZ=$E|OP%rU?sc%VDnJSr7NFT*w
z%Q2hXNej?%%4R%BQxj-$ykPE7Miu3FoLvxUMmz|pu6M+3fmPntGrs-n*Vi6IamP(-
z{%?*$13HYTE)Rj0Kc$P?i=jGRu57XMuJKe(cIEV8c1lE};Tf~ICN`Q${4!UW#u9e?
zxtc}N6GW?X2bnh&B<$sZD&vB?-4|!S{LMYjzm6gfo7W!w2%OFT=Mx(G4Sd9lfQgwt
zl8*?rO1e*(sY;62K*HW5Mu;7yRy<%6*qA}s!N-#HqI@4#WO;#vQ<I?vT)?IUlXz}p
zl61-%4`ONSj(vNNJox(ktIzn^9rvLJs0!)d04RV!z~+?oKEE!aa?>O!@dA;^k_@S|
zSO&RBt%Fb55_Ff97~*$&1_m;vA$|c9kf4vZJ^$VpXWaJpRliRq1AFI(gOx^Zj8L`$
zm>;$*iQZ7CC~Kx-{*phEA=kxyCZ#UWTf+JBIOgU=u_SL=u1K^Sau>Ch3Ph5)KB=hY
zwOGt0&O0E`^(>#4ZS+jU3aKYAO$<34Sp>*pC+&LTo)35bUrpyQ&C13;gajT<0fL_P
zLYYZ566^B_6K9clCk-1hP49UqZB5MPk;&VLv!_cW=30q1umnoNxkp{GZU1%qH@FjQ
z?JD*8AySN;smvltnJLB#CK7`3LRstBv~vB#z*2IZIWX||sB)2r9+bdBNG0-??t)-<
zQ4wdQj*PUF@vvG`G6qCr&VsQ!h$9@++E=+!Q<<>a9#^M!_h1S}9s6%MaNK1(E`Dw`
zC05<X=<Yv2w!QHibvEE_MAUdE!ZCNMZl|MS6*s+P36UNv&pg166%Pe1ooApP*1{PJ
z8DpR086I*w($+XKix7EENu{G*S%N0@4@Y@dFiwan7fuV1tFOI#*L81wbzcw-<;_3Y
zhlVm4dFPzlfz<5oH-_a_(}gQK7##JeJ7bT#+DZ%2ODV2Y8Y>7483MSDy|e$q7v9@*
zq8E)-Rp1X`5A@<rwBH>>BY#qwCHZ?HCnFgM;@l1!ra<8MT}4e(TYwS(FK5<Z+jA{E
zywV?Ux%AzWKD_Oz&!GmgdF_a8@C-xs<dqr!p~xE|a4T|ninO7LEu{cD!Qrt~!=Am(
z%(!BXq?<xb>XfEJR_L*7YksC!>os%n_0mGJpiHM&dO|!TajXg~%jz1{ZQhh(3B5k*
zn&ZB{?Te@2{W}nd7gzVJLy&j&egrZdyIh;1s+E-z-`D`SY~CQcCB;B*>MN+KQ%?^Y
zuG*@NGB49g6?5i<rP9L1DbZSfXfi>e{IyS?zUJ^t&tD-u=f1ra<uK`x?QeM1S&#(j
zg(_=?P3Y7u<ObW<SNf;pUd>!1`t{~mGo@_14FnTS!|H~FH9bNRb;TrSsIT=+t&+a7
zXvH&WB4yR(;_>R^E$?nU?!qUIdh(c6q)2~s9y)Orr1dsD@MtufZOnkK#4FC2ZOW`|
zYtfm!q|{uo>&snPxj~r0s9V`Ql5DDzvBxH_wm6%x^-~rmo#90L!#R`MD^A8+|NX@Y
z7u@#X+gnzD@#_c^{gxnNI{>tt!^p$jfEn}7L|%Wr*NYgt?XnYVHxP^r5+N0ayVUl_
zA2@LRmsdjKym{@cD^F9c?;CAF8~7O#;{i2wT_ouc*?hfT$B_u-S~6SA8^*jT4<_JH
zARM@g?b-dvy*K;?Fy&2a{Qvq-bnj~*<bf5Adpaw&$f_C?Y+BH5l~o?Di%NA&LdA|J
zGtBdXNfUgUo$K#WeV(P9k;^TZ5av6tJN((5#~r_+*Ze^HEIM2%<hR8O;6UJpyL4WB
zsB6%I4pW3qSWX3)i6vyq*XN@UPb^003n+(a#XL@?S4b-89qLlYE9pxZv(bPos!-kE
z|H3WLzx?Q(O|-Y){&Hn0RYtZ1L9eHbd2Ex&tWhau^CVA)=;ZYYgOV`HNzS5t0|{$x
zVLe)eSQd?=SVdOdtBpV%B^~(;1DQMlY09pbUVP}X7oUA}H3w(7S45y7@>eAbo()zA
zUD{leNpH+p0)<0Gsmn<T0&C==+w>JiS0zx#O*Dgz?~=FeQ()yjcIMf)y>-WvzeYQG
z+Amh@<`Po+?GWUU{-8>UPp}kAq12{ZPLOdgO%!Bx<gk{PnNz3jKqI2W3=|7V!zh^G
zM;!nYb{~G~#h)L)9rC9`*N!~o9jG$ibLz&0A%*<rS*QU!T0Bu9ZL_NfGIKv*N+fXM
zOx>hpGW}LHCxs-(bz+HD=EVFpr)%P6>g>IgB`ch2eFQ33Op~X?F&B_Nz1{Ylg(}#0
zoqXJ#cYgK6J1`KN*B<<J2;Q50V8uJ+Ax|H^U76MO<V)c++sO$*LZ!EO8e$cm*sbeo
zp#q>!xt6QS5iQf$WK~qP*aY23!9@-BLmED51dq(d2QrTklKpG{ecIDU-hSCxtI^Kh
zVn?IoH%RGMn?Qle6ecANihdZ*F|>9yb2_rkz%x&8WvSgmAt7b*&t@8-%1h5+qEKGk
z_VF`2wjO@jp=iRo<+QCE6`Kii#s7kOk|`6HL>ODLBc!?__KY82sJq~eiRifPBK0hq
zZr|^pLQ3uPDx6CJn9g4C(vdG8{^C`7bmB5=VBmtj@7aFu2xXQt&^o8#U;t?vyoRc!
zCyEe9#Uec@os-lBLtiZ^HhfFtWV$f1s8tNZ3vk6p7k~2l=jUxZdG(3p|5(}2iouQv
zHon7@VO6EdpL<13$(Sfj%s}6pq>eQaTvgf%$l#Q{VE4W=PCDYijjJF3_URSMSx0U;
z0G^dfwyVtN&aK68pPetd11uq<s?&=LMa-Bnn+n<vzRKxfWRmF=uaxZ&eVQd59?@`x
zMrABd(gHH!^A9|D?p;^iv6|o1rB?O&hv(joe(EOVqrdS$_vSU@$XLIVn&rB1{fP-g
z=B;2YR}AFnE>oLlG9qjrO*N#p>Y=L9T40FV1ozbE95&KW#3Ya<o(dJM0^E51gL}^T
z`nHWP2%mfg`VTVX+oKXdC@(BQ0;HvZnOdNhv2{3-ytU)!*YYZ9Ortfm0%4obpUd>s
zTH~M&E8v@*uU`DzWnZnBi<`d%cOTjjm!Zx539$+S;MV2HbfO+FpD;)kD)ERB!xsrv
z_F#+VW-1r_j!jNuPFUH+IIB+8M3HbsY4S?KRIv2eviG~I9=rC_kI(|xrZq!r<wTf7
z-dcMb9);5j1T8$@nsOpyrBLBpR4WnBP`3=FBV8VMeC2nSJpTG8*YMFba>GMZ<$C<(
zv(PS$k)4~9pf3tK>CF<3HBuzm0=z6Znb9R8K1P5*E_mO+jymG3bAN@#tNB0P+=$o1
zkO!CW{JV-Ao9MJfVt0xS=@ul7$q@+0#nuramkLT8DP?A86A%QQjNe1T(9%7@xF^c=
z%W)x+86X)>4bFnU@4We@gO_aFX`eb`E83+f;=Usbpr*~=R`6n7Je^}{=vub8LA0=p
z<${n_C0Ocn>4Fhn521t!WNh9;5cYg^vER&6$YyMnY|=FXtgv_M-@kh7F9$bJAd-1i
z#8xBcn;>Mc=8(DUuki*ZewCwjR87UE!fT<oB-%!TlV%dAkZIrg+|6G+e8Wxmt-|h!
z#Yd|3PG^XoHe6(W6I55NnAi+n3NWxn4)T)Grp~4E0^3|*;{;N6I@ZKAvC?Kbh!az~
z{63qK!SFF52}dX-$?OwuG?MdC9g=w$XEBRm=^eA}num97{qm{Ryw3Hfqr>of<VYc0
z8*t09S29fzLd{5x=NH6U2^T9>%eL}NPKb@6hbJ8<(me70?MHul;Fa6q_lK-m&%h~G
zuE=y`aS0y0)bK7}0$xaS@@r-ji{U3IsC9aU(hKHL2J{v8zxeR}i#9afT9B_Pv(In5
z<>N#SH?rXM7Db!Jkq|k4M^>*3=PY%V5u^gb&LlP)BWktY4qLJkr>}}fQUpM=IS8%b
zxy`H+%C&nh-~Z}G`|e#`(zq|L>X&BZmrtDzXFT1<XR1bAO_W}pMn}s?s4Ao`Cq$Vt
z)pY?@b@#yswtoJ|)hJVU^V-EXTm%MGj8(7~ktfUFfCmiSNc5EI>bSunB~g>voSQ$f
zD>%+^GfBvpLiI6|R*U*ccuQFq2xG)SepTqB4Yj<<ke;TL62eAGGhTG492mM=pLpey
z-GBb<^wrQ?Ph9a~BFN|~xJpvu{ZW|O8iE@<wl)H++AvAcnZ;pB8PaA5l!*b6sBk>$
z63(DoFMRZ)y~n=`4;pP++f&A)Np2Q77CTpG|3}3nVaz3hs1vI7<`SvTC1k)UaLf@O
z-~Q0nEw8Tr_UV6P(ZKpIWP5=I^%h@JAfJ?s)Y(|W@o1z9e9lL<TM3h<!{UKQd@~r6
zqvR{gY256HFrs2v)7Ah-g}44<GCL4BPCI?;1E*Ym_~omX|8+|iYSO=j#(#lqI~`tK
zBOx4G*9(3cmVU{z#1?F_0BJ0UjCp#7L{YCQJT;wkJcJ9|3144y*X#SwT>1Ll@##v^
z;zsUH{{h55X^uS{lNRuJHJ$GyiiR$OXC6yL#Q8+2=EE?Sis-Ohta+EAN^xcg_xa$<
zjSnSZC;97NPd)C*r&jTB)wRDx2g!=4?+5}@p|kLeJ$N2t&}BL}*{;{v?#DaKlAr1m
zK<*mraeWiNGa=1YBpED8*rc!t5)gOYd(YD^op!=X6ri;K&&GC^zZtX|g1l%B#?~M?
zmPqADSxqR1xt*xJ;OyoYW4+N)5OD=ccU|63`7Pzzgrja@+(F3DFMEB*hj$(~Luc_!
z!S!edlgKwVxb<?}?wK^h(R8bRg2RvV&*XA2mxTJQuTItVhZUA}T3@!Xd>22sko2=v
zNW-t)`rz~1|9l%90-M&}dE+PO1Y?o>KA2#3KP~b%@r52#)Vh@cJ}eB-Wt3dUv9REq
zSouJQP$i|Dlv9_fOrkIi_$9l)|N8uQzJ3+u(ZC}BpRMqY-y#0@e+j4S(6kJ3o0WhO
zYO7UJOqfc@x-)}nSy9A$-3gx6$StQyU<XcemAc*@W6%2yolzb0QkL~T4-W1<=WhSt
zx&vLbW%eIAXg8&Z^d<0=`CW-XCMAQ+pk^$IdSlA8eK@D5%PuO=1TMJr<d2@d?kh-Z
zH?QprQq}9h%Ial;-ym=OUJ0dP0#?<Io52-Am97zux=~Q?;un@VwQLcbM`{DJKH3+_
zz)hQ>k091wmQoBT<f1u-pj?I$?Vua*f=h3F=fKSu>CkQ+tn5eU7Ki-8^Smk>u)FDr
zz9CG~8Hs(P+#w>kV;obYHI`GggkX;><k-dG*vK?M28pDY%F!CsHXz1fJ1L%~hVyw`
z%2s}Y@5Skqyw5%5rg>vbN(6uS!fT&zdHl$Y(qX5)1)Y2$a_Mmw!o$#3<H#I}^=L+x
z#;g}A-8uD`67&w7aMW*m=dTxSz2~_NMBv;Fbm51HH;sVPvy>z@A#P;G_d8l<YP}_C
zW-}Zgg`x3|T-Jf5+z~U#6imL5^1G`JG1E**NZ_J><v-uN`IY0&{~z?rf2~{Tk|T)r
zJ_X!w=5!Jx%<?K}*#&!EC`qVuYywPuDSEfDhR|Z(fRQ$bM<+d4UaBma+jM=50C4{^
z-#p^dyU#iUVh5f#J?T8v`d3$s(65Uk?;H-%$h9p%W|mK3DE3$=URAnV9ynx%O(PLE
zO!Te5#kYEAZBj|@O{VI)ZjlCjwOx1Las1<7y}3~i`|z}@(dj857d2i7UT_!ZXX$W-
z29A~#)B9WrJh@a>tL9=Hjw`QCIaD*TX`a`ec&x)6zywhm$H$-i`JSWBT%aGUqyGYp
zz&f(|#lOP+ix|Sw0t5v^-L~P#lVFobD$4_$Lb2Phh#VDueiEa5^%JQ+oo4YuR&&%=
z;0<fRYOk#j7h=RDoZ{C$diM<<y!#D65S!NCl}gaYHzS$n!QNEb1Rie9813SGY>Tm3
zErb;#eN&VsXZ@uZHWKJ)XH~O|OfyYK9VNUJT9c0Enp!R%fxFk0M|^YShudDeW;LeI
z9|}b|sdZJ7_aaY{p}Z+*TjolV6|c8@xL(UpubcD*GYus!AR=lWVVLTaXC#ZJS?ZVi
z4m(RK%L$ff8TPT$Prmq*E5F=?p5lK#g0*5Dq@c$|<VV+QA<-3^X>GN?tuEW!6C9nP
z;@jeEQcWM56P?TkS*eVNL+a`<IEpphjjnXAFyx&)29mK8TwNI{>&Y;ED!?~xz2)eq
z_uhUxyn(Q3O^R6o{08JVs<U9c`&qw89w=qWoDwxk=gj+bxf~<~BUK}%p887g4vo@E
zv$5Sp4zE8oQE*yKz~T{0Bdz$z*)x}5ymubG{~zc7ZTChcnROuzjf??8<-Z7;hkCJV
zoz?su>TEVFAoJ)#O&$;P5vMm3Q(F*6)tMB=95hEhYl02niBrG)_T(K8p|pX`YvnBz
z_4+69@Eo+3MBWX9)q}vs3{fac4~1zMN;v|n&Be8l%vwgbs}*{Lg(kej*O!wG85fh`
zB=dLy=Zv6-)A5)OcisKq$9wGP$N%H3)ka!E=7&HTtBJ`9ie*gK95kt_YL=ernv7*V
zLMl}+`N8xDn29yHo-@re0MxH_%gjbvwm^zL{uJjQV;vcyz)2AJy34U&P{THSy*eS9
zca!xpA0eXF#<96n7^6@&15uzdS*=qqR4Fg`<cTvrKIQ0*q52i=*XU3sk<&j1G*n|M
z@)m8rhduEj3a^`Pt&2i)*Rs+mj9XzJZ^Z9|tBVn9qbdz43m!ilH_2gcsBARN^^%cp
zlqkaZeelxd=YQ}D3J+{v`_Ji{s`ch6&!K<8LrnY4fZ_27)v6;&Rcosm?67Q$7UT57
zV2UmKiiXmt5srC^aXe(`FMsgnu2()dZ*_4v^G7cNx%88l(A|TG1WpI7Eg=>T4(x0m
zv)fRl6tKv}1*z8T<B{DQrm3OvVk}J!WLdk8zVPA)|8@*orh)fv-&)!25)jp(46OEG
zby`uitp;p`sc%h^WP{5n!@*mja3VMcVb~u&J9WpiSD(M39=+mMD{6`aIqg?MWmZy4
zge~P{p=7}GnH(47sd+JmU$I-9xaizzo%+T#7S=t@7XnaNSFz|N1>&XZtu07=pZe_U
zi%z=g)iYN;>YM(A4$T<Zx=#*yAE7LpP*Qw@hFzjAJ@&Dl4fn@RsyS@4-BU(WgIT7l
zOFIuPM;|})#JA^Mb|g@9;68TON**gf{&~wUKw&+w&^n7Dg2l(1Jc<o3^5iUhwV8^6
zH+&&s{CLm(C!cl8PSnTj(6t}`_yYhf4!;NPR(pRWfsW`AcrzLj1y@nw!Mhp?J=>M>
zo2N{XlHYKuKxs5D5W?bQDd_dP`FvyEODnY0bBL+aUi;$ciw@s&_v)*D-aH&#Fcd_3
z)-Qp$+Y#k$oVWyPsO3D}Q>5d1wlRL_l<On1tR^JFNoX}so22hep?Y)fj+5Sc?%+RB
zPz=O(osoL|eevoQCob~E<o93@ua30!v7muAEm_DRZLsb3797}|NH+C^7PyGlzgSLa
za1nmx{i6^3`z=(=uzBs}3rwo@Q;%ECpB(uq2>^KgvR$$)YhDAZVZ)8WF<r<)Tbd|Z
zQJ)ev*>uXGG=l3m+tWND(yfrZM3bsCtau!bq1)ph@M)8p#}BvSbN_kiC2t>l3tH^m
zycW3p7hoW8*ordVLQJ=TGFas>PU?aXTaV*XvNpe|MyKg!N}>m1P3kKbTEQ+?LGz`u
zBQ2+k#fdd@=8SJQ4lU*$hQ(9@i1*Hx7tgx>s3$g{wimBmd5klVFA)HL01y$$C3dqd
z#^kz&=7QW<_Zm2}a$n^02BZ04DCIVj3+-%)Fp<ke21>z%71gUVSpCo3bMA>3od^no
z&1;6Q5y+sVt5PEa*>px4BD*kdw+5kD)3ihaep*>0OgWQnYn2som8&^cAZ&m)=Xo?^
zE*4A|%l1qL7pL=a8NM8NqkFHt=;HhTf~v)!61anho_U8MdtQAS?oEv*O>85wO8_v?
zrDeRV1h8z4RHooH!Av-nc6Anmn$0TD%Ex}PV>y;2M}Df37Aq2Qe5%{Yc1n{Hc~{(m
zG-dm_FFkYn>n}j{d-K|R+u$X<|IgA}IL=jFUBk7sebfHh!qb-LrA<5T?(XjHcii25
z=1qYVhX4VBlmrh13B`gG2n2Vx;=zKG0zv!jJNf>AIdksOeb!!kt#cM3^q(5YS_gE8
znduma8sbw7Fmlqd3l<@d*Qk&hjUr++Qv}+WtRyg)*%`jot;skbarVN?|32mESKj_&
zHHSBy1+0*dul@<zo&d4;?ono0K{u9S@6;6KVLUVxh8(~)!w@}7gS5cV3iFvknhxC7
zWZ4_*j^qv4V8`A5_s_3*{d#!6tY6!{9fW{C`cocl?`O!XLa6EImsut}(Vb`(3N|uc
zm><-vcEOa}GVsD6m8(eFd6rR8N-0EREqs+z?UAUs#Q3gD&prOYRZl$#7xelyt{m#{
z9*y|WMj6P4*A53;VHK|JsF9o&@}d`0%oDk6Cqict`KDaLp-RPYdXg40ydPe9_k(Xd
zcRB{0o;N=kpa%~QQI6e!B>J_{EN>_&(~V<wNGLQ*8`cs#$}Zcd9{&U^q^$%(IiSV5
z?LE{QY~!78KD_PV8LzG;dU48WXiHM$C#By5xZEDIt#uDF;k85}W3Ca#*atq2y*sQ;
z6f%hj$8qbjSi>|mGSWghdX-uvmWMLKXl^8efC(R7f1AGA^z@G1Xn?bB?L6wrw0(?x
zas%2)QW1x(^N6(tlhk9^u&tobtuEC<M&*>Ds^_ql_<(>1Q?+2nX{^FLe1G#DkH2^4
zfmKVtz^>-BgBU*h5C|=CEW+Z(iBfhv+a?tkQhGunEzZl$+1Md9*4%YcDpMnN#h6yL
zXTt$E(oIiFB=I~VX+WLW#%G?m<koXHT?&En`Zd8101NJTeML`YBgek<b7*}~HG+bx
z*eJHnsLEQvsx8YHqJVXR_rVjoO&GdWj5w979GbfrUO6zufqxq=A|7Zpb_~$%w%_uv
zQ{R2?gKt+0awj;BZ}6Y{z@hu|Q$EO55eSh*YNVFgbvd11%yor?Bpv~$5?iWrgoI2w
z&S*UcETPvw-m>%GUt9)H%JpkI_ur`6@cT<wt`rL7wm7g7ksxqd>lCS%QgrdP+JZLN
zOQiV?OQ%1vIeoFNF6VVna{W2q5D4;gGKp;-H9AN&RjHmvx=3x|=rLT)ej<?`S`~;y
z=#Hhq7EoYR40$;@9$q!4e0$$%pS^JNO5Jt$t`(WUhJ58a3?MLyN?5f7)w5hM;R3Xk
zgXbm{M2WK%igUCPYpn;6=&=Vb+jHaAn@?EH-L``)^z(a2@iQp@b2TLv_RQT(n!SR2
zmp>lJJ<XPpUo$|7e5F*0s8R#|SjeE35DtqrO%#Nkg(ajR_2PB{HzFhsk<oxK!(dV@
zGnp$Oz>{Lj2k+l><%^FUdVeWDTQTgs$Q!2{m091gqQNa9xR8T0b$cUH504lw3)@N=
zOVUe*%kk!v!(=K3L)*mSbMc3P$kgZ7mAg%%oz%_eb<1pk9?;t80y&e>tf?AgaSl$&
z-QT=%!wXNJ8b=p+WS0mHX>iC*TY&dQAd$6{v<Sy5ge=W5SRFH)D!wpIz!ekAIL3lZ
zfrbK4;JfyHvF-Rvt~vB37yjl}bZ{id@jsgaW+$1L#Clh6+4C@ac@oZw2S0PMiK`qt
zj0x<3Up1g<um?`se%GFTAX>YAjnqCxwc(n77C}EC56$=y)@Mfp%e1sCx@8rSP8PGI
zaK=KXOjQji;`u_MbL;6PfjC8$i&GgKON7^g%EpH;-*@GAuim(-lyjZ99zB=R$ZP)#
z1TS`s;$=8W91pg{A4xkRuZauSvy)3Avy+5=$Xkwj%6K8AG8|R`&7lHzdew8sKKH~w
z|Akh#u3sC|9qJA5e;PnrTq2JQfr_H@LjlOZMpRPiF{{X?EK~Ukm5Gc~i)7)sOeP_Q
zMS^NP&Zy!YjT*b2Ce-M%h%eo9R0I8ZmyBz4;jOU!jw=uT?Q>L55{Nd}{sko&Y(Sp<
z9&Qf`(@FBkCsGmH8u4@4n51{8EiTCg&v0s6jv<C_NEUT3&HzB#51(Fe&u7Pebtp0O
z*AG@poQr&reizVboO;k{@bOc`<s%k@QH@Kg1PAK^NCGh2UbEkpkvqeLFee{c;#7qZ
zX=Wza#^TnD8d;=cB&b;b_r+T_z5I`hRv6e}2ioWij}YH&*D13My`2n54JABx4NP1q
zgF|-CqP&huzaS2S2q9E6Ac0uVRPwh|9at;h?YsKjmoNW#MY6o_Tr1j85z%2$QlD#J
zn@Tl(4<m;YEq&wh2n1_#UU|A;F8eSYPEFz_m7*~(p@esWU_?M!82hOlX=Wa)2tmSd
z_aj?hy!oxY53Y7-_{3Y#mNm%lX(y?&NBBewmz}Fpgy+>Xo~{sdZ8egT9D}F9o_9X^
z<fI!8)d4=Y8))|zdmltMz+s5}7_g{v8B;(+<0qItQacb8dw4GF*yX@3=t1ku9$Th$
z1lM5XF*2J@R=OS$J4hk3yT(RzhK#036?46QgUdtHgfrAG4Xac`%J$Rm@44`pPqrD*
ziT?9Tm!h4VB9DZNkay_w!C~CU@Cw;MLP(Kdm}v!VegUE}TkpK^tgF915xm!by|(Ki
zt8&A}jo3q_Q9nmcz2>LzMrybj8ik7Bk<%7Ut=HG|<<q>9B@*Kd9ON0ROm^h8q>%`t
zqzoHz-5|~f*WID6T{aHA91t4!GayoW@3xD!?0pqj-s{%R*H#YQ<Ubywm^sHWP~`Qr
zc626|NhSOaxWC0`GnR=2xvulS+_vYX>;5Z4f2KX*b9Cfbh<^*9t9+R~u*92q0^YI!
zSFN<qh?FyKfWFdvrCUTBEuEuGEiV()l9ptyPvGzw99SJY-hA-dZKprB$`LpIv{J<j
zA^-0j4ZMx2lBTjn$<E2-qO~V>vOD@2j@)v!5_p=9gpBX{cI$0BU%CIqU!dDGv>trF
zFS@~oentY>yQu`=pnotk<Yu-|f)!OvlbD#xl%!3|i*#+F0naHa!qiSAgQbL+kaRNm
zA}dS82Stq7v@(*1^RQBOoqY6%$9%ALHE~}ze~nI@6UqGC3)&-7Ry0@4xtS4XW++b(
zTL}=9>Uw=fjwWgXBP+T%K@R(uDiw+1V@f-5#Mgs*tM@kVf9d+aKY576^7vr&UOF7v
zwO<XQd)BzXZ=z9REPXJQM05Q<vazx-(v`VcFKM?JsWxP$vW*15?%cfp%4a@);<*){
z{?~uF3++}0`RhIb2sZHM6k<rjOqR?xAw`&B3Z~f!C&V9m=8#G<D`Igo9nd2(T~^TG
zc?F?BNP^m(2JH2XHypTS)AsWoU+pC3W<5HJe?*Ra92C)xh%$XuHN6#0(IzruFO;+j
zIk`#^z6WZ~@4eu(ySV7^<G%q3wC#VU0^W}5;SP~M%h8hSo_n5=I_IS+W~5~VY4WNr
zL1j~o5l5v1t|Ms;NE}9IVTLI(bO|N81Q$YvuOENs_{aVWbyMrsj=W+oy1agZ>_LF*
ztzoo~D$O8t#T(JNI%I>oVYrz@ZgGsGp)pf(;!MvcvoP+kE>Q(2zn>l|&H74%Gyv`I
z34yMKcx2<r&ulsNz3r<R{qnb~)AC11UI$(<Y`vaa!4z5%TYf^7C3!9JP{vd!iltV-
zCz3bCCC^ytV<39`+-Zy2NPy?>diM6?PTGlTL#<!C>NO~oz2T!3(Kd=abQlzO(q)|_
zDPbAgco9Y1!Ha0Msa(`AVmH9~rrc+#D)fXCk%<S{+z3vxjVHag_te+Xp<K82-#sF9
zPNDwfY|wu<OPor)q(LPUGA+KF&H?XCpSzWtkZ2XmAZDy0xFtazqLZe$fOTrco5Frw
zjfSWcexGRMZ1C;KkjHhC(B-$|s`p>L`^|^GT+Q+3pM}sru_9mp;!CJzm&uk1lHRP9
zMAFM#)>BgR!psJxN`OFf>r+pCbo*&%ezf{ogj7P8h7Q3NKr~sS?+!>Uti&H}(~NCC
zQOI-F0t}=Ohw3=@#2|3=v%P$E+)YdPd5yC)?-v?GJ$3HOGo^8Es~izRmh6&KU%Kg%
zZ%_qEkRQ2%fVQqi-q!sY9w}<IO%kIkMq>jjlTlRY>b7pgVTC=4blVkk=bGY1(5SDK
z7pZ8iM4z~POGh7e$4O7!{>|%~4^af0A3|ht<g>p=TLpo?v-u!?2<k9nSzT#Kt8Cq(
zzT_tx#6fM#pyMgs%;+ePY8jH&W-HfK=*V?<ycWxAa|5-x0fALvrsOnB<tkpASLQ@%
zgLGL6cS4@NS<FwW&B0<{L@NgAeic3+w)IVjQ#fTcS@R;>ZiZXuq~p*3aNh&3uf9`q
z=HY0MjL3Iiy#;P+wpev;b~46Irp@YSE=WsEv|uqvi;<CQB4g_3m9Z40NS7R~oQ^T%
zEfJ2<Qk*r?BrU-JZ<V9({OIeg2i55Ko%HNV4)_RUV+=%@LBiOXjCQeRGS+HfN+i0T
zYf$dz<CvM4AC3B4Tz0}H8W5XMGx@-|_g-|{GgoX`^)CPY1nnIi5jg=qaQUqMIyK|Q
zP%Pyc%bC@sO!a_QEc7&R_C|^w9U2A>Z_el$;#|~1*GabM9H2E<<I4p2C0UeFj~eZ;
z1j9k3gMk;%f^5#g4^F@G<=4)7a`j)b=nCQ=A-vw3iY(2>r*=x=3{ROhTGJXfXM`Ix
zExbmpEtPWU1!IcA7txzD>M~e|r`5l1{QA20cCL~z_x=M!`k<B;?YA8H^BYMxQMuhk
zC~BogB}N4(tb0jeSwZ2T;o%q<NMh>t*g&Kxn5>!z(6ARazkK|In_fJGa1{D0?g!i<
zZ-I?+V;WBpin0uY0|qqlSlZWJi~{<&StJ-)TyA-Xp=d3YB0-PHs_~UryVp<4G2=uo
zQ^mJ78y$WEnBcxzOs`1Ny2h}XCM=nH`Wh4TWHTvh%|PT$S!xSuoF5g<E-x1zj4vF2
z{1w|Dec*xB=p6B@RXy&nkRvcDK#)o1d9z(adZ45sbxR2;n+3#ao9S6XkK}tAdKnW^
zC4>xRxWWT8{fU3S|Kd4sKZ=%zu3!86V-xj;6GWe(TfT=3_Y{Fn?eJ=t4HHpRz;Ydw
z(UP>_O2$)@O+|A94|?m-yN|o*oV!*Jx3e;kHL0XdLXYAF@-c8>vls_(m@)Hd)I%N$
zCM|cHXN%Va3mK7&#VcLZF}xrjf9{4)zq;X4RM&j{8uG-wiVb@$2hkd+0J6&h^^?jt
z2`fa*UANF6#gNJ!8+Ynr@xWF&K{tau*09y&gaBg;22H_sqO7#2Nx~M%>vd`<q=*kN
zy1TAC=KF7+zG#(mzWSq$=$EZSUi|<hkFXX_pXX}EjiX}Rs)2enG8w0BtH7*C?w{j=
zX(cS4{SUtV)bo#Bg{Fnpt$ldemFUk8LjrF?agvM~HbMbor9CY6rL7Sn%*1G2-i$9t
zbXt-s&TjKq6L*5aF8JCiKa%4jI5IsTlxjIp(hgo6C!O=isr%6BTfZhc=^v^MM?KR=
z8;>G8H~kV!`D7siIX!1Z0ycw2gCr9ZZjK;w$6}*;h3*Y@Tumi@7KwXO@Cw;{!xOiB
zyZz|Z&i(^ybz=M)Is07D=N61H-kc-O@Ff+MnT6Hm<4B80--C~3@yZl|T^xHV%evS^
zoD^nktYpb{Bpe+$gC4m5hAZy8{gOk~HGk=>z=#R5L;Wn&j?af!i_-3N2imqIi!_a4
z37xS9tIc-X_^?u~!8F1xjWHgVIa7AC9}ufuo3A_eoTHCl)zdt=WtFzlAZPrzrON6}
zei)J|NJu)&1Fq0*YlTEHp}`FDU%?4W=W~$Aqnfq`o<d|2s}pjGhSXG1J-}cYq>#xF
zWAP?apgo=W(eqDU`u-g!uO{e?t5=|71lgwBqs+z#By9@{7Ykjk3P;RVnH<s}B^OX#
z>`_lJEE>iFOe{4gb+TQkpdm%5ZdN^sH{$BeStlj55}J&fu}&b<I5YvT2DDX6uwful
z$yy&5<$iD7fAM)2KY0Nv?XhmHcJIgNqURzq3Mi5aq)kuAlCBZVghZgh7j={r3(Z7a
z<_We=ye&5o^5OB^I<b{1<r&uD^QosA2SkyZ&-u^2M?H991YHq(7pJK<+}mGymmG<d
z*WkIqtN9iUHlLmdw}euuS&yXE3F<=Z8G2LhMonkc<(UbSeH;yf%x*?O%#5iJ0{-j%
zt*^g(+ulQ^wWl2Df*E*ub;+$E><7WP)*Qf+<?gJqB`|gU^vaA|ERdy9T@z&UL;0rG
zS&hjlz|o|2eg2f(3X(C5npEI!i@7{U(?btqyPyWyN{1i;a_h7Az47?Y8&6s-=<7kX
zVnZwFLl-oHTsxX6v$Cw8Gqso_II>h$!4G+(MzlEb)^*x&-WkAfA_^MUl~nY|xy7QI
ztg&hpLr;daSABgB)b#xO#A80Y|CQ}*bgb7syh4VC2<v^BGRwvdQj1i_?2nDT_?aJ@
z4S@7Khu#mhR7k|>^5`p*Sr7cGCZO4-b(^7#cjFD;zqWtd2ZsQOt*@^tKop1}3R*qf
zaYfi0U@1%uzX{c~Oer?R%oQgKt-9+cTU<yUBMJjwhS(jXnMGfPKGu#metFLs+iuu)
z{wfc>V~+>DScJ%l=Rh9%&t=b|+V$fcn0zNdB@SBt{M0M0lWO8-0O0t$9)9P6H(tKM
zjZSyzI~fRTUAC%&2qM?NSqBpJLY$8@QeK>KFqLzyc>$$i=?)xI8_!Qz$l5X+S49JS
zFHf+zx<i_WXl(g>qjp{Gl}iESc<<Zm_ucsFwu@J*^WJm+igwF@y!khvl?DQF54Ecr
z;9C^%?T!#MX=jpERB5C71vrzmZI*sfC5xDNq_H~#)<)xzXq2zb3>cwwQ0Nu(^krfi
zNXp7ZnLI2IC%jAyF(qFD!0?|v-+g@fslP*~=<+wn=pV|EmyY}~n7S4z*lb#<3FtFC
zZ$pYWxHh+eQ;HPJ`38~9=q+4?A-4oLp*Y!_sN>uku31m9$m*qA1{|j+-n`<IGtPYM
zo7I>6HUAB|qzH)AdjJj)QJs&gfT}#B<7IlfNfXnD!%I~BrYSc}gI$1Y%1tmB5tB7Q
zOEnUcCZpZ0S?prLC}N0{tW_~ifP;6$RhJ#O>!W|3OG7*Ue-DW;X%VUERLIf$=@BOr
zF>>v_YAdP|;B&LQuQ=B%D;*>nE4v4vTcqez$WlI!%}oO7cjLi_ZaVM%=WmFiZH4Y)
zqEO8Oxgh(wDl5}@7QRq5ngeV5P}b1*U`a#HxNlbn8Z1pyFp0$FOoN7)_DV=KsVQc!
zmo4!GrQvrF;RSKrSsVA?wCiuH)W7-0RnEqZ-240EAv@nA5qW^3c{o#pVbrB^M-#0!
zWQ-_1jZ#XLA&&+NZk{hl5rbk$TAUrE^xXp9B+WP>$NS!S55Io>t1qU|&R({Ti_X|#
z$Po`hKqw1wT|I|uoY60GQbkS091`n8io!M}fahCI?11;{f>fzh1oOqRk1Nw0I!!R$
z7lfn*KOFdbcWgW9;=LfFxNhyr{VOV91Hrc8TolgfUT$H~km%|1$b_m4j$}sm7|I_L
z$|m?d&Kg<`rmJt^1xeb>W>m-=GfpfJf`jqdi_g4o$3Ir1y7}DI?sp=;zWY^3))fP0
z5_QaEImJ<`l}8qH-A$9&pvLP;te9DZB#hRCJjM)i8VXoR$DVlODgSz5RYdpOR1Q6`
zgUFZn+yc&1-i1$T<oEbot-z4gRD1<dWR}GQYH|Do2~Qm|9Y)9@Q`@#OPb?#etOAof
zn6~GVUQ02pm5O4b{sfzaOMUxu51+H|x>p`qt<~ilZ=-9~jhyHQB||2Q4|Q&NV<az<
z8>)?@CRfy0+*~gd!!ZN}TD?71DBY|w3o9=H8~|^ygD>BI_T8`5(bM5+(=*Bqe^7sg
z_Lzkzf3zFs-PES>`*V<c=tVf4nAK)?d04z@M8zy7yb`t?)6r+Ag@Q@b5MpFzT7Mku
z8e>rb#}0h32W~m}<TD=mAdgPa+qW;!Ru4x410a$J*{Mi4ta1%q`8*jM3MR?{zLT99
z%4s9Q7iT6ZDJB^-XPY$>j>Jm&t$n^{+JiE)8%}%TKj)nIw@X*w{f%VB()(Ye_yX)9
zZF9&=%aXMUvCdAJd@-`fmhKCwj9Cd&ERqs)y+anRCTI+u%n&O8;<M1ytF5VmP^gGT
zvJnw1oFLS_;?eJ(eRTi6RrCM;+KdkC?~wD~X~RlwS{W);tnD(U{rr+i(q>vX!VcEN
z>sSS8-oS-R;XS&fH=gE;^#PF9O4@=M9d1Bw;NfW5_sm`QpLN+Llrg<-t-;QsJAjA0
zd>s*v7P*_}@#Xq`UaaQA#S)!HRT>n<1$0bhmQ@!Z&?iiL+OE%D4(LfiU(dne(lfE<
zC@Cj-$|YXV9wI<`=&pyKdi<1sZ~1=p2VCZ=04<FWPX=jl@>JZYXT;2)qwn^yVmgK$
z_JmAZ$%a4})T0`J029Yr$HBvQ>uGy7Uwi!VLbQ`l-T4Rf<24BNLM)I9x{{=+%^#II
zdbS|qqzQ9sC|_7+X-?}{W$E{973Ba(1$UkH@MHT<eDOc4UX*hGgMQ{Ok)PFo$@1q&
zkYEwpL(@#%3%Zm2ZZI%5$s+2RD{qs*#=GyVuQy(I0}7k2UwcN%RB!lc;z9u5e+Mn#
z5bvg)U>#%+Po*7fcb<sp>tm$_-_<3OxTT0Z_F)tTtjk#EU=$;HX5?4Qa*<4x(e~G;
zu9(uU?P}DRP$bTnW6DZ8h&APDd7$d={`8oKKRNnxpz5z*JMVYjsy4VkoS~nbLVoRo
zOt{R};`;`?ZeU87>W1^2CLBv+n~*n^Ror27Q%?yo=p}Q6+~}7$#JIA-#AYYGU;&>u
z1Fo_6!{eUWw(q{}tASXj`z6|L82Mf0G)M$8=;>~?(w>bMzAl3t)JJDiZ7>IO)1sI(
z7R`hnjS&nbA6`zZfYViU#>N}u98KOV;;1KS2vCmO{QUd(ZbYl~*RA=ctNT`s{1^)u
zDLYc~+C7W5bqJ~S5xXU1h!q54x!UK~1(q<#am!T23B`jDd~J!0?^KRA@7jCT#=l*B
z0~)l!lyCR}?PnZ${~f^CNPLwo+?>b7*@~qT5Rg+*GgJ{p#2&uelgYdIqizGCHG$W%
z1C%MxyZhbMVR!h!(V^@3N8U}q2%5-f%N&u>fLgoII0}l7D*MF854o4c(7fGokJH-Z
z+{CZh0>f%lE$`uReO(0Lwtt<p``C})x@*;`KRvY~07GcE2Z$ilY!owdvF9CXY7m~%
zd>kLv5VOpIpz51U-2)3NK9bgW&6yGM5Knyf-Vg8YyZ;cj^x2cETz&xgR|iss5(Q<X
z<&s=Xx}soJP-g<HjxQ?B@U6l;OI)PD9a9yuVk64t80(JtbzmdO83(~oNi)9t)XPpj
z^}AiaM8``SxC%Yd+(`S@803bayu?<Qz^wXsW`bT>u$$$2@|@Txj@jglNI#xa?CvhH
zA+rp505RXS_o%avzGTblqTTa<Rw$ho`OSK$*D}!uy+lpIFzGemY}8RGSW??;RPUOi
zm<hWQX$dXjSyfwP=4V8@Pc!9(Vgpr<6u>BPPJC54k5}C;Tf2|GhfX-@rkzit-el|6
zZv0`TmhxNVcM$+kp!_+bAtoDoe@{whbwx<Io7I^X77ecL)}(2ZVMG&P#xoYfY+@;S
z44P0(TqNg8Dy&tb;<FqX>sSW>?bb)`|LB%CZeP`XVes3~weu_FSEgNxEQVxL86Ck?
zGvOH(thx@rh4bfRdV$a-UN%`BpA_PkV{d)n!8@P0XEn*L!}92_gUG+)u#7E6UB_1T
zq_e`Jm_%Y{s%3pKE2Inrp?12uNb&?3Vcp55PAeHNri2-lmh7UN<(iumcBDIO^>ZOV
zUf<FR;_%|%`uxX#f9#eoZd(1z5r151x&9bokw6ndKw$|GN+u>^5eoT+2kRB$$F;hJ
zKMM>K6M8f6nPmkEtDwP@In8b*f@|}sR^#}tE5AJYtY`kY4G0GyV{m^I?RF3OpBEsM
z*)RoeD<Mr&sRU)ZJV(X|YF-sKmmKzMMJzCZ-n;+S=byOa8HoPYuPLwkQng{rrz&)_
z<Pp)azlF`K<<b#KR8QehdV_!qXW@!6;e<HClS{^w@v?wb7j%PuC_9>td_mj-Qpv|%
z^x;GIZhjMsHaOS-rVFFjR*EKvBTpSR1hpz6e?*Opbgh((#nE*_O*+FL^OqC39FDEP
zrYQ5aYsRQc6*ECcoT}*fY%_>TTVP&aKlt_cSKs$|6eT_0d&`zX1^h=M;hQ12V24V?
z#*)WXbq7{#yBRX2J@bjSf$2qk!ho`t3PyW*0gE7ZhVdHd!U$>Id+&T|;}zeXv1v60
z_u*DW1BW5M(VnKr!fKY_N+qtqF-u@b!k&3f)rk`lw@&3O4ESPhmRlLjH0`;4)~tG_
zI9N6Nx9+?9@%t`ZWmj;|0Qc=4`wAJOAc9w0z;br=3?AwrC&S4x!s@sQ*6d_DV<4|P
z7bZDBT@{YSe1*}_wKB7oR3lix^5%K|fLDj(2~TsGNw6)Sxogw+7jL?1)m!Dut3xA;
zginGJ35~Dd8%*$th1C&T3?)XYXc|@*tg&oUTbks-m4qPW$&=(NTf*1V=V2&4RJ9C4
zTYySy0??P00>rc9xHHbW?(VJEty+(>-bGi>2>JB^Fa=_gs8$xoLiUo}1+j3@GS#x;
zXpYKhVtBpaBvkMwoS<5o7P#~{T#O1Gec{4KFW7tX{#8@=e{vJr6bD&5ECKxCE+)g%
zjOU{$bME(s-DQ5XL~nWN&ax;&3Klpmca|I^032T@%Y5QV+Xm3wdk^lu|Jld(uBuM1
zW8{I`xw`}<f)D%*3+?_C88)v2%&O0~(!>K@Z_Xez+>=~iAyAe?VG-Cr`*W?SNR%$5
z+kGCyzdQbU$E!D=e&7(rWdA8E4I4gk>(74&k_EH@ei~+CM#ia>s+h;}7+n&N?KhZZ
zNf!e}!}u1CKGMji!4^b&2ai7Gjn}q)x(ZEcGr-L+_@Bqo4|OA-zjP<uFI}la?kDQ}
zLUNz0l42UpfJiE9XAOB1g|{I1ip>79h{QT`hjY-j(c<!!Ko2B}SFirpgZn?)zbdX2
z6IL{VUn9SH=@LcO8>9r8Gj@REXA!J2DW?N`#@e(qj#cWq3M`mPb<PP8^H{|wuTT(q
z*dW1!8-*049DAx`*Q@SASc)hpvHD!(0!6uaAPnfu?pxlw>e`3zIpq0r(+?|B{_l~a
z0wDgTK=`hq-AL88-Aq9+SM%o`)*LYn&TnAPR@E<wn(2hZHY5bum|;=GE=OfNNiDY(
z=5!)i3FrGMZ=HJdfvu~w)KM1*(6hvf{QMcH0uy=2-B>wqP`3matDKr?u%q#!B314S
z=I|I&X_tf{yu|e^JW_O#ZSpiuFJ(%|5dXgZ?Z!7Yy?X2s=#es+24NYTzN(O&Aul){
zf)Kk_kz>7GjL{IorK+|FHONid#_~~~zy%Aw0-^y=ArR!43v2_0NfXsIoP{Wo@HyO_
z;9OlHL!B1<#fRVA`qtaep@IzS*Wz-ByPk5p(7pqtjNbwAQL!y>U~o&X!Pbyjo%Cf6
z@pMeJVgg_%#FC^1@*sp`W&3O%4cF&&C$ir8ye$`vCe$!40c-EyU*GoZi;upxbG0#!
z4(~#*=s0rv&G6{pNCPsbF6gI`G^Ch-KFMPlwv0sL5)o4!W}nHHIC$czPQW%>3c`Lz
z-3QsR*Us3v=Zk;5h!Sqrubn`zt2aDEJsn+wM<SQnL6DM&Ct-*LOEzl~jyZJ}w!75T
z=6Hz@AJyk8M&hh9i&+?OR`0(5%75N^+cO=snUfzqU$x=(hgNA}8S=s{a2fG&Zh4Nt
z?L{a-mnd5G&+X~#NU4#M1>Af;P9tJGDj}{oQ27V-xk;DDB4H_n+go2f=aQQ~d(?y8
zMSr31M!(dET=k#Fz-ule61X~!<!s?`=4AnoFrZ~)J^F6W%^@jtY0GFf@>jipzwSEv
zx_5s#_c*jp4OlnP3(+=u$fNQwXfZ4Xuzjc`d`~*|4wQQLB4f-%mE>Sqht21h12QdT
zoHgB+xlmPOFRbI&KYr|z?O%R*$x*Ae?th_z4wC@+>iKIFS%IaJ7NAynB0WW`F6i54
z(a4l`Ni7bUXB1Lts>*bpVeDISEJz~sdrM-KfrGvC`lf4+`|9dX$!O=UeVL4MXX!}6
z04F`&Eh){|gVG46z#~|(&0FV7xI%$HBDXQD@}N_psm7U1M?g~4Kr&_P&NI)y=EW;l
z9P{tLSg|7M$PqtLLXoB~<6clpteia0PUXtVxT9HA2;)kF23cAG@P7TX6Q2I>$<L!k
zXY1GUjXp40zfhyAb%coDeH@llq*Mbf8y;D0S=8EYOFmGh;u}LfJz*>5n$)tXpkN1E
zeH)L)QuIy!x_i9&vB&@Z;iuo-@Duc-wtcWNQuiV^b`0>;Mh20LAw3yaonm1sMDnY<
z{iJFzPR3k$YC@7t*+b=K&cS6(Jm$m@s;-<8HdDIj7GYbxu=|+nUb*+;5!!0)XXl~w
z*g+m#gEX?VE%#MI6-q<Y>ShYLx=UURNc%AZC1`SjnsL=A=TU{djz-SFiY*G8ABtqs
zTwk0dgq+JsAN~El_ujinine-&B!SN8ACNzOwiVEMW6eNtz%x4>vzjE#u6|mjL2jwc
ziFA{UuF{IImjxj}ECdYVOo%JM(fHu#vp;|F0zBGOeE-*IQ~!%3UxoYXud^goNh#y`
z_Gr;qlyRyeDOBl%ro>KwMISZbMR3OzZ=e3&!&joIkzcI+G}JysJ7FNdEPx^v$=?~w
zxyg}G86EN+4nKzM*BNpIyDthf2u#pk92vz19c-7Ao_=Ka7hB(k`mgnC+fD}a;=Map
z;9(s3atNY4e-b0pq+J$)Jv1k}O?sV7CleN#92rT#f{k+X`!8?0?O`AK<Gt5_{QmZh
z+tESRAjkbbh^YVXQqJ!sB~7i_L844GrNxrWb?RLhDxhDRUwP%FzrX*{v#T{kJM0Kp
zL*pU({l7(iaug__S!^oEzVUgkEY3G>NXcY%!NEa71Dw_^r<oSXh|rEJPIFR!)vaeu
zZRrBmsOeNDimrv$3y#Q?yl#@!iZl!W_BXz<<K|P3yYJT37ToHnp(~Y(99w|YwSZqF
z51Roh2B|k>Y?i9k%*AtNq=qS~Txm(c)Cn+CY5csPUy#W`hM7mfD!|`k<Gwqe-Mi(7
zoreIIE6OY0DS|xp2D}i3Qxe-lw3J51Ssv?3)H-uXUK0}b)O1sFHc1A1CVF937pQ`2
zHk*^-Mhu>D1rLme&DWm1@zk&PLjl9OH8-+K?8cG9xeis<-!dTO+Pr9NM|FcHu{2?0
z&BSbC(vaFPecuRFT+6d&s^;T@kVi=9O!u&qsv(ea^K31b2K?~GQQ?3{8A<g{QDR)z
zhijm%0E2S;*Jo{d;DMW0gR*|}FVLZPAzxngM@UL&q-8@(!4rgr!#O4#t5TZgp$Zo?
zlEv9zYhkS|5`mh^Zz0QYBwXJZ60o$@Xg(`d=Jd*NG@%bWXbU~Q2^YnV*I(KF&!axR
zcl9S5FMSaG6FRbO1n(J}V&?ax(=L;f*CfkyBFa?Qb|8o|P%-hj>b^*zC(X6&4#+eM
z`=EB0!_<myWuUu6T+4#gp&&=5(X7DOA5kKJBz?H!#%o@<?@AUrc(c!*NB<^;oT<G+
znZ<yyAI}gmj#3_ys>5OEtPPd|h>ot<uwl-{JOFR*diAQ0&pGfmTCKi*?d7ANRBbr$
z((2k+BDrILf=ZB$oIKow$0Xy5Gm*<LvmqT5KkTT^1q6)SVk0wZY~V9&{O4o0es$`B
zAliq|#m}MJfR8-*`Cet#!PNSDB%6~lQ`pMFh%RHx3L66+f`pSzs|tx~L}f{b5YG7u
zBRqee?)a=u+pHJiO|yN4DTc2rGgPlb<4$yz88W~qC!D+Iq9>m?{tyR1-r9$LZ4mkG
zhoG>js4FmSe!`9f6)d(~G0f8Po-W(KgL0fX&m*Ww1g3}zH=_{~U{k1dhB8$M`zQ6H
znM%gSVY>F+xBu~rZhB@lUFV;>N{1YdTzVpexl+$y+Ruhlte8zGbFo5NtlUJ`>Qv?=
zM=+f@jru~sXY-{OynL?d3fadKcQU5$;+Cv1gwc<_b<|lOpKnCRSF$LmHoSA#FVH>6
zLOdi1__y*IaHx&rjHX)2Hzs_oHi*;O<XxO67c_L2c6$>8hU2;6Ql)RnNXfW1R?1>!
zRM|*^)3)?tNweEF7#S@SLm{4$?BN+q#m47%T)S~M#O*-(U%N!P;oNVW=qRO;_o`ng
zvqXiBQz(ROMlC5uqGQYgsZdx2v<c7TJ5nTfnd4&mEC4F)zUHCJuQ>3OADvOAZ&ie4
zMBZAvA7BkkMHKH%ZJc7bJ)c*K1!mYwuc$i;TX^AE`eVVAQB!rABx0;f1q}G@Fa7s|
z51#zKk2WOH+R(0Okey7BDALxlej?KvOM|Akd_L#$XL4oOG8Gq8QmPy?F^I{rv>X!v
z!R%DmFPzH=O8OMay(cYOz1Y*JQgZ<OU%2)ASMPlGgRfSz*00CV=9$P*?y~`(@AFMv
zQmsVExwT8;yuT=GS?N}r*YFSQ%l=Yc0y@JmP--%`aHzd^>-P7rc<$&`KH|Rc`Dim7
zgyIK{1H4RAT~x!ww4Hzrt2vr7FDHnSl)<?b<HNbh)V?(d$Ls@Fy!YguNA5ml)sK8`
zg#vVu?J3ayrRK6?xqdLSB!SC~qf{I7Y9ml3;JEq;gP95l{R+2d(8Tgca522Far=W$
zZrb?JYC9JHmVrd(J*$i1{~$Y#gHjeQxt44pYNOVYOc95cN~1&#_N3l$Z#jz;$$U24
zxLviYIUKMi<hHO(tw8wu-hbcOa@!9#2ha&P{BNsTh#V660oV-+z9b;1v@?aIOz7@U
z!I@b-;-&H`TM-d<nl`h+KpRGs^xQ(ocBk4}O#?6Jss~|=b4+zGfHL~l_0PU=!3B^+
zT(|b0Z~f@1?jbK<37^dFv}qNBL!^pLW*#9DH7d=GSeW9hQ7uUU64o2V^2SmWEQjX)
z+%)C}{?;X*KeX@M)1SX&HGa6*f6)n8kJR-(cn9;aig;P4OvUPesE0z*Nh``KCdCQ7
z-ph@0^|@e~W0)if@o}G30hDjYxhKAQ&r>g=0;o{v{}1M&8}FVSCS}$oQri1tvcHmy
z7}^Yy#iFE2ja-!sPP4Y#k!59>41I6ZOr+y6IWbkOH}jf!)wJjgaj8*GgjdXLncOlH
z@VFe2N(c}5_?-`YblSJ~e0XTuKfh0jc3X%XfB12V?1n0Xq?fa#_O^I1vV~RZ*n(VV
zvRe#gLm-DZa@QH3KXUNg)81Wm^N8wi&~75g|NIytDWyQd?vspxf-onE1ejcLHp-yJ
zpj>4_bdKj?e1;Pjs#!LF*hd=LL;i9K4>VPCBCSEX6D-7NyDs?R@-IF|T?f{!y*60Y
zgn5wzX*wwH1uf%IhbkckLjD;$54Lgrv8g5XO?qjW+XwL2=G(8__qR8m?xCm0ccBYa
z8;<$lc=V%k$ctNkugEIttrB-KVs?oPgOe4=QwvRTQ{G?TIgPTfml9?SIhmc9Tez|&
zXC2PAX+6Yo;ifrJJCCJ9%(VNl>vx}V;CvU_vy&=I^qV;d5&{~m8+59r5(2hWX7o*5
z-z?L}E8WGEWr>e!vK=+WL>V+_nRLL*N=lo}W{OL&YWkTz8<(;Pk(_F7!8?_*d<Vni
zR5cW16d28~|8T>_Uw?7=d8+}o9l25w{2wHA7*GN&mL)&WFIIsTKWMblt*XXrv~w-I
z+`vzclVsRjAPFwzWvYK-DQBc}k15z_W&;`LvgT^0k}TcK!jo_qrWu^?yI#8Nv#*}I
zag`xC>|hlAA|28ZKq)Xe>9&pVDU!sdVs*FyL^HPbs-(J<3?=sLj!2ee=QVNyYA>~8
z=Vz~7`O*o8SOK!lx1iVO8glc^KUHVFG(2brlw!zyUd(hvIzi4b1ji+N#v#xt@b!LX
zDrXavnk<MADD!5VlaNl2qTH;46v}yZMpcYWAr?Yp)j*eVbK-@9)CxShlRi1{>?a2=
zSczxquV2Y9F_0e}1!tW=<^k0;N3@~AfR0!~rx?t2)xaq2OKaLzN}Q6D$m#)SWYJax
zv~CF!rVN=aD3iGC$uIA@{)8L1!AP%PJAZaK)Ztva16?&tBx3i&lQ^#^fevGC#Lsn_
zjfQgJbz(wX8NOWdO==}aW@^iq<nSckd-^>GF5Ys^`KuY5?O2aCQAVEM4G|MFL>%X(
z6qQe#r>Lt5n`F^V)Q0Q=Zm6e_utkN23y~fb@3O|E#v;5Awtw;EOW$8{^J)v6{p>3F
zwI11;x&Yp1crby1oQ!JN=wl?FsHMbg<Av<0fzLt8ON%UrDJ|U7HjB?2a0L;I7A}V!
zPd<OubtnAm?Nz@PzgXG2)sV&f3wZQ22$Zg3Chve%k;})$cziU+V3}w`^=GZpfFx-M
zEQ?Y!{xTqE1VUK=ux{IZ_U_m20iw;iwd@@$2wsFdodv!WOPFp?oE(0+A7p#++!Qhd
z-;b7g=+Ndoa>)4^wDXj_nNa0R13{t%>8eNmd)&Skzq|iXO6e_r7hQWT<bwwwW1y|h
z=mt!^qK{NkLtM;TVG}+2rpy$QPx#V=(iSu~++-<8TX=1FKcU@=(urN3#Z7ZV6QroS
zD1$8U&QBix?3r&~MM*UvXz|c@=xiK`@P7WWGV8Q@cod|g7j?WgVuTsCN*Kf3(pTsW
zB%t3fm}*n5Odw6IA_Zv{o4{bStQKh&cGHJdCD+hOIujwPk!Hu2Sz77503g%$f8KE7
zTc=%oNUPuy;t2h#4ssh7Xfd>8aKu_v*t%+2H#F8sRif1&8w}{=VNB^Wl1U^vgF_9v
z!fGKTo(^91>aE+~{TzK)ty_~@S0@)2`B?_AZ{E}~m{g>o>0Gw9#Cm&To`d2xNqjB{
zb_7P2u$@UITXCDBrpH#z$-G$5h0VR=<ZUP3w*O!jZSH2>icVlb_J0huj+|JwJ<jvZ
zt{%@9VTE#Wtk*OcN1aeZph{>P2B|DUoPne;#n5Af`=k&Yt-HS1|IEgnhb-2g`uQ0B
zMhkMnl}m^a0!a==kcbI;6(*@6RR+DKxT>b|5}X5-c!V%%VrDL8Ary50M<28AwF|dy
z|3Qs*=`VM#=+O@3KRZ>BE+AH7Wh|>06WhRc+NV<LmBIwRnGR$aPOMa{pp6t}M%FcO
z8(mA_U_fNB@tt$u+p_DqJ*(k*`$sRMUHUol*hO53`?-r*PDCM*dg+38$zlkabZ)F~
zDv1591&QC9g#`f`ga8k0+x?#>zS{!~%ynyI;UCcz_($a3uMP*F(zqGdOfr{#t<(YK
zef6q1$2QTH9YUVPu;DRc(S)^d8io;53%Kn1pr%?<_ax@ZI1yaX+?aq{gB98-c36fR
z@4e;A<99rAJ#=#Y+Pl4LR2!Iwy^o%d8D!62;Dz#sq->O8HME&5ec5CSG$T`;Vubwh
zr*Ce#_QbO<`+D_p(aoz0gaLwlc{s>I(Znjt*w0MzWm-fz%_O@uA<iW4(o7gXPA|_5
zmOgwCC#i(n?CE4FqqL0$GmAASHuM7AXi1lkf_9`jVkBY!B;9r3ALo8>-Y18M!rLER
z*}ne;X<u?RqzA@y#xN64bb}?(h~_qgop7OtGx*}lv6Nb8c=B$ijnc;|+z0`a3oNsf
zhJj7AX_bMnCsNk>NKl7*>z+5Rf9%AQE?9m1neW`K+HmyYXQ0!RMCKm=&5M)QfVqKa
zu5Xf6LY2%ivqNTQ;4zr}O!^}1WM`**DqdCL)76}^Mdrsrq;>Gy>-OLJ+Nn>k#^pHn
zM`&wVB$0eUncehbW~e2YT8b3fvZfivq;#$!ks;w)`Qns`p}{jgOAH$HeaZkw$Epox
zZ&ErWNt+Zrtw3`wWyQHDl|tIYen~DbBqvypT4i+=_zj{winAppW(v@Zs;OKh71gsV
zbBdKh6;@cm8m3~78VJp($lc}BbafH%DmTA=&(mLRykK>D-~P<6&}EfIp88`BQlUCL
z9^%}w*5Z_STQZ%Fs4ldZ%+#Q=Aj`W3R<t%iiUu#YHxSpcv9y#7?q5)A+!yE>N&zL|
z!mE(N7>ocm?s(=OPd<6kM=SHs%d_j%8yJ86GddJ?<ZU8QGWFmJCa30>?Pau6>tQW=
zv0zq}lq=cURAXxlM9kTo+0TRg1GVP1*gNeJUy@hzNa;mz3c3^l97Ugpb8XjKdw=-h
z+{+HJAI>-_g?@+u`PC~#2tiC3xWuIz5tV8d1v$g%K+aN^y+nq;Y$6u%6GAGgQWf=r
zydW<mOqGt2qcV!+1;Er+F>_tHi^SFkr|mEwvU4}Rv31Y2C*F7bYDRy2{A=iEtRcVg
zij-N49Bg(K&d7|WQrq)ZgIVb5jD_r8xa1-Af=0iL+KP;rL$e|4o3#m4p_yM*gu<K#
zgBfvE%{gPPLeTbGb{XUrzPaJU_ny4`tzV;CeRRTS=%4%rInl$1gNKLnBl2XrLYZel
zW}_0Y#ODi!n7k}$LPgKQNgLD0bYk0G!pGw^tp)Ixt4{oS(=#tUaHw?o$l(e?N+2C!
z9&SOqTN0X1{QU_Tc8NQ@9Dw^}m?4;W;&Mdg;FGFUY!tNcIi6`CMFS4x1J~|&?~d>8
zzI(Mr?Ay))m4@Vsr6xwi*`Yd%Y2idlwM<D;C;K5suj|CP=1N`Axrm4SEf#eN=*5m}
z&bi>R&mTf<JJzq=c;Zjg8(u5ij(*@e<VSk|*3wneYP}Qj#`WZyxa+A`=~0<qk}ee;
zLt$!}nR%LHVI5>QM>DO&U5dyeTv~ZZaVx0f@Gxj@$1`*|kM<tieD2P@$BNMLlib%v
zmjVH~>Rd#gwK2GPU1(sDEP9EAvp*u5)d_l!hy(HFLQwDIXcXK<m{%AX)2S$KRM8j8
zqz*;FVUSqHj)UFld9n(PVyNk)O%OwUx*0&#zn`;vwHP|T@SvX|L-xIMnk?%v7K+Q7
zGDg8O2t!M)XBRbURCU}+YFhZ5G^sF(vM`K1hZyX~q<rymNUBdUF_SJ;k*9$+ZZ*w~
z45h4AERf1VeqJYRz((Em@%hJHaNwOoH^_N^{uTOfEM)W1Qea*ZX&$jt*di=5b~|6u
zpl1?NqHxmTvZiKIN8Oo|(nDE{SPKr*BvPg1A)2$SUPlRn)oKbHt6$!=^|Tv~-MjjX
z!*{OCg0sklzgGcsKG|}DV5ZL#Z|7KkP~bILwMjO2K`Q}!Q#O+n;a=MO{JtN)*?p-7
z9c=ptkD=Y#fM_{T6-(DG(mk#h$6`-Kj!}l<pkp0veOwc93saF9mf#352)1-(k(y2+
zj67<~lV_Z<{rE$+2h<l=k2EuK<S%YT?PJ+8taEGtnH-8?+OhJO!}742NYpg=`oN5*
z;m2KrC9@0yNb%I$ZyvSz>a$R=di~ld4n(zKcm5)@PetVF7XWh%7;z16*`}-|LkX`l
zWo5YBSs&3xabVpn4ftHDn*1qtp+~}XkxX71@Kp>mm=(x;ld;w#Rm?*mot~BD%}iRG
zR%o#6IhwpF0OIm<r(gW?t~1Yp)cCr!uRy;C{t$9+2Vp_0KuIdmHGq(}R&M2wqd94)
z>j~s5jD&ISES0*f7&Dqvd&G{`fLZs*hB|@A?_BVf6X9&>FxA1f^VqAtdT#gY>(Qo(
z(^XZb5@B6=7|<D;MD;*lQkl}p@I0n-#w22ak!@xsoqBJDh;InhdRqslWK>xpuSO@)
z#FsUHGfSD9hA9h1<kuoCEh2_D><hQueB2AK+_t&`^1oU|7Gq@7(Vr-@MvFKysLKVo
zepTvP`b0+jMAxSWqJo|W8w2Q@AIV8udJj!6m}|=vR=Z*9^wL7&vX{`~6tc*eV<8S?
z5(uBaI{B6NZ~tVanj@<mt=MqXmK8ErMLu~DER|>}Ca=xNr}zR<E4}dLjXaF2L5&f(
zYMeM2z_c`Nv7w!=i4+Nl%HG?3!DCn7cYuSA$KGRCbXF=dxf5j8{zTRXx_m4F*CSFf
z9-5O1mXNMik=f0eK&<?Ut2SMHaNm_^G6@3KOC;!`_$hMp)-eRW+D>HJ!)9ttMN_9P
zrR0o;&%&0sh8i$Jt&2PDPQAn$vLlo!B<)^5=Ay4Zx^(j)+-P{E7V_eIVrX)VjclAi
zi6eMk)8cw0N+x16(WJ`14B6%$@6xNE3vG^K4(ZR#AzCKp<cSLzhA=QGo6VRazAK|c
zyzu?y2X}sQCwjiFTf0N8M3<2t>HO#qAd<>ssI~eUA}U#xQ@9>$N(0Lx%MjJMVTZ!B
zMW!<ihHli9EyEmUK_gToF;{~T5y1tpdCMseoO<DBhX`G7U$X^`=YE9z=Tx9QNbQpV
zMbXwR;}v*e$Mc?0nk+~%qt0Z)t}8g)1S1q=>tb1EiO6)i$ZbzIFK;fZ3l%&>AAbME
zJ6?I@vDLEVzq`5!gUGhqfZr9sNLey6R;m`Urt^s-x}+~c)u{`^O%bEHIZMXHmx|Q|
z-$V*?5+My3Tj^B-O1E$INaj(TDWD~HD-&*^fgOe2yh_K~YAod%1a6L-|9i^iw|;vF
zetck`1)V=Ka@pgs5r`_04-?U+@XbIrIP8XlO1WE?Ng`0$fu{+w%#^*>ammNq4{Sc>
zk#mo|aFzT^oOuP>!jVW-2SpcB_EcGr4d}Uw27xznDxB-qG=V1Fgrm{16dAlaeZHKA
z(isd*R-Jp{(ej2NroSuGz`^{$^?NS3`TP^n$YcH5feVD{4gWE()ID>^(f`?}%-UjZ
zP~kL>W}-NDU}YLg145+S;AYtti<sN9>NE6OZLDg9sTNUcN>5msQ!*wQ!YVBFo^;MG
zfbzeplF-_%6o(sbfi1_p_~AttGSC&`E3P=6TI8^I;7vluSC=$V&61;2-8zOf5FKY&
z-E6H}tGW{-2$%9BV%xbOxaE2uA4YTgzdv~Es5e7sJEwJ5m&pRD{r+-Q_Q<8b8$`?q
zUNqvVi)@dVV5!(h5mF45N8Eb$3HM!n%ag!*`1P9NSKq5PIDW-CBxZdC63S441XSZ7
zdbJ0qkYc03TE4{SVA*1=Ut)5K)3yMsixhmmkcY|ho17ft(%t0PiV2o=q7V;719CGA
z2*8;i9edOj@89uTv}eng|9=@voFSynS|wa=EZ>Z^dpe$ZZgykp-khK+lqF>%TCR~N
z4e`m)Qo<Oi8&pd_*BqtP;c3KDAm9c*wKG4&u@rK>vh69R;I`TN#A#pN{I`=2k%8Qv
z6|p6ZY&hSkhP!)WQ(6t8io>alfskL#8iUX~Y_Z3hjh1XlQ0au8aE~MNR`snqF{`v-
zy6mz$=Bs;_*;vTrc32l;WtcUTXbkdxDQ1KdcJn_kI{5D9GY)O+AH8-zy7H<>g#<b5
zcvIFaX0oKdGdVT%bb7LF+3HM(7MdC%4kA@5H%LveSe{sqjH{-tL##ohvU>vy+o+v4
z6A+Ff6D&8XdBJF6m{!L0Qpy}pC8erRJdETalH7XNgYVq-w?|fz4T(?hM)y9<?4tuf
zQ-%c!EkzNguqH1v!uQlD#HD5K!RZ!E5d$-HwHu&gf=8BWBPP+ULjw1!jZbX6>DY~%
zR)^DXF1`c(hQkp2FKYlO3iMQ_)R@cDeI06&HcYE~8YNiTr*QKwD;S`5FqAC4n6^9I
zO0V6a(E4U{8XMPSK@}fO?hUX*)+IG)s*RJDUIQwdV4dx_`_8v-J^i}`x(Mz)bw#tK
zBWpn;Xf|1G;}&N;t}BD=$%Hw<Ir&vOn`<w!u-Rr#WK3~&d4`)kibK>%m5jT}ML6$m
z32>4nFU^J*02$=B!<L2@p1ZrxxaW-r&pU^R{z>vDSoDK@$br}7fC>k7P9f9KrhB^0
zncBfrI!gw9&p!qas2+!C6s1G$Ogv}DwI%bQB2^d9()^aMB2(Zjd1431pRZr`;{G#k
zdgu^1^6}o4dggDCD;<EY=~)I>#S_I9{ItO$LDdmPz|YAJ75)@|32Fh6p)Kh#m$>X`
zqb6jV2(?(I9_E0JB_u9s%2+(egBk`{P%l0H-xHqv9@R@*xAwC?t?ujzlBfeyj#*TT
zi-R<S88hi~y0RtL&&yObQfJ8%;Sn=b=@z~1*0g~O%o?sCM6o+|Jaf&9cVG0ys;P@R
ztE`b2IsJ><;rf>$5@o`ba!ULu#F?jswX^mxTq0!(x<zPOlHnskMmLzJ;W)aCOgC^+
z466QA>velW!LZCj@p&Y1!U(XPZ$5qJ`p1vG8GTx>Tl>kUee||;BUf(&`hm7t5E5(Z
zX0OkSchwm(F{;2Yn;uG&i!FA7Zm8;`_^L8T1?ptu18_JR&%28W#)(%V#%?t{QyM@n
z`qMKnzw3-^Z-LUo^=p;4|D@g!*gi!k^Y_T#j@|+*y~^}f43<839H7+uSubBvAqp71
z$P%ehM4d1$Q%O@=W)U@NaX=Ov$P%}2yXNdSzx`}=we9_SCD7JDPKm)a!N9h76V@=`
zV?;EFO6xV@`LRrml(yAUCaI#Ea~N<zp1bAa$oo`S2Aj8?wdMPR*Il^!?oGQb=zV@T
zvY-2zGFz@Gid_r`KV=nJF1Ji5>2)QFs(QdnTTO!*hllaXofvxCAy~xlr3^le0mRJU
zZL1x|054Q#EEfMCOYh-uS6O8b>o`%2yv{c|I%9eD_TGE%z4v}@@4feX4K4I027(}6
ziWDKVgqDPwP$Ym#=%KeDhynoueEZz@_XphPo~Q3;?X}kSGiQRDkcl@DlpHzBlPDQQ
z41XQ!q+nwqq;G2{hyp*!A%Km0=!9)AY`f&z=T={FMtoJ5e2!ds`A1-6?`Lzw_&`HH
zXj_X(g`^q{8oW`vPdJ{1<lGwk_~7La|838iJ61I2=dr7d*0+(?$6qPoq;KhcR1#@g
zjXC-ifu+R|IJ)HcR7qa=xKy)il;GH>BAm?TbC;rE(nKoH6a_5{&*_uwG+(a+iKx5J
z{@dx#f5}Ey#oF<k&?z$_hcSTC@gikMls3ky!#zz4!*y7I?H_b8<Ro^GJwy<_bJXN3
z<vLzn)3nP2Li?BmB!Gjv4qUY7i4)M8I-Az^4^{@GY^1#g4n)5w+Z`sWzf4Py-JKz4
z!D3cMQ(-E-^rE(Wzu)`zzn(hvo(<&Z%d<o3b?n`%ZO}*V|M#~bCrzD_iml!#Nf0u9
zwG0@lkCan2KsQxq-)-?qomhQ&1{Fu7ZRr5xW%8QwrhL?&)zWa!?z`fy2j2PJ(|~<!
zT0337f;E}QJ>Sg1D$gSHPE#JsSj)*p2{e+o7)r>9y{J$dA%w_frfe!R;|+vPqB4*s
z!>U%hz_OdbB6Q1TR~|m={R>~)pw<hoT$xq?CsPZ1pAscI+U*G5f>g3NW;T!Uu%Z(L
zU*fgL$^r;kI%bNs${rKZr1Qf^FTC&8H&BC*&1*kB_LoqLJi<U1=rPEyi+=?fV*uyV
zs$gZ3Mnb^u9Lg2WvZWOzN+zukb*ysh(gemhK!__tqoS>AAB<T>RceT+s1sMwwMb#L
zkb?T{b$2{-+Ws9IX`xetD=&v%BIjno4OqJ<h&#6Ss2ejn$H>&bY})X7{DP=tss;mt
z0s%Jzc9Pt1)S&(_MH<lL9XeGx>TY7vlN@~l>283a_r3Gh$Jab~$BGGY7wdR*{n(KE
z(!lMc_lKB;NL5E>`0#>j#m@VDu80lgS~MMF5vz?VN|UfnRn>EF+8k_<EjQk`ed{|Y
zF=Nx(PtIB`#Q#QEoAszd&Y|hpN!r-3GDzshq<G9K7lL<rlG?)X8&dI{Pi;t3E~e0=
zN~O%qrFfR7+S>zfzMp|`{@#a9efY!cGibACUGgh*aKDcvegpw4zK;0D78$)ZV<?Et
z5qBV(wM$|OyUI|8DEdXg%aVG>m%X`v*EQGw<?-*Vet*VF5u`-eA`z^e9D`Gyv8&{$
zZ)vMlRD-;;Sf}T3=7p&;2pZX?l9&-AtN3w^a27E5#-*07<~O0Ue(nDK4?pneii`Ju
zPyQDwzh6TpztX9*zG~3e_wx0kYyinNj55fr6dgF56G!4j<63f(;ZgY$B73gPWi<^n
zM!*EsEHjcsK~2#&RMBED-uLj_9i)rpE@a&}Wi&?M8vplO|J-)&oo8);Pq*nUX#CMY
z&V6kR>GfVW%nx)EMwU&=cSk0KK+M8-%e39x($-6x^sVwRp&B6+jK0=vMa&V^5?219
zN8Ww!xcfGAcaL37L`O7*?EVDYRai+!#FKLe%%xn3WVMB-F~-nqY36KRncT$algn`d
z)rPP0nf`E$Ool`LlyB~S?ZG3joVQy4kKTb=dgcV^#l%96zYOTjEJsnuYnGWyE1xCr
zCYCm#hB>N_%8QmDt}oKn#<C}hHDaZiexp1#0K$LSJ4fC>_x^`pSv7dz@i)N)`J$CX
zg^Dmff;^EZ-n9k&P<}YZsEAd)vR8|n6Zj+>a95fUzk?$;^Riymltf@9lL30rMvPaC
z78=m*cYgNBm-pVi`^DAryy}@_(OwIY%MblkmA&EHAp;X>u%^x?og?O(W}|`MJQ!MX
zm06iw;xHX7>Oh|!xZCbXqNwT_LJJ31&tZ5y%(Om3AoCUJB#x=T%W$UbNFmJ_`XL@w
zzO2Y`A)|2VtJf?>4X|^?vI&<xa|#3^yTS=Bt|R3@w+sR<;EE2w8zPazt4Ay<WE&e=
zb|p*9POMHGOW8^5nS+!rlv663VQXd50+{6J^EW>F?z11L&=vg&;TCi`Kt19NAWgp(
z6mb#jU`DhKoF-1vkKwcIA}XOhrNu_eXcCZ}$Ikxj=--a+{62bK?UiWN>z@`^=amdW
zz6LI^h^7?TW67RL!;#WV&6ql_q_F#BXLB*LRdnX0n>XkWMwpnDZHtaIjYyTiw_3w6
zZ`ba+^0iwZy=dj!iFxQf#rp1903BjJ^6^<9K29YCG{V?h9=gYQb3BV+tWLj^txFYH
zbHQl9>XJOZnUH8qnZg5VTU~1uCvs&#K2pm4hW<?1#%f5&fLbt52@U2zDrp*ZY{xv-
zR#hW{bSCY|QQ=AV?n!5T`shti0BY0Par2crF^&A@7&DMY()~QvtC1F%SUfJj@YUK~
zqr22q_6P;3pGsgG+=RT-X1B}2;Y5gw%(C;Lr0bI4>fzR`Hs12Y=UXp-_whSVSuGq%
zScdk>gFL+NuaHygfGN9#s5O}BL$;`pF_uF?UQIC&VMl|gE6MLneR&^4ZXE@>Hl4N;
zYy%hZk?VK-;l39)tlb}3tQ;P`gAg`<0T(3OstlB5NiYcRmqtWE4$GE0n2E%w?eDX-
z1p7FV&v*swYCAzK*XLQA9O*O{ilEj9A9=%pOST?5{*#S|*!J>@NdI%>n(Ki5q;W53
z@)@0{&$>E#OAFs^O<9zv*Cli$$a+@3X%E>M^rQz95)UW3S*({=rl!^ay}EGqnrcE*
zIEM)A^QV6Q+x=&6us_)co=~m3G7fYcrpU`b20WcP;;Sd2RyIVJbjn(yt85t9)2w(U
zod#ysEE{YLaYlRGJ(rP9;42P`<>0nmd+xt+Ln(P@6ntJEy~qd_R|quubA&563nZm(
zjoh!WAX2;;8?|KdZ8hw%{usE*5_XQ-LM9~($pIB`adY9gL#j<j<GhZRBN;-RY>glt
zv-xE*#6~+W{%rS^ukZQ|x+pHPuavfCBoBU#SwcIA;Ut$z-&8588k~Mn2Jcpk(!>&;
zRG=;<Q@PIN3Bam4_p*ylI{ml}-->hSd9>4U<l=9B494jlPP>R_RrA6&XUdQ$IUWf!
zA`$qp+KIV8gJq^1*-9-{t}nxOndK#$%GD5TCAumRZyBhCL0P2KCj@Y9zW&A=r(be)
z8T~}b@hiNRhMajm__Y1nFHwm#MzOZ4%El&SJTFqGW5!@*CQdXB+KC)uwHI$Z^tU%Z
z0LXFk+LNCO73&f9suE!j`RD(A187&BtPq89Dl?xc7pZMAj8!ceQ76k>umd>;Qk25+
z8@%ANG*lEhG);ssP|JAf=mK<JJGZ|2!QNX>`NwL_-+umW=n-Q>+FBswU<){xf#Ktm
zYDB6lFw(@e<(_U{r@D*1v5N~-ywP~e^LN~H-u~NPM<bTaYo;A6^*ZLJ)s8G7&mIQ~
z@+=|5^hw&n8d8#I@f5x=I~pw#pcU#NzEnspvNx7_g}@q+$fhEWut~KFGv4y7RjAD^
z$(S-AP<m>9f_{LN=u_D=*5V@gskUCj>0U@j>S}c|%@^S#4()m9z1L2<VS^s|=+9q5
z0~-QT{WuRk$V63IVw5uoRsSSP;?vY_ydqGw10C0rUrZ<!V#!5d@Pib7N5H7IIo)E+
zWQj2f0L5;(_St`*{_tIYMDM3fYiI6W$)B>wgA>Tx;6qGWrqb_(*mK5YO34OQRf94x
z*ZY#J5msO`l&W+{<6ZW`ZI7Mz{QoQZ{af~9=+H_K!`GlC<IPm^P(tcT;qf`yj0DBu
zDq&oF*3#v}23FGnzN}@-QerAdInLg~!?C25pai;d+e5!S|4-Mg#C(+biZi4|z7&El
zv(mV9jyr_DrWGQHj6B52<l$8vCb``Su(K_ig)ntM;WD*9t#5);u(Tq?wL+~SKOh;#
zNlHjE{eIg8XFqq{uKz=O`qS!4SDQd|B7jj182Pvf4g^W<1n;hl!j*A)>5ni<Bbv7-
z5!QI>5qrF7nd-eVHz@Iz89A4K=5ccaT|YLLB?m0QQZ|HA5Rbm|<O^>+^7U$&oTL7^
zdi}&Fn&=MGA$NZP@?{;pY6`iGS|huXX{K9+DACr;P;311($nC2^1Y}nt~at2gcx{w
zR|*AEr;Qo2Y0Zi%goNfHPS4thyv%`94}P@ui46<5t0@t5xMj!{&)onuo9!hdUtQ~2
za3D_AcxriftV3wJ^JF~N>g*$0tkE6dlm~7oVG7KRSWAzv!2`<Vnc`I(md@li3@yRd
z6#8-Gvl}k``|h_lOgEbRpQBy)A#(Sv8L$qFru$~UMMG@niQ&d#8D-k?+8916G=d<;
zjOQ<s%6f|!tCZ@Ba8s?0hT2+(r&oq}W&2;xf9}Q0Z%5C_O>3|JY^8?qBVO)r!Osio
z!6Q{KY3$*${61ins%+H(37oV^p$x505SC3*jlrI*DJ3Sj8P4DL)XO{eqNEt`gjYVK
zTECLSQLjoljgSxHAd;aE1XH@aG#&T3VL@|-x6h1>u_{7I0_`PfqB_K2-khS+fbMMu
z==7Wme|Ot!`z|M-TRZg2?aK8x`9DEBtVGD>--9WPK4Fokv0ep3?r6~EzG_Y#o|SaE
z&e$azQtM&TQX?;?xWTx3=x-ztpSB0%_wl_~ynVrkE60k5cl<ZnS`s<-OPV~Z@&XJV
z((wvWu$VJ8E0{9fSDq$XjetNl8{v$iHpy9)yQvL*zmOBsMU9e{9>LEE{Tw&1C8My+
zId305eEhBwI*6zK{eRG=i^$o9D}ZX=R%@4eDK=*$4Hyy2+|CaT>-;V*LZ+e&VG0v|
zeDBj&Jo?^wD{A4sBR^8DfA8rPL8pgYLHH2x@^YdRQiT_bP(-ee;Y4XnZ=oy?V=gIF
z0xgN`Y|_#;0bphO6W^S@=iQ_0=r>$XNu%FDKz7PG;G7k8dz?BNt?lSb<<VRlt5ayy
zO9+t}P<2BduVAtgmYIefc3BL$hTFBvBjd~naI2fYx%R{3zkFn4!MO<nbWwAWA4K87
z$<xFA>kYQ)63{<e23n(o+nr#hlD2xG8@C-rL0MW%whi%+RXCE-3mlvV+S|J8xV^XT
zJAEU>(Ll@u?fn!v?H6yVvOi*3D14TmH<Z>o^ctI$fr18GE_?jb?H|2*+as&Bc>;1F
zdbFyMyUqh83lFy_L>lUd$}}UWXs{E7WW8_3uq-E-ZgMdf^rm_v%@HVcR1?F1>>##i
z14u@FdGLe3zx>FC7vle3`fs$o0rK8+@W5d<`hjAyZXatbMUK8OvUAc}FCSa<4INXw
zpG+@K=Rr@PFc=w)(HT6J_nq+eYdbF93FPg~YsX5TQLb<M-<36N4>|S@5}5bpxeQae
z#>6$bZHqyoTndaF^UzkY&>QBe9;1&l`npNX&xcIc&QIQX^VaJhxoOo&<Mx$=zlZ#2
zB!QEjJjZAeRtBVAMX4z(n;NvqMqMCx^>v06*F-S*iIC^tv-9Ssw?23R`Zn6McFtoi
zbX1Q)wryDhA&Wo-n~O#94J8sirb`)i(jL34g7p<`VAri>FjWGZ8z{q?ddq1Z;|N|G
z)8&8#dG}jiJoNmnB(!tbX91!UFjx1z1o_4Pf<FbDQQ+2e+yH|{teV4R8Ws#Z6i^k;
z)Rgf%sZLI}<YO@ozYQ75nsW&i;-eRDyy=sdKlpfMwz>V(y{dJ~@83cP|G$vCWKgV$
zXM*|0R%hgS#xBuVEQTV@pAgjbstQQ=%}tk}P@c9u&Sg5JO9`8yL^BPH@N>Sr`uU>=
z?|gdI?F%kE9c{0RC~Xkos*2HyzAQsTNfux14Ld?T39U<PGgxjuO-Yz=1WGYhOJ?Tt
zcy-Q$4G{=BTExJ{TLzAJH^@=Lm2}PTPIz+H6&J4B{;!io=#b8lpWMHMD1R&q(p?3=
zv6*MY7-JT3I@UlW*r509QkFl*So(2^ic=ixw90~9x#OOgX?m%SJ4rfhBA_N7eeCO(
z_r3CO5LRtkJMg{z=ttL(^EbT@jFd2wOqCnp1?HRrML>(2sf$*17hdyo1s)SN+J;m*
zJTjAbe`?wjCZjs4fW%0et9efzt0en#1&T*MUF5|fI0^P`x$}a(Cx+2K`P2SYklsN~
z0Ifn6>S)p}`pLNFk=EQQBb}hvOqWw3*!m)R{mgBjdTI4?6qfhS`#yj4!GED%bDP)J
zzSmZ-zyF(+Glv7|=Bhxi5;St%L?p`NsY`=gW@=>SL%}Ad(O&Q)I$PD$G!ig#tQlJ^
zgN+Ce3bw)%{;oY&y?Ee+RREgSt>_n0<cBALGomaAu^Fb@w=Bga^JwfzW#)!Lwpt@*
zGl;J43W(J_iFR6>F}>lM7u)Ac=><!xk@r;40X_8KhnHP>^-(R_SME=)LI?C0h;a5j
z;OxfSSr4U<V&(f7F`u@S;h`R>m`uu9qG=axBu7TexxDGAJEAkJuNCr`DzhcvOM5>2
z;-zzs{=JGexD)7;&>#W1>&HKUT(M<Ab`rUST12N3Fmra_5?hfG0UV`DbIftLLC#q^
zEvp)mhk}ViqL7f>j(mfJaYBr9-JVMi?>qkJ57FU#XIECW{(|#<^iy-lWB0<d^?wFk
ztY75Lx8sy#Os8u{Owk%p=nma?*8^XE@{AY#lyg%Ac)6euPy@N|&6GSV1QV5cUNDVM
zuux9{TlWildLloYNGP(gaHS<Nv7newr8nqh7iNt+?F=uSrZOC=2cNxs-_!S=30KwT
zwe0V}_IG^6igIxbB0l*N*gGj~MAxB~CuKt&Q`RnAT7gW#j0y1(xz(l876%18zb98S
zRN>%|Qd#5()rc*OuW*RfKqZ)hfa2ztUVi(y_di*QAGrITMtkW)^pBMRo|7tAR6dR}
z%Z0K`X*6ue<p-?JOwOVdg2AM6;<iHWe~>m<+$3T|i^$mvSzzFC6O>rYc+Ur4ym#W^
zl@xl@+As2-pv}sVSKzqJx|F5_KWiKSpI+lcYJ)5k0WpU4CH!*SFd4x|c(y1fr>sd|
zTCaJ7xQ@i6;s^1h$pne=%VAeFqP2QccySSN2N;zQT;^vSK78WKhu%`6!+yorD<h1}
z$lj|!k*{BpGxY8N-@t089AyQ|=P=w{0Xq~Vy2fmsnJ&y=UAdts7>^4?hOAnwE$N9`
z$3W9^(}{*z&mI-!U2q!ic>ay|wmtL5)#-BeX{)-SWaOW`^Ho{(IM@qfM!ar895OAm
zm2wpjjVgzmDwPtfMQcj3k?GZlS~FBg)J%iZDYj3u@i^5}Ht-u_IUa(XomX9c(=At?
zwgHb)e{}&mP#R?CUi6q92p4Rdx;XT;2{Nh7kijujHf=~}GI%L*sovV|c|%xdO|0l~
z7bDHsKOeyDa`Tff+<V-YFK*nKuGva6F+;v9YbvwKsHzJwxrmOiOgv*Ls}l(OxF9=X
zBiR@9{K%W>Hiu%?0H-3B{Y@{}P)q%ccz5Em7R(;i1h_I^-g)b@2Y0V>$9I_?N53?I
zy!0k`l6mv$P|MDTd79PZ<?(35>u{_6##rt277SVaRM+6u8?#A6-7qT`nflBXF%~6)
zNpWBj>&6a<SFzSch(Vi42%VY3GfAX^V0V4TSz9i<<zK%>XZ17fN>NUN!wmjSkzoQP
zZq9{!o!*c>6E6)qr`09UEu=<!G@}<X`2n?jLKkMmDbA7{FfNQ~PEQHN9;<yW<c)5A
z{`yP5dite}C~5MKm(eJxgWUFquT@!Gya*L4rbH>T%4-mGgB->w!1A>%jk)6i+J2E)
z0s8ZSyDq==w|_f*MUi>n+&`nkP(vzL1VHMpvBm~PZ(3!sEF5m<pf8sV^vtRaqc#%=
z1pPA5<uEEnWlWi*S}2e{l8E{SSY9tb@ajvS{9%Kh{)->HhBhciHiLCo)(~9Af+}ZR
zMzC0*vKQU8NQQF+t!~`q)f%kjfNpXIE0v<Wg>M>?iEe*DH=3-S5+X=svW#?{PV^}u
zIkDxGxAx!j%FTb-u>KmiZbAPcj%ZHkL$InZrG)dWVyPTt%MphJSW8R_fz1+TRdiLF
zK&zzL;MNJt^n&LfzWMH_ZihW^?Aq3~k!qdsX=6jH96?g|g1YIKRT_8^6Z{wpKfx13
ztX?EMS4pZPvc<%P={&OSu8W`f^HabYJa+B%-R~&ZzxSK?%7udtA45aF%eoIxVVb5x
zkTUS;AYs<_BnA<vfEdK^WcXBn5mqfG?VeE0srj-zAytdFqcF^ayB<CH%EwU(@aDCj
z5y8UX=I2%cnGP|kl5m2_W)<Ct)HE2Fc3qfCpUai`dLzeG4_cxSO++Nt=*d2{W1`Ji
zDng}D8EeA2Xf00+R&6lPU+(zqn-?#*d$sM~_`kc*by7j@{5f#>`BEmu7_{4jJ<BlG
zN*Tc$kEjs(x;6=!M4=^(N@=dgnHktB7d<xtTXq8{0bBjRMSs2RvllPlI7jZt{RC}L
zk5EXTD6;0FEWv;$EnR?*Xc$!?my0RXY0Yto!cPNXmMSZz89<>=kC{u?fZ8fWC-$sd
zkspmTJ%T)EN!rG$s4c06(CwVRe}2=cw>+^y<hj$iQm+(|Z@z-!izJ#FmlWH`3k<n2
z$Cd;E8{a6%X$Z55P%(`~%TpJz9##VObnvO?&-mk+f7_6WT(~EQ-l<;X-V5IVr!quO
z*M>9Js;MxEOe=CyAID<ojLMF4HjRsfra(xVNwqDBn5V_ZV+T~cLaeT2JQN90(v24z
zey+-ZOH*P(yTKpxLJs4MqdVd3eq_U9)7@KL-&W+;OGsV|hpI(C(Is)Mv2Xy}&C0R4
zM9)0Q;CcpTKM0|$yxepJ<r&Y+ox~)Dy3|Mn=KJt!c=Gc1ul@Rr4Q$S~W3``V$TK3K
z2P~&pah?;`H`$=j;ui{7`e-Ci8|OIZOw|(z!m3U?DzjFrJsHQ5pv7|@TYysarl&!I
z5ZrZKv1xk3)zR%?HG_chjMT%nq+w0c>ov}RAmsZ(p=!`GV_UU`#jJ!l)3!ujWtuvP
z(`Ju}b&!Ry*FXCDwHpq7dclTcO5*GPLPu7P{O*o4*al9`x}s@dv1RlurQ2rm^cgWI
z36&<}EPZ7uJf&dlE}=HGBod=id!gyYrt+>7oXQ6-JNv+=Cw{Ryj=qy#nGZl&uRnos
zUoFcou=EVoOj6>f9JY!P#4|KPAXoJgc&eP4n6uoZHWoh~vhhi;lL)AWPp{EoJYye;
z;Y?zHeR|moyI=X|b6>6e&(t@p5(3{xylC|(c8cnt`=|mAH<Pk9nXXZ(3>J|~rgAc{
zOIX8V+azw<v!=EP>e+}o2_VZHx^3_2XI_2!id)5ekBXi_n~^6vkPPCp4E9ud2GyC6
z8BR8Bf(0^8s2vd<%GA)VjL<1$U)V7TG2MQlFwChFWcVnEzYd&w>p9;%zWs#N-hXcM
zX4N|9yQ^2vcaZPzgp*CJTIeu@Y!C12O^P}#1;h5G=^3ZO9gmx{9m-VT(Xyrjrmd~z
z5fokJDDBC2qMSjXo#_}XG7blhtX-!+d(V?EY%q`y4_1x?airC$gYW{&XV!3(R@rS?
zCX~4%k0H_$qBVs?Tfzpp*r<U?9yoO4rUzDvIU^+H{R;v=n2rkuJ)4Xq3p<-Jx2P^{
z@&Jk1bKArFU%m3y8hVB;pGOI953ES(N#vBD0gs#+Vx;9*{><30+tVSJD_{f7V}z7%
zj%2KMy)a`ruu5g5A~AR@b$oTa<*nPd+`r?d6V6$U%faUXM1Sw28_>~?As=s#sk43~
zGU6!QrnbIFphw7V1wY8)%u;nWkuA*-YT*WBs#Xc*xyGPq^r(%kyx%osuziDkyF_P*
z^7SxVxIju=(x|PI3Z#lwQtgNL^|j~TcEzoyU2Z{LEUuxa)tqm^Kl%~cSw92sabnEj
z<b*=paYIWr@#Z@7QeKy)?SYZKo(+m~`H&&Z$VE!hDn(|W79`AIjn!jy)Oyw^kb`96
zp2JW5^`tk>0)v@NYyBrzncgr`JNYpHY~wy`w3Td#u~@EY8RhYlj0&|C%o7BQDgg?|
zIKny=U*yj-)p16PHD{}IZd$1wk&@tyyX51;2R`|Ks#WicD{nt8lKm+hJhE<u@1^G&
z3HfqPHzmq^OTRB_IMRLtE4HMFjZ#)u8ni_7Hc+?eeM=3$MMOqqAd65SIyiXswYT4Y
z`~5#gKbB%&HG3>F=)(mW_2VPinP1PVHrO_@!lJ|)>Sh)`>f~XXT}R1L(rOmVN)uOW
zC1lM~oK&1wkup0CBnG-?mUkC$S~In%wD`C>OvqcR=0g*5KSRw$Qt+>bez))0Z~nOV
zp4DA7|L)4Y911&y{s^x%5?MVIJ2hUF#V>IfSyW~TF;1|FC}D&&tfY3Q+fj_gF^|GP
zh$pocR8!~6k0b_y6;R|;o_+tut9HJ$0r<10*P!dDf_!iGU09bCaX4*=QUx8KScB~w
z7m}D<tq1?>Nz^HJc}rYpXQn5m2snW-2Y~aIkIvry`QfkkYyg)Jy|(hBR3X>j3+Rj9
z=8)iBEJ4mutT5VnO_kVXk8z_&P(o+20|}jO5y2DO%tf}CjE<yzC`ctRXDPwBua~Ln
zutauKZ-ym!$<_NW`|OrSG3dzeznH!85bS>!<tUB%b}s0y75Xw#Qwx(a^W4L!>tdOV
zyXx;0XbsB9-H00`0w@z0)x(=;`-`VMa{H?fRnVrc`2Ek&rea9vn`42qUzBla&Y-N~
z>iFok1k%iz^KAr|lg}(ujLMScHsRF#WY_6$T=yg@0^GcI@8=8k`uRUuU2Go2K$`&g
zYn}KzeN%=qsm%OAQ?KjF1^Y~5Oll)>wemuu&MVBT${JG{?K(MxYFDb931zY(w0!vD
zv+sE6t<TX)Sx{j(aWy&}IE1ziOh-vWpsov;EN#<D31mWIxh!lIruahwkV$;DVZ?zq
zswh&D6yLYt!Kd7x!`T9LNOb~E{rJCc{_OLsPF~4qfA-&Jqm3$%Gam;gguW6VjM{OJ
zT+GJul_s@_O>PdSNjFAY4KI_q>M|UVNPP5Vq%XF2EgF|I=duZH!4jPg7c}0R@au8V
z{+8W)j{EAf6ISBGSFZUP+Ws-f(-%Mm9V(t8#O8R3Fjhg6v7s0#uEt~{!EsO@8@Y`6
zyb7tBm;ygx1ncL-XHI?YtnE*%zB2myN=lVN*1iRXNqCV%)^tVYm@(1GN+DDkiz^2^
zTz%W5au$V2HI^HPyX?@816OZ3{{+~WpuW=()a&5&icV}FIrxJw;c-+_<_e>we=tp`
z8Db7AO0}5TbYWFmaLfswX~HGtG#w*kWUhp3VKu*uary`XaS7w|S(kQr`#*Tz(UZ4b
z{Oa!2q%Y5TP__QdiN8VH{}v)?1DbB^k~Qg!&Al}Et^A2EHwTMai^#)KOq__rB;(aW
zE_FItYen-Cy@RT9J4%F+krIw-hlC=(hL2D+iMX9N-t(8;I}ZK(=y~Y1w`uJd)ykSO
zhy3R5pF-k7nO!im{Mdq<(`xJ4Wp7c55fb%GQcAaH@zO$pDX#Y7e13}|jH*N>|2Q5J
zNU{Zw8>{Mti=)YK5fcPPz?6UE!c(uh<}drP=wFndFrmFLBQAy!{9Z;Tp3dS8dr1zW
z18*wGJ4$t&%9m%<aX?o*Dr;ukped3A9Y)Z0c0A#FBO#gECaE0VgRd<j9<bi5(jsx-
zr$f5;vO^brdDHPPuaJjh|GominTX^*VEGGL4Sb$s5bGCEcYINcQT67WLM<#f1YCsZ
zcdBZznFVEunW3yCa2<Do7gk0f^1J7no6dga?vGdQcRPk1G`?0KdwstI4lO0<SroWU
zkHua{0h6D;3@rlTY%K4$J4Ah2T+t#jctwkeK4nCV<vEErck&~o5za8JS!KCMT-CC+
zND`Jl#OX%uRN)kYgOgu7@uJ=5*wE#Kd;Ve7`k#Kf0tT?iP2{H`DKW$eNBEL>x}=+Q
zZdpLZ1ayO%u<%tuS-#cjTU7#cgFnQ3hL#Y)E}k}1ajQXVQ%WP)sMG1CF+_8`ybIUK
zdAlEf_Ya@1=nIcGSLMHciR^${klBc3m?j!Zq^O-Bu(-*+0aM6T2Jr@!t?uHdrehD^
zGWI3-e5tRCbqun_KFd(>j)x|rPZteKyAuyRD<Fezd5j&QMVZYdQiLcInt`;j=apwJ
z-E;I0Uu{_Do^a9k(FL$X#6Ld+Y>XmtC|C&$eOC$|C^a{hk=Ms29Z#yBlx687VobZ#
z7)G?RCn%H}J7TtV7-B2f26d69?ns3QIT)qeXm&aUJM9wk5qcx&ZUar>=2s8x`{uN*
z53d$=;2$g1TN?RY{2ibv%u=93lelFgX0}$W5f(KkQ=?GFSWB;>Vrcv7?WD`rX}Qbx
zFeB7glghR(h7>om5(Jx!JSz;~sz31e=iYtowkMugwSMJIMYKC(g#6%DAU0A)>C?Hs
zpX1{tDVtyIX*;-9@Z>WGE%khcIA0hRwsw&~5qoVG3>OM|nG6CZC^_srKpwZ;zyIKe
zXFtwEx5@2Ck42lcBC#3^UP)LcNhY^bot3(NJS19-qG{crQns7Yu6cprlKzy|BA*OY
zY}F`gE?1*oeBEgU9$`))!k7s(P}Q`g!8p^djwgsF(AvMV{fiHFJ^a*)Xny4772#Ql
zynEFtKqMSY+5th$>CP>({UJ?2?tr5mzCX~i8Z@R2+vWIJEcTK&#@C2LR>_+8wpA@Q
zV<yB9Tqa{$O~}G_Kjn8PzWKyummAQ2IRCjajZ7nlo`=-6kw8gl`uWAY7|Bz^at2gS
z367X_cg?4>V+1$>X%?&t*$t6Mj8_ga3JPK5HM?r9<~ZDI_@r~NX+)Sf7r@g`JoV@M
z51+Bhn0@%Kx?<h2YnAseB9EcIh{QCt9;Jz-X7H>nNEwA5BFE&QvSZkTXAuK9k1y?D
z<>5mQ{r<+kUHtcV7wDeb^R-dE-uv>$0J5S!o^|B;1CUphkZ6b=E00MEJ*w8!6jDfJ
zeuu;*6Kn9`O?oUgnvw79CYhB<xsnXgO8r4U>n36v@H#*4)6X8>dh_o8L`UJ1yH~kO
zE26lM3{j@66A{>wVoa<kFiosOg~{T|2pOGneQcnGRCYO;>Y{Lh{9(5!Wv3LuIK}IX
zQu_^vNe<lh{_$u2@r4!9<mB?oS%#00&iD?zZe?KRCm*X@lP0|_2sNCYEF=WVIAXia
z<;pY^Ei0QSD(Ai8ET5Jd6Gk6Ntx&+TXUikk{^i`A52ASC=C!W(e^l%5-})cu(py6U
zEO<<@ZPp?)5G{g(@R-c$HMIeRQc4Q!N%{on?vel_K872s$tL+?lWt_mh9l;0Phb7`
zjoVOYXY-o;p$}E-Pwrib%o)gAif_Pi)1u7@=M-EF>d9DUb-PGw(B++2Awe1@(W`Nl
zXh_V-gbK%?7Vw1a-eJu@B5fE^y>rEZ-S?l5nkK@POFf`kAD{6RdMF1F=AXg6&uoBt
zQ{(u^Go*5`gpqwbb|c|ZS{m*I#X>n=!3t>LSSy5Qe#|nf8)Dgk3<YTL{A@`%gZhuc
zUJYl@wL)N~x?|fZTTi}z@6S<iY1=zc9PX?qA(xFlK~l(Hu44m`77|VZ<Wyv0Ogk6`
zdblhIbt?3M+OAM709>jPZCEY^*HD0emQlM1*=;s!md2R}Q+=nnlo=DveRD<!hyGV*
ze)!^tA0AnqByP;g+y_D4KL+A2maN6%x);uT*C({eQaz{5!}ACI>P&ZG5A`XYNmkL)
zGz^>}#@lD-AS!zKnm@eu!M*RDyK1X(G>wKudgMPp2*Df<tx8_2;I^y0-a)g11wnet
zmn3OqK75kBkhDekG>4S%*r_cY5i!y-<1PQ(y6f~)@7xFZicM<^-H*|>#K`@70Rm&N
z4VXZiic8hWY9}!*>jGyvA@UY8a!jUY(FAaQL%M@!sDU<@gpqvbo|AVz`qteWdbUlk
zuP)_pA%O=W<?5%2{2pFCkwBD^mWe5{dzItV(%i&K=Qv|0$2DW}6>g2tESB(4rPm#D
zMEP#sL_N=#y&_>nTpiQf&5WLybh>yWQ1i3O#vnXbZ+`E#+fI4rYA|*B-rB9#Csdqo
z!?!Dt|N0ZyI+=>(inJb`dnB?bHr1o}1K4cIjCCpX&ZfXl&(Za)i9&9GQV8bk$jtzM
zH8G8+$V>8J`#@bO5g0+xI#1wF&Nz6^gYWJ+X+tXT^S}yxpd-sCJ;0RpVN}6}NUtmk
zu-+!p7v`Ey4b<WY>aebGC<CCQlP59akkr(UY0(JDCCb&={nG7keExnMUDwxrcCK=L
z?bVg#L>Rf@zTZGRnkB-cv0khdh(dBoV^1_Q+`195`)o?BYu1ScBprCw-gMokXMFbP
zj{iodOo&^FaJ)$3fFGjn)`(S@M)3xvZ_zi1dr?A^rtI4!t*$NIXapgi?P&U<k!Nfg
z<EQhvP-zesydL$$m{Nf}Mi4CV=WsjiyXcN1Pri7|1FQA*#IvhgZ-ESc1vsmWLFEjl
zCPjB3&{>16y1PA^3Pw-}kE@fHmXfT=*o#^;mc>GEn<;|T<<RKtM5kptkqW5Dmiu;G
zbkaxXp|6`wYu~%!f6=q&hsahnsBzidgl9?sLwL4%GHW|%S*uBB038R_9=G__?7X4d
z45_NoqB4zBSyM|OV;%X!D~}xb@N+oPH?27meY7ne^4FLG>R>8`1)f%9cAEi}SY`th
zP{|HkDI!1(w_SAPt}9*uTF9|$2d}?IwZ3EQ*igxdklg?G4^=jrvxdhIy))wivYw{G
zFXpNuebA?{U4sM%*Ja5T_*{!d56KM^Qwse0G}yehCr}0(T8q_NS<*|SnvoRc_c|qe
zVd^s5ryK=K;gylnkZM2Y`9GfX)qxwk=m+2Pt0U+}3n6byS+H0MUSku94w=bfqwQjp
zLs9j3=F~b{4N<j_kL2?_Zg#9@wCetbH>kFQUXBWdBJ%t!K7chhxfUXhl2k$s=q+1M
z{^-^}?c9Qz5N%rf0p(NlKh($%J_J<=!;)%^+&X^38ZWTe&N*gKp;;C>qunpA=L?RG
zfoPHYI&@-^&n?yAzP#(xw@&-}tu(Zu9c%<0-2t+=L<B?wwR!B&k(eZ@-XICMhO@Gk
zQsmlLmAqY8i$)kJW!#|j8?j5dK<X;is5w~`4-xyJm#)2G>pvcP4L)u2+6QHwYW*qZ
z%KNH~v|ih)%6izvVOwKQi*u7PEn?QIskRv>g&XTU-e!<BpeNh}D1*hCmLnp3n;lK-
zl1QqE%S9Lszq*m2QR)o^pd<z1)Xfh=@|HIQ@aM(7FCBjU%)_hEkbLkCIvQQ%edB)s
zt|T%<t2S{f*kI6|P?x&1WT?lMytu*OFbf(B`0#~8)@+kn>nE9dGEG_{Xofk)oZ@9x
zlQN(Ne|Y@oAN~9MeQW6Ogm^i$WiE1R<kx^5PNbn!gw4VG@a1r~h#eX;7_WpVauel4
zP9s~hmITapmIBU!aHXimQbIzXH3_=?K8_q!NR|Mh?>zO-XFm1Vkqr-Xa&={WM?)T{
zLY9b@jBxl0QL7TR%Q<vh*JoQA1U;3c5qC02MSCf`pv7zswux<k?C-@de)QnWuby<x
zYQ%r|@<G-5*-x%2*>(})2}e~~ugu^mw>z|{TB8j$s3SZh8{uNiW+K#;YSpkUa$(W+
zNi)NCk1eCo!(o!0$jLKv&d%KAlq94ql}FZY3XNrJt*C4RdYi?-2HST1$M^r~xeYGz
z;;U8S8$sTF30|=rkPW#pU^JBEM={e#t59l_<b|=(n8+s`6|t*tb{aJ;m7qBgGW@wV
z7tW#kp4flfKi_|RBfYiVu}aVW8u{#WAg1t?HX7LRc4Y&j)tt|ToqVWs5f>TU^-dZn
znELvX7oO_`b%A{{_Ed8Xj1=12dG4W0A3gmz9Xe}IZChb8-$zb63ILltO(I6YW0+E$
zViRT`BSu?fGV_eGm#5&<-lnxu;CMa5a+4v|@#Zejt9FwS@6ga*lsS;{zh~E3C%^O9
zzkoyoP75*|x>+#D{I@>>@y5t29*D8=td<=xN8K7@uvThxgu{+j<tr7sJ~y@|vx&q6
znRq7FX=h@WxvKK?ZMjU;5EwbTGbaS`4IvbvEjogOMZjYq1N-afKOel|*|V>qqdVz8
z={@y2tGvQA{sW=jvJOe|AUWJ>XBc(;vYb~0EmB_`>}7h59I?k~Tm9Hc%-Sv_2#R<#
z#T^Qo{3cSVtNdbqTH345y)s>E(WG_qnYdGJU>CE%rMmXnSKq$lt~2jj?W1qUn&@f|
zAb*a4D=3$jEM!bN5!+Fgs;O$Fc4W+HX;YSJ$)?!hbO|Uqlq^kdDaHcAt^gxzSphS8
zcHg!a?s@2jRdc)Unxez?17!2N{|Rbul}O|<XGO9qhpNlrMxv-FF`pFz1sQeGlVB4D
zC4M<+b2DMCqorrKJqul=Mbpp%VTfZ+x&7Sz`>#EHHMwt|wfaahBDzxyt?F=Pf1a4e
zEsW*>vF09dqLm27o8<ZkJf}&lo*KFh8>wZoHK%&MIUrXOGv1*+pKC+dcIc98_n-gi
z-VIZMW3oR|te;O?B{LexZw@=*u^ulF?Ht~m*i`e>Wg^pFo|k);e8J*QvgTx0vlx!6
z63nTAqQ-Q%dHOV&9X9a8MP-0V%shC^T;sNtm=K#ExqI8ey{}x4nuu&(GZrpYt(Rk~
zT6Q+1)_??@+z;huvih7`#!1(jk+vo7S@wu(oHs4iH%8nD#wNBxVsjj>`wR6{F3yrG
zd-Y~6CNOFM3b^gLPwzPIvD@!l4f#iZ{j(H?yo0>m_#Z&5DWSAB#D;=!Arr|P5q9PY
zp*O0maS93HG#hb;hqHuese{M!I43kC)ELJ#s8#gyY6X~^`(F6?!h<hv+t8|cCcquK
z;gprDixD}s2eET7Om46PvqdKs78TObP?_S7R`{7*!@ua*-9;KfB&M^XPJfacm+`?r
zhs!VcjOvQBufxPcRG+Tv<hra*3mXoMFbKG%gKSz-2DIkd`@g#P%HJM_C~DK%YiEkl
z6(mO{e+FHcRaA|1W`U&C1d_&fwi+564cvjVTPSobvS_O8z@@~AU=eQ|E0-0>HO(Dd
znMxz;ltvu}m0?I0=RF43&ct%H5MRFe%I;78^z}ydsD~an9$oh~gniSes_aiFjRnqD
zHyf;sV%?q3MkkU00)86%KKS_XorllgFtof}{vYU*#fcP7hZ$6P)g0<fi<3&5cor!W
z66t)PU7nehA#*-E5z4B1-PkFXJF0oVaFDWhLvvGK29G1~P4EWds4DtzH{HJX`cM9}
zn#4U<6417xELd@iDqF7P%G4#9I8U_-UW684<$W5E7!q|sLwUq9LRmF)hSlhq8^G&y
zGz~%%#u=$+eZ@Fp^v9IUrZn#72tiZSrg>|;NW{-!>qe=%(bY&1-DXYALw3npGQn~l
z1$_IIYp=X}@17r_L%-%xqeCA-1h)$yu~qcri5;DNB4jy4L~TIVA9<AEiLWe6rW~Wv
z2a0?$1EAx%CfL?AqQb5<ng{L-=*{!;s7W3e#mv5v%%ZXBVcT8t*!FL>J-=anBfEK(
z3y~sUC*f6M(!1F>N}(E2HB>Aj)B&0XiP&-8NOFWRQfWI27CLqzBcu$JRr07HB4ps@
z=K0V%PEx4>Pr<8l(ucM|i#)#Uq4TeQ_`2JkTdDXsU+hI^_t!}0Du@om;;5wtW(Hm1
z+*0sJ1$8<eTW^Xn4VRLolFy`gFhWrYmEttBBi9fNCT<!(UFZP7eDU%}u6g0iyU<+9
z=C%JI0G;yK<jPx;j0_n-D`VveA!*Klp^*onMopcXO_OEnaGsE0<!KoZjANMWj4Hz=
zl6pC{YG;5F_o~xhzx0adH@s2a7ac}*a2ezs8h8sS2orF6E}B$gbFN_Ob7l>SK9m{Z
zsQFm8UF%U0&w^2@)JTHtv?7=yeL>W%q9*xx#;EAR!s5Q-wzGbJ-W6?h9{>4+l~z@U
zJjwtVV5A}m%q0^Si(~Z)%sPuyKt%Gua-p1H+BgM4!?c+CJ&<Jcl?t*)tz6I}7P(L<
zYN*LWM=8M0FB%0!aVSklx%jzw<Xj}M1#7QNZ}Gyxx)<tJu)>sV1S=M(syMt%5;RA~
ztwOWV5<-N0`A3&taO&|;VrSFZ#b2zHF>6Tnq;;qTu659*4ns55tQz7KFP%~#2gf)j
zKg?b<Euh!V4k?{>sub*729ZX9KUKzxu9%v`00@)j3YtdKYC4}zN-Ybh)k+T-@l%|q
zzBCy1#aS}UK*(y`9Km&6GDM?tQ<5o6vgc;m;if%u!v5zTy>#E>t1b7vSRGyMX5@vp
z_ko&UxyWNOa*a*nWDRv}d#U3{_Z2zv6q8H1VloSXoB$RvlEkqQ6&J`AAD#E&8GpX?
z)fC#d2Zt-zg@!!e<f*fXESDipQzFC4a*=E|i9~9%5S{Y*btIoO_9+scqBf$+>qh@9
zT1lq$%BF--9#soP_go#FS^3y>v8p9P7%sPP6Ix4vAvHCbWtGMpB3S4%=)+4_zP|Uv
zKm2~x2Yviibe*purMVWMjR<8pz==n4ozn#d|0FYC9f*>|I+Lz~b++r|CAkk4a3T?V
z*fF&`O&6lgmb-mdMpN+kBtok#XmoktG~WK))?2pkza5GIfPc@4D|4JIa{aI1-7laR
zvx2rK;Fs$eOuT>^=9wdm>|*RRwd^{j91|Ub2?`*Pg4tpYCB3{{;|K%mVC&XDUUBoy
z*KS0S^KY%>$ymfodP$j0*oAcrkt<y4yaKT`Qp=6>oE(<Kp{k@agRJ6^1HUhncCjku
zxvN5vmTC;Svg`;@jD&2aCTQit#8JK+6yU8w(-a>zVhLW3Wa-E@<{`wpfG5Ml*L?HV
zt@jksu6+C1yV0>SA-~)OG+2gYkY@)LA`tTV0q$-fX+%m0=jmE%i95^?6P-35#A$7}
zf2=9OF}dU8M~*-ByxqTBjrwg*t+;e-<e6VV_EXjB0XfpG_E&YpT3sdJi86wqj4^L9
z^EC0o!_(-Kq(<3U(&R*aWi?xj()~JzzX3*Wc8uN#f&KPtkM2CM_q7eKyvKbS`jtOH
zOc2RrC1$3?WG#=O7_=x!v@P6pD=S|Qnsoz(LqCnB<4lq~qRmkw{`5@XkeGs?g{0GM
zLtuIxymI>uPygY51nv6l^A*ObMqWDUhd{EB2Zlmj%(Gw{n2^!oGNSweG8imK$$%%r
zvUVMUnQ~DswA)3q2~!N#g3_uOuEPCW{&n-?C$6C3)JD1cI`aDM;OfLOhT0*ZD8XHo
z=IO+IT^H6bNUc;rMYZU;8ka6VG>=$>;wYSUk{}4Xc>Ajlzq0q#je2D}T9=_6J_fnr
z@q>`N)N{s@azE^K64)k(pTlh;>Z&cTR4oThkGKF@vPqpCu*|ScV|p3#&=`uIzp{`m
zk}%i*_~gd7{&mxbt0{W<r>k>%gj~6Z0~?P-mX)$Tg13l`o6^b|0k14NYZ<<t7evT2
zrhMw8PD}KW0`G_z<YERTr5Xb)_s-Q{9eMnY_t1ISytezPgnIqVD^}K$#~@zM13=U1
z4T8+xJP^sJM`0a*OvC0dJjIYsbS%nvZ-Iiv2YUh?i{-}GLP5SqLBn|bEIS<4r+xm?
z$4~Fu_|X4#UV&cxQzUi?=;^_ed?4_W7m=aArp^~T0T0Wg3ACpf1drv8gKXE(0=iSV
zHy55M=I)9NdcAM!voAbwTLztGiH(DvXm-SOQx`g&3&y}kS`Y*-S4yi_n&mycLXfDH
z!+{02TavidG22MN7gPuZT(YW|MtE9~e&2l7lkXh)_{i!WdH;dS(WxOJKLpxv)=R2%
z64U}NQ>-b}g|UH7Nk+u37;`R<7#E(Bo{R74S=Jz(fW^x@&bc5}7Y&7ZqSzkqY29i9
zXJMf$IssAI>kkNRD!E$;B&Z|rKJ)TZPhPTGq@`P==)d8SDiVQR#d6FOLvMf|%gv$C
ziZ-pI2LpyQyIE&y3<P?#+h<CXDnTO8P>ouW5Vp-sV56}-xZbc@6%Jt8$6xy3{pTLJ
zd}GJ{e_L1Lv^9kD@GHu!Z_Z(7wM=K*LMp3+LWWChqAtbkbWO)LbihO0QeZ_|8LO<v
zC@YM)Ih4SFy0AuCr|!~exTTm9Xu%P4Twbp;gk5J>Mlqlju#R4Q|5>lReeOCs5!ZdV
za;DpaykYw**z@7y@~TEfrO-Y0mRqOi%(XpQj4jen1k!1AZnRrm$~mJob!G81P-ES@
zbIZZ^9$=&Gj3h_V2;n=(PZY2?xOuFp(VLHJUBj@=Ah4V)+R}_An(z#h(G(_hHA8D)
z!ee=z?u;!gST?Lci#%}fpYNRZ(3u-&%iH@_z8F~Kq;G#8waWt6QXR0%y#j!tCSWck
zTZX+ORjkougr^-GC90Gsd+Mfx(4RZvB!oyGYoznECu<|r{DFQv#mf&R2tL-gdjSeO
z>+bEJe|T^MVpN=sLD%63IZqLV7s;Z;A=`1D5^Y?I2wFb*h%Hsh25h5=qO>>ctbRE{
zB<LNMD9aj~+lh^;mL1XS;z0@!l(*b`{NdBy|Lvi_uQql6lilbFi6Z&8YRc@d#>wii
z8LL2Xu|ksFmUAZ>hz^q7s+WPE+d+tVVAm^uyzq%H^XN#vUR%{C?jZCN?^R~Q?kUeN
z<YPNxMk4FT*Gx?{jWd<imWFJ&hF7N3Ws*j-Fwu!#&{8rRDJ6$cu}|_$A)C+g#RZLt
zeKs)~>}HFAkj(aooghvcU-$)u@t&7IfBe;dJ@NK;(f|AiDnY^L{t)@P3EH$!RUEb|
ztqvKdCmZJz8qt7g)6g_wk2caYibMm4RF>c-Vp=c^PG?G*ftJ5$E}RvTHAy1pq9np(
zQBPVi?5Hfu9jjA=5;o)HN=yKYUHj@APd<Cv)u={t(^`rDE%ZNsf&A-l767ljL4N|#
z6pFb?+My-r19Ew*ST3uGI7YwfBR5%sdV)|S`NPpMub~#unY~Udn{-;rVrR^2pP(<Z
z)3$zb-_tiAST#PqdX;t7A;}|iRaW6Qs~f_SgxLzY3w2C!n6@+AMSZU(v0>@SLNHsO
zhYJCMabnU$c*PQUh~d4QCC<(9`vNet+wZya$epj=y-H_ad(n5%iB%wjSD%6MDwz7H
zWx;9_L@vct%@93^+Z5*;b5)0lhjqpIvW|;8Y0atGbe~qAP>mfYfiB8-1~DpAhiyVU
zJ8$^qZdy8R$^jy`<(z$cPCR+<i5q1Yu06Scj!zAF_(nj#)mXLP=9vdDkzhL;C3iK&
zbc-IKYV~?s3vBV!Joysis%J+SsXsH8EJ&(WG!!M~8^Z;M46e51@t$4Z{9(`IUw(+@
z$2YHCctTsX-er=|f8ZgCbAJWk4cXwwmzo{G;b=yKhoiz2m>~|u6OVVh1t@<O3)#eW
zqOUFLHrzo{CLPz6v2IV(w&)E(BF^v^@~*~MnwL2GgRC|J9M8+nKV|>%JNE8dO~@Db
ztX}8;2len~s;pU;P4TFJ+J{;6nY1V^w?o~c4)OS7Q3l00(KxfYa+~Bek|r1?O*4wm
zC{4<eWb5a-^bnNK=^%AP8l0Q6Fl4(g+V;tj7p`0V$&qgf(a9+yhb{rrHnrAc<Y(rb
zWw5OUVkaRrnG9@rrdyFsk``%3xgkM({OYLhu?^)ly9iqtmr4eiuENJs-1s3E=Hs$c
zzWnsa-h(K3v3c#0%ni!*kAJo@sRYNS6v`1)w0bzAVM%Xi+jc}l92*S&K~KfYm^)EP
zxRV=G%~nb`uj=a%tx`-dgcuMEF2wmc!j1A_VQo3}trxcMyZPnS$A7tVGddef<kJ%t
z>a2656N2?cl8E?)vz|@wz%zJt%%qcb*fKO4El$;`)M<8#qcH&Y&xI)$M8!f>%U#Sp
zKC4&npZG_NXpo*!=%*dC9wLNKUpwhff4<<R|3Q0l$%`J<`hRXdjE+?ZdFq^=IveWg
z_1F?uqva$-$gGvARdptQ%x~2t-Q}20tD3jWsStahw+Jep6hqMur5m~y(W%yqu{w#l
zuxu(NjR1$9=q(nDHm)Mn#<&yz0tirhzCQjh-~8)>6&cs;yc7M)&B)+}t3l9@F#U9l
ztCG=nU20Q+>*|nQ@XD=X5n;{NYHIC{w$r8Q&Rrz6Mc0v44LWzc)s4Uda?dRvT(jkj
z_cu_%+NM>ktVgyXpTIV$X4M_97vBw#v#ccz?CbItmd<LTsCk}9ueG4p4cuD6Iczn}
zB1KA@D0JEQ^29*X$i+|_)(Ua>z8mj+;eo?<ZSdfp+`d=2esO%oOr#@s;C=ylt`R@u
zZiLlSJ|r=M)k3Z&;98_@k82uk8Z2Hu1%q!So&JfIz+!S5{<0`19rcVOH95=ki^@}9
zdZ31X*?#f~AK$!d`zl2JMSle{9D{stO$V|OVrf%P&#KerCX_saONpE<&SaQegc`TY
zTu@IF!Kb1@zd*0^(#;&1fgFktnnLPS9280a|CYWx+^(w38%FWdd|aJxbQEN+b9(Q+
z_kK_BZJ*wI@8=jGPAD>xpaRlDQ-%q_Q1ug}h%wYq0uvL2L=l1{A%yNAGw<HlfAc)q
zcb~o9wbomH#VsZCd*HIfoD^9BmmyXes8AF2pZsFS^+z7N9K#qcC4aw|zNUt3la{go
z@6<-r$_q@jR@UmuWSou%)IB@`gS_dG_VrpJU*RHpA^$nObH|^yUyV5@ygYKDp^8T|
zDv$|cNtO15D;Qpiy9O1RM;cJ7-j+)`Uy+jGsu-B1v`Ac3F4pCJIRdbX<G=mw2lwvT
zjmck4j#tnJ{XfJ#KCI4B?QHu<=}@e+_DFkKFNbq!p)=HC>6X%|FzO_*Jx(1>C<XNK
z>6`93ef$6H2%yotbvw8>erX*;*mjVg!~i|2;mi~?FSVx1rGqgXeN6IDEnSOU=i5jd
zH{_^DU=un7-JCB|u(!rV8eL;xOF&#cAFCufK#zL#ol{R8J^axt+pvu<lK!)1y-)lC
z`lc@A<Q+5+4-<_06vQ~-WpKV|AuMN&tdrt+=&}pNP|sYl^Z7FeuDlR{nCGsYf5W|+
z^&frx?}L3R65#BDD5Vbh4yC87=}Pi6?nrJEvWk&@NojZVtbR&sl@}_J3^kh=Q!JEp
zRY%l-q)#YRv}<Ffm6fWIO?Dl;;*k$-KKTiT`yd0!0$y#2sJG;`IcHxM(fhnjuQQ!U
zGg|anCS&I~J8CdQ7PiZ5qOH2YC9jAHQb{yVEvWtI!Whvv+E&8Mi*KnG6>U;DKvJZ6
zl4P<%Tk+7TOFnq#!+jWxxp574U#ubim$$)3ZpM1XP$oVlu^28wqf~Vy301y$GO<q8
zRvU+{vXpT-hPg72%wqnDD=tYQ4QWD4jbtYCgb^<6LvP-_|JM6I-&DXnvlFZPmI&!-
zk2a^H%Il;Q8E6!egn2d5P^wk^AWg~G@H`tkVzLziOpDGQS(Z#8PJ6DH5>+Z&$xmbB
zqeh}DS#-e|@#nw#@9Qr;a^x*o!gJTOPZqW7$nWEuQUL~}^y(Zc)`XxQ_cBIpXGvmi
zE9V)3V`(l^f?hg8(-X)xidUVM%*GKSy*yG%qyx|+&RGU53Caul^ucS69e4!eOkQ|C
z=0B=KcG5w_%!m&)ENWig7cUe5uclmaW%6!$=pE|ud>H3N)7ApsKl3ao24k3MvHPbT
zsl|v#7)<hrq*{3$UM3k@Hb1@m`G+1nycJGsaDl%Rlaa_EFMR6)b?$<cLg+DR%$~7J
z;&120NF_FKkv1}v&ICYX$L~3L;O-y4vqFFK!L55W>+hBRX%kX%He%G>tp?Aj60ON8
zHc}R5v%CbkehWQ7l&=Ia7P0|kPCZ@hNX*&oSfAEP>U!#)Moyc$I*X<#;LgAy@Qa__
zfAHR4-FYi^VO@9<oBiMr(wAV08m<)l{$(39`O;H|zFTZoSxdFBFO?-N))bc>3xtee
zPED(|YmG}j!O+c?yCrsLMjklj!?2ZZF_A5Ur7}#g*8_|8fFh9xibItFYS1gU9e!ln
z&ChT4!Z|cddy$45-wjQETh?c<;3e}IGvVr6crCRKzYwj=#3UgrWDsIjc`7>a;)uRd
zPdSU%Q`&-)%$z6bS(Uq9)DpX4pHL`nC^c#zdi?x>)1UqD-ivkU7r*5YwxO8FdEXX8
ztIBR|8w{@G!nKhMj-q&>N|3`BY?g@KXXlg~PIG11rOb_skT^;#g))PjijGtJwJSVc
zI%yMK;>=1?pFp(V^2^<i{pcwyiTuKyee^K-4x;#a3zbS`*O=xMp^_{?V#Dp)RvmKQ
z!S<Dm25{w=&viX2%^d8-^^nsm6OmrqWSkBLem4bVAc>=FKV9?I3KVCbDbBkTQwc!M
z9^LW!`~Uv^PqA{MF8FWsbQmE2I)_S|?Ilng+9<y2Wkwu+rQgGBuqz|zw)06MmT5c>
zEK7!Df$U(Ba)wnBj<Qd$`{42YuWw>d{wlysZkEV5J^}2|w~DK!jzh!?&2pu&Z;Eh9
z8<0%ZAPTQ}_SO3jy#2;q*w*__R<2rK?T~JU;n$FpLI8{K2xGdam>Mqx?Y!OwcC}@$
zrq+r=$JaZZB((O{&}7u{Ih;a@-$_uzP6&e!9)9PAZSNkz>`ILSOzIhjBrR*&+{RG1
zvN5NC#9!%q=D`MO=2*sXQ6}&`s2-9lWup!zLDN($!A)`L_EIchSiLP#DxebSGm{>u
z=V`|^?|hiTiBapK0}owx^QUjTbO{#XSMR`NROQHHUxZVMU6~C`iA7sv(<O97xzb>$
zR&^smK`g3xqE50aUkQwsOIbkX&KtNu@PG8Jt8TmHp&Nl-a?YCIs~A`&g^Z{jXr36w
zAjv-rOH#a^Q&KYYMq#&JZDL5g9br2-OtC8|TAL4kDY~+TnyEuiYu97Hd1%LF*JD;M
z%>5Wfn}WP@-+yUx$|cK`STe{ed9IkL_+TQP@@4Up4n9O71Pf6~Tk1;VjnJHDMvb!=
zB@~*`(rQ=SLQ)#hwYufsx4yjN43?jL&vO^r;L#ycJ&fmcnT?@M*~x2zL1^QJ1{Sy1
z83VOdLz0pxtY%OE;<KJyQeKdh8I=ra<u=bF*2HjH_66!9@k$4+$e-`}{dJ#T^b|A*
zwyd$fMAocx8h=O2oN2;51v(a8Ny#{9^0E;sTT3uj@p<ZW!EKW~QmfbOrA6Z_S%KI0
zlPCJFkWEdg#Zk6IGqwfreE1}HAO85*r!PMI18k+v`yxg^q9DZcp#LD?x!pc(1&Olx
zcw9oA7+E89McvqyXTyd3GHC&Av`irt(gq?c99cE4OH9z8x?|rXyRW(DGmJlR;CEj}
zcPIyWB!0Ilcfqoe6t&8vY1~t_8Oe!}v@3(6(NLdPA&Wn8<Ix9?eRLt3j)E2Kr?+U<
zzfr~H5K0K{T~Pi}isF$z)m{vHk|vL$A1K9KgoUD^;oCb>@*<QNWrxCwv)pblGi0*0
z=cS1WeQ-sKT9sxyoEy8}KJw(BpZX3OMBio`H*@xLUxMmGIKjIbrgTlw0l&alSyl;a
zxvgoYCh4l`PKr7fw^Ny<DVb$+lnHRPty07!3}lb~?CBF9K71HZt>>)$S$h&~+B6W>
zR!9$AGKpkH?Wu)+Qq1a0h+1Aj$tXxgYJD}!Zg=D&5nHd3V~~TapqtYPIf>1NA+K~f
zW5@=jQtVe~I(&;>wlK|Xz9b24t%sif+rHN>KDjyiec;75`a!8koCqy5H9el7tyGM;
zoGT?MTe6y^(JC4g*6cjQkhJU~UwNF6v2glAf$fGQv}0IyDoIAz)e=sbHUa#I2QEJK
z$^F-Dnhbt^J|-GbMa~?A6HZrD8U?tN*}=ez>fC0$P?jw+5i8%`APM>te+QpZu_-R@
zLSW#pLUJOJ<;^=1T#ivqpO|JFUSDLg^~`gBeDSi6e~21JoU``-E0~JJKOz@zhmcjL
z1CofMsxe#Ryeghz6w^e2UTe<-HGHX)wwlO8-p1V7)tOq0p&JOVX13BZ)5oXnNUkm;
z0&V*C{U5)0*W;U%r+co(^!Ls}_G|@qUXsyk1Fl-!cV)oUw8o?A^2U)puM{VYRWePd
zmkwk|kzOnM71aJ@Ib@6y{A@)}uUjJVC2<8hq1rr2#I`R&%T7|?)=P`>u6=|=2lWjp
z2h#3cr{DbShKnBDBym2W#Y_^6NM`2=b&jtr#pInqg)d~)JRA0q#3-w<3Vm0pDXR>X
z?ut_FqtHr=fsroF`5GoI9#liG{N&d!UGdn*1N0Nk{O@m0gb&}|00ky!@yUAtZ0`>9
z1`mH~bh^z(Gr`51O>C2r*k}|PMyyn;=Tk{x6W{mKyY}30?_V&2<?^dbG)BIGoUObL
zdXWM%BC-~M-U&|96GF<A^y}DcMYE7h^eOBbOHfaU19aRBA-4R$WclOCOK$k#sSD8e
zdFcNhMz@I`3BTUf<_PX&FV;lx+;MmuuD2QHXpQJo)tQO}2u!I<F(nfq98Vm-Y2R&6
ze7-3;IQ;gj=>I1oxBdiBXH0dV>Qv8pc209*pV~|~aJY{wrL$3&w@7R-92thy=`OXQ
z#VN4Dk$1!QUpw=cW1EqA?>m?wRSWr-+o2yp<Bgc4>?kLoM0+vTGPooeWE%f$AghZE
zu6m17TpH^IExC+#oF07q)dzoh73Nm+;0FoxZ3M{VP!Y^ZdSV@*wvFC#P%g%IWv+nO
zBK5Nq6&OD(<8DY?R_0JoFp6vh8+Lj)?`kN-f(FM}j765kpm}IVW@&;m7t^bo^@UcD
zjx%|DxT>z-ckL5z?R{qRp8xz!?D&F=cHc9aTq=>8DMfq&)H^lyD1&2UdIP}Mn5`pY
z+$0L~rVhEeQPQxP^`d5G@#XA1O3K{y5yi5Au^mRbRAD=dC<R7Cu_8!P9XL~(CuEOm
z%!!y65KL8&O#kiu<1f5>(`Ms$@5LAnxP|b)0d!bqIou|5fa#wiYb>0mf5kQ1^E_*z
zVr3vat4&C%K=V5Ya#i*?q&?d&zv8|74jo6Y?k#JtJ_R%Iuh@cUM129-e-TiN`KcL;
zo99xrUAQJR{=TFGW_(P#J!lXrf+}=6JoY-3L|v?Eh`1K3(Gbuv$B(}GAFuq|16cjD
z?JHSyC71|trvYY3g;)r<LY}^tC>)b#X1sOU7!v~(-z;KO8e3Ld(`?ktz{agpkZFxj
zG(7*yXP&$4**~GC5ReaCcs{yk^hjBf)8<l|snyEiw@E>qP2|bOtMqh)N^wZSRJ8)^
zA=26^T)ud-MBo}(a*c#2oR2!C8}?=|*VeU%<`GXzx8r&2O3r4Ea!LNGgPtn}#@4<r
zlLXNeD42KObj5p5{`GB4*Ise|9`sM2g*=UKLM>{@3xwuSyV4>9CzVGTlmuymbR?o{
z1I7qKpnJJZE?G8Eb93Bi(?e)Q8Qc`jnp|$U>AkK%2A}=s+b-R<{nq_3x!ke_=v?i(
z<yMSxsX-`p02b?UxMXMGNz*jusJc*dx(qlPR4yS7!Lfk;e3$2MMd*H@6)lErx+loC
z){^#_WX@IDT`jv`MD)S#zT?F|{M-FIPi~_9r|(;}>;L>ZHl#lfx!;RwFie9DUT_k2
zrkv_f+F}?@Ln&p7w5*!S-FS#vm5MCc0f%f67v?QJI-1^p<1b%$@q;HV=sSlZcrg0?
z=D(tA>p`}E4L~+dkz|-3hKThBWi|?DDLPr+Rq1nVp{zK8*n|@2BpSkNa&-+;9^+QY
z(lj}t9A$b@5Oct1rY69Kxt9wTnE>XA2sGbL@44vK4?o&zMgLl_dbwtO=-fc#(uXAS
zQ^*GA(Z*O)qu@NkWrk@g4sjYKMd4pX3oD;!>GcPUxkW9M@#O%o(INKH;`Yvc2lu>m
zPach=@4bo{03{H$641<|nKzWPM}-27yhB)J9BQj&s?`AhSv6pXI{cDKJ`WQbIN;;D
z1$Oc*$%}?fFz3AHu}ANI`O<BlVO!_>mxHig<@_@GLB5XsVGkVYbc;E#k<_t$!3vQM
z@aBGb-imSPdf8$whZ~_^v@tBPRk6SZsPplYM}EEM)N3DNan7+|eUtN$;%}jOCZO=B
z3%AH>4pdbnr7J_xvP6AVT1{*A3DQhZ9N{3tx}ZH^Zs_`2dN3y=L5h0Ei`(}c+xajU
zKY+@w!meHa^gc|ajf$+FbtBA(&AlZjCg9~)!NL#;_xm0R%{H$uR&riN5O3L)9j$jP
z%qS;{#GqzMkuzKYKwVEib=%gDU%3qe;GDI;-HaJIc983z1z;gDHdqbpwk4els*-BT
zJl&dc*`UH7i!*2hYkWwZEr*k%FI@ZM9alWN7aA~I)*j!R)T|%%V@ujVj+D*@G`-4S
z$joBpxX@>glFFbIX_9MnvusePr)zlA4FWv{jiRG}I`hz5H~by5b?}Rr|BwMW_A^Mv
zh&Y3*H4v)_!i7NF_W8NG4$m3$*z7Wj!EGK2eY_%cXP)1E^AAqEaoMIS%-+wEXi)tl
z^7OL~Xd7yWnt^T+OL)U>?;J-ac_+kBtJ_MdDrqiV7EuXF?T{i4L;Yv2yythvx9!-J
z47qY26@7>d2@ipG&mE1-QXeBz#<#)?Cp8<1s2x7(imw`RJ(WQxJTl@&#gUIgvUx%-
zP~e5b{KbP;-*@%x4`Yk}*XJ>3fiEC;+TfeeIpB3QF3`0go!;ZgQc)*wo*{EBw30oa
zYSr<)p3atYSe7^l@YmkB=%tgl{}@FdZCTUUK|t!Zmye+Fs7J1EgC>U7Bwn~j>ZH!G
zYP7p<yxkLwmT;~1oK5D>`aQ!U%pkclx<TIW8`_5PfM;dMO54?B$c)!_m>4Gh&rklx
zsXLy-sE{ZA0w=)k{TR~;hcLqcP@y~g6>h38a!o8`zb`ZQ@)_)g(?w6MNYM@n%ro>g
z@<z-Tox#C=<GT;-JoV|Do7#9+T!5i)m&jdaU<>h@8hd_j_GKNwwWjl8N`pNfTk=W?
z&oJfXOVu4lj#uQcsbjfm=%Eq3fc^Vq|L(hA`P~~ByTJ5KI=UL?BX6Amhy@dGT7V0g
zkW$2ZgbRkoyy~+>`m8o4m-wB)yYQ2utwPbyhNe6pGOJ@(Z`*bGuhA=g%i1fPymo#1
zdqCNsf~47_aO!aKfFSWL4O+6ns8bX(R@Z`KRK`-yQeCO@QVJn(_Lk4>IEuuRGIHu*
z+40!^t6uoQ6JJ5M%x%B3psT?^f(8>*IJI$*lchWRhC-ImS|N=@eqr4p&1vj9NMBEj
zbX-YU$A@~U292sT2{Y+}o~sv+)kUDE!2aHS)7D@A@vj&=;loF9=ySh`G|vTdQI&NW
z#Z&X08l|m{8y1=Tl%WXCtHvJ97VHE=3va@gQq=^}SuaHQj@8qOqD-mvW3gncFaemw
zi61|D=8q3txH(t<f%pQn)>%h7X`qLl-)k&8YU8-%0|s)sH><kpp@v70z>g=7UUKll
zyMD9l3P9&=S?gZF)2{#N>Fwx+i9@^@$R~-7t~Q1+G<3l7X=K5Xa8asocm{`UmF6ub
zs%+OCfhqHquWsG>`=j4$pq;n_$G@*$|EX@98Y6erkOP;!1(-#US)B7HR7RdORnaS8
z@ex~0^<1`S*~$<otdW15tK;h%%@VCEl9hs{7R}DxkPPV}p?#^BkwA3VVlvNdaXYNc
zw(EZS?tdQIi>Xe1?VTvP$Qq=40;-|Fz-e=Irir;jMTkY3dY98hY9^UF-l~^w7Sk(I
zOs-ypMplM3mSyN`rnr2rDK|3eDoeJpQ~(J?wZN%8rg4Zeu@G$HrqD%3NA-sv-}~CZ
zA7R}1RBsQuV&6g3gzp0Jbvz5SRU5W;)HrOKY7|DFRLS-f3K;lHJtCRQK`v1B^FW-Q
zq&HGNs|{|aOd%XJAsNA>E1bk36+M09iA(<S(J?F>q<3ONsx%Tg0611>F3-{0QlzRY
z-g4vHG)1J`^XlxGN*v??UCs(QUCHNaI_1a{<B>sW%-GhI*-?o`PBaxV6`c~-t+ZrJ
zvs>z%!?17bGap@a=(+o@CZO^B#&@y#fdENeA%<Tu^7q(<gwtlXr!0v$hpXlaWATX8
z(eY%G;wav_g1L^1qm(GktxS=Y=rlVvy0snx3s|LS+7`mme(>7&Ub*(!OE-((yEdli
zHxeP=>h48_)<;=Rf1wst!ud+S)iQENIKjd`BlRfC4Z%|C&iGeDu3YSJ=|cIuU(1+0
zdg#>4FF*0&o_|1J^(*gT=TsPBD*(4nmWmkGc~aTPbO|+$hzjmw!eKU8Nc5#TU5V!~
zsESgj4a&bi{Or<WZ$FHp$<JB4>Lk`uHX`o|W<c$*RuY=3$?aGwsPS4W>vsF|${E>f
zNx7nn_*k~ejO8`DiqY!;;oy$Tw_bnm;jKrp=aetRk}wYP244$jvTqbxOhI3OV33K@
z%DS&bA<(AX;Lyakb?jtyoH&|iA#)T~?SqkjkZe-56o`#RN}r0B6Gk}o554~E?jwIY
zi8Z-cVFkMBe24}Cgm12_rPKM;mfAZ{8a)9>ke7*ag`w7#N#d|2G3gERefL7rj}hm}
zY+gYV;bXZ4@E;LERmbi~M}1<|T}w0TJq96PZ^q-!89r2>%p5DF*eMv4%5^f-ZkN3A
z_A|fQ^&Cu<&RN@X8k<)a5#x{0S~M_dw0mZLqHW>y`0Wg1M$>rQ_EdCfkdI21c_xE6
zGfNs3;7exM9#35NUt4c~^~>mU_TmWW&-e#~_}*6`{~0r;8=<(W!4L~OUY2}dx4Q&>
z0}d?F<k=P}3QBakdVOjk8`~goDG87L0M|MF$+dSM*mq!tKJLvmtc_?vZbQXcgoF^I
z84c>=OG*+M<Z4cun`mohSMV=(XwA|VICia;UFy4_5vppk^nDfuM&|dOdid(A-am!j
z_gmIJEq_zHe)7%#gU07s$ZvXgqDq-T=YoOTm@QIBX^gAU*}OctohymtArVa*H}%*K
z5zA*R<yF81cgN=}MNDh8&OE&))bod)*t&h!?b|SX{0;vC^zu8-e&z7TkALaev){Vo
a5zQ~Yc-Lbe-g(X?UuGXa_pH<Bp8da$`sG^y

literal 0
HcmV?d00001

diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
new file mode 100644
index 0000000..d6f0d14
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
@@ -0,0 +1,534 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_1.proto";
+import "datasets/google_message3/benchmark_message3_2.proto";
+import "datasets/google_message3/benchmark_message3_3.proto";
+import "datasets/google_message3/benchmark_message3_4.proto";
+import "datasets/google_message3/benchmark_message3_5.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message GoogleMessage3 {
+  optional .benchmarks.google_message3.Message37487 field37519 = 2;
+  optional .benchmarks.google_message3.Message36876 field37520 = 3;
+  optional .benchmarks.google_message3.Message13062 field37521 = 4;
+  optional .benchmarks.google_message3.Message952 field37522 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37523 = 6;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37524 = 7;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37525 = 8;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37526 = 9;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37527 = 10;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37528 = 11;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37529 = 12;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37530 = 13;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37531 = 14;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37532 = 15;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37533 = 16;
+}
+
+message Message1327 {
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field1369 = 1;
+  repeated .benchmarks.google_message3.Message1328 field1370 = 3;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field1371 = 5;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field1372 = 6;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message1327 field1373 = 23104162;
+  }
+}
+
+message Message3672 {
+  optional .benchmarks.google_message3.Enum3476 field3727 = 1;
+  optional int32 field3728 = 11;
+  optional int32 field3729 = 2;
+  repeated group Message3673 = 3 {
+    required .benchmarks.google_message3.Enum3476 field3738 = 4;
+    required int32 field3739 = 5;
+  }
+  repeated group Message3674 = 6 {
+    required .benchmarks.google_message3.Enum3476 field3740 = 7;
+    required int32 field3741 = 8;
+  }
+  optional bool field3732 = 9;
+  optional int32 field3733 = 10;
+  optional .benchmarks.google_message3.Enum3476 field3734 = 20;
+  optional int32 field3735 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field3736 = 50;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message3672 field3737 = 3144435;
+  }
+}
+
+message Message3804 {
+  required int64 field3818 = 1;
+  required bool field3819 = 2;
+  repeated .benchmarks.google_message3.Enum3805 field3820 = 4;
+  optional int32 field3821 = 5;
+  optional bool field3822 = 6;
+  optional int64 field3823 = 7;
+  optional .benchmarks.google_message3.Enum3783 field3824 = 8;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message3804 field3825 = 59241828;
+  }
+}
+
+message Message6849 {
+  repeated .benchmarks.google_message3.Message6850 field6910 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message6849 field6911 = 107558455;
+  }
+}
+
+message Message6866 {
+  repeated .benchmarks.google_message3.Message6863 field6973 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message6866 field6974 = 22259060;
+  }
+}
+
+message Message6870 {
+  repeated .benchmarks.google_message3.Message6871 field6991 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message6870 field6992 = 90034652;
+  }
+}
+
+message Message7651 {
+  optional string field7685 = 1;
+  optional int64 field7686 = 2;
+  optional int64 field7687 = 3;
+  optional int64 field7688 = 4;
+  optional int32 field7689 = 5;
+  optional int32 field7690 = 6;
+  optional int32 field7691 = 7;
+  optional int32 field7692 = 8;
+  optional int32 field7693 = 9;
+  optional int32 field7694 = 10;
+  optional int32 field7695 = 11;
+  optional int32 field7696 = 12;
+  optional int32 field7697 = 13;
+  optional int32 field7698 = 14;
+  optional int32 field7699 = 15;
+  optional int32 field7700 = 16;
+  optional int32 field7701 = 17;
+  optional int32 field7702 = 18;
+  optional bool field7703 = 19;
+  repeated int32 field7704 = 20;
+  repeated int32 field7705 = 21;
+  repeated string field7706 = 22;
+  repeated string field7707 = 23;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field7708 = 24;
+  optional int32 field7709 = 25;
+  optional int32 field7710 = 26;
+  optional int32 field7711 = 27;
+  optional int32 field7712 = 43;
+  optional int32 field7713 = 28;
+  optional int32 field7714 = 29;
+  repeated .benchmarks.google_message3.Message7547 field7715 = 30;
+  repeated .benchmarks.google_message3.Message7547 field7716 = 31;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field7717 = 32;
+  repeated string field7718 = 33;
+  repeated string field7719 = 34;
+  repeated .benchmarks.google_message3.Message7648 field7720 = 35;
+  optional bool field7721 = 36;
+  optional bool field7722 = 37;
+  optional bool field7723 = 38;
+  optional bool field7724 = 39;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field7725 = 40;
+  optional .benchmarks.google_message3.UnusedEnum field7726 = 41;
+  optional .benchmarks.google_message3.Enum7654 field7727 = 42;
+  optional string field7728 = 44;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field7729 = 45;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message7651 field7730 = 55876009;
+  }
+}
+
+message Message7864 {
+  optional string field7866 = 1;
+  optional string field7867 = 2;
+  repeated .benchmarks.google_message3.Message7865 field7868 = 5;
+  repeated .benchmarks.google_message3.Message7865 field7869 = 6;
+  repeated .benchmarks.google_message3.Message7865 field7870 = 7;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field7871 = 8;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message7864 field7872 = 44542730;
+  }
+}
+
+message Message7929 {
+  optional int64 field7942 = 1;
+  optional int64 field7943 = 4;
+  optional int64 field7944 = 5;
+  optional int64 field7945 = 12;
+  optional int64 field7946 = 13;
+  optional int64 field7947 = 18;
+  optional int64 field7948 = 6;
+  optional int64 field7949 = 7;
+  repeated .benchmarks.google_message3.Message7919 field7950 = 8;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field7951 = 20;
+  repeated .benchmarks.google_message3.Message7920 field7952 = 14;
+  repeated .benchmarks.google_message3.Message7921 field7953 = 15;
+  repeated .benchmarks.google_message3.Message7928 field7954 = 17;
+  optional int64 field7955 = 19;
+  optional bool field7956 = 2;
+  optional int64 field7957 = 3;
+  optional int64 field7958 = 9;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field7959 = 10;
+  repeated bytes field7960 = 11;
+  optional int64 field7961 = 16;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message7929 field7962 = 53392238;
+  }
+}
+
+message Message8508 {
+  repeated .benchmarks.google_message3.Message8511 field8517 = 8;
+  repeated .benchmarks.google_message3.Message8512 field8518 = 9;
+  repeated .benchmarks.google_message3.Message8513 field8519 = 11;
+  optional bool field8520 = 13;
+  optional .benchmarks.google_message3.Message8514 field8521 = 14;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8522 = 15;
+  repeated .benchmarks.google_message3.Message8515 field8523 = 16;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8524 = 17;
+  optional int64 field8525 = 1;
+  optional float field8526 = 2;
+  optional int64 field8527 = 3;
+  optional int64 field8528 = 4;
+  optional int32 field8529 = 5;
+  optional bytes field8530 = 6;
+  repeated bytes field8531 = 7;
+  optional bool field8532 = 10;
+  optional bytes field8533 = 12;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message8508 field8534 = 3811804;
+  }
+}
+
+message Message9122 {
+  optional float field9132 = 1;
+  optional float field9133 = 2;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message9122 field9134 = 120398939;
+  }
+}
+
+message Message10177 {
+  repeated .benchmarks.google_message3.Message10155 field10270 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message10177 field10271 = 26801105;
+  }
+}
+
+message Message10278 {
+  repeated int32 field10286 = 1 [packed = true];
+  repeated int32 field10287 = 2 [packed = true];
+  optional int32 field10288 = 3;
+  extend .benchmarks.google_message3.Message10155 {
+    optional .benchmarks.google_message3.Message10278 field10289 = 29374161;
+  }
+}
+
+message Message10323 {
+  repeated .benchmarks.google_message3.Message10320 field10360 = 1;
+  extend .benchmarks.google_message3.Message10155 {
+    optional .benchmarks.google_message3.Message10323 field10361 = 27922524;
+  }
+}
+
+message Message10324 {
+  repeated .benchmarks.google_message3.Message10322 field10362 = 1;
+  optional .benchmarks.google_message3.Message10321 field10363 = 2;
+  extend .benchmarks.google_message3.Message10155 {
+    optional .benchmarks.google_message3.Message10324 field10364 = 27832297;
+  }
+}
+
+message Message11990 {
+  repeated .benchmarks.google_message3.Message11988 field12030 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message11990 field12031 = 21265426;
+  }
+}
+
+message Message12691 {
+  optional string field12713 = 1;
+  optional int32 field12714 = 2;
+  optional .benchmarks.google_message3.Message12668 field12715 = 3;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message12691 field12716 = 28426536;
+  }
+}
+
+message Message12870 {
+  required int32 field12879 = 1;
+  optional int32 field12880 = 7;
+  required int32 field12881 = 2;
+  optional uint64 field12882 = 3;
+  optional string field12883 = 2001;
+  optional fixed64 field12884 = 4;
+  repeated fixed64 field12885 = 14;
+  optional int32 field12886 = 9;
+  optional int64 field12887 = 18;
+  repeated .benchmarks.google_message3.Message12870 field12888 = 8;
+  optional int32 field12889 = 5;
+  optional uint64 field12890 = 6;
+  optional int32 field12891 = 10;
+  optional int32 field12892 = 11;
+  optional double field12893 = 12;
+  optional .benchmarks.google_message3.Message12825 field12894 = 13;
+  optional double field12895 = 15;
+  optional string field12896 = 16;
+  optional .benchmarks.google_message3.Enum12871 field12897 = 17;
+  optional int32 field12898 = 19;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message12870 field12899 = 5447656;
+  }
+}
+
+message Message13154 {
+  required float field13164 = 1;
+  required float field13165 = 2;
+  extend .benchmarks.google_message3.Message13145 {
+    optional .benchmarks.google_message3.Message13154 field13166 = 47301086;
+  }
+}
+
+message Message16507 {
+  optional bool field16510 = 3;
+  optional bool field16511 = 4;
+  optional bool field16512 = 14;
+  repeated string field16513 = 5;
+  repeated string field16514 = 6;
+  optional string field16515 = 8;
+  repeated int32 field16516 = 9;
+  repeated int32 field16517 = 10;
+  optional int32 field16518 = 7;
+  optional string field16519 = 15;
+  repeated string field16520 = 11;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16521 = 27;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16522 = 22;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16523 = 28;
+  optional string field16524 = 18;
+  optional int32 field16525 = 19;
+  optional int32 field16526 = 20;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field16527 = 23;
+  optional bool field16528 = 24;
+  repeated string field16529 = 25;
+  optional double field16530 = 26;
+  optional .benchmarks.google_message3.Message16478 field16531 = 30;
+  optional bool field16532 = 31;
+  optional string field16533 = 32;
+  optional bool field16534 = 33;
+  optional bool field16535 = 35;
+  optional bool field16536 = 36;
+  optional bool field16537 = 37;
+  optional bool field16538 = 38;
+  optional bool field16539 = 39;
+  optional bool field16540 = 40;
+  repeated string field16541 = 41;
+  extensions 21 to 21;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message16507 field16542 = 5569941;
+  }
+}
+
+message Message16564 {
+  repeated .benchmarks.google_message3.Message16552 field16568 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message16564 field16569 = 25830030;
+  }
+}
+
+message Message16661 {
+  repeated .benchmarks.google_message3.Message16660 field16671 = 1;
+  repeated uint64 field16672 = 2;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message16661 field16673 = 31274398;
+  }
+}
+
+message Message16746 {
+  repeated .benchmarks.google_message3.Message16727 field16806 = 1;
+  optional bool field16807 = 2;
+  optional bool field16808 = 3;
+  repeated .benchmarks.google_message3.Message16725 field16809 = 4;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message16746 field16810 = 28406765;
+  }
+}
+
+message Message17786 {
+  repeated group Message17787 = 1 {
+    required int32 field18177 = 2;
+    required int32 field18178 = 3;
+    optional .benchmarks.google_message3.Message17783 field18179 = 4;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18180 = 5;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18181 = 6;
+    repeated .benchmarks.google_message3.UnusedEmptyMessage field18182 = 8;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18183 = 9;
+    optional .benchmarks.google_message3.Message17726 field18184 = 10;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18185 = 11;
+    optional .benchmarks.google_message3.Message16945 field18186 = 102;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18187 = 12;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18188 = 13;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18189 = 7;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18190 = 100;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18191 = 101;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18192 = 14;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18193 = 19;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18194 = 22;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18195 = 24;
+    optional .benchmarks.google_message3.Enum16925 field18196 = 21;
+    optional bool field18197 = 18;
+    repeated .benchmarks.google_message3.UnusedEnum field18198 = 23;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18199 = 15;
+    optional string field18200 = 16;
+    optional string field18201 = 17;
+    optional bool field18202 = 99;
+  }
+  repeated .benchmarks.google_message3.Message17782 field18175 = 20;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message17786 field18176 = 11823055;
+  }
+}
+
+message Message22857 {
+  repeated .benchmarks.google_message3.Message22853 field22874 = 1;
+  extend .benchmarks.google_message3.Message10155 {
+    optional .benchmarks.google_message3.Message22857 field22875 = 67799715;
+  }
+}
+
+message Message24404 {
+  repeated group Message24405 = 1 {
+    required int32 field24686 = 2;
+    required int32 field24687 = 3;
+    optional .benchmarks.google_message3.Message24317 field24688 = 4;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24689 = 5;
+    optional .benchmarks.google_message3.Message24376 field24690 = 6;
+    optional .benchmarks.google_message3.Message24345 field24691 = 7;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24692 = 8;
+    optional .benchmarks.google_message3.Message24379 field24693 = 9;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24694 = 10;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24695 = 11;
+    optional .benchmarks.google_message3.Message24391 field24696 = 12;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24697 = 13;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24698 = 14;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24699 = 22;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24700 = 23;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24701 = 25;
+    optional .benchmarks.google_message3.Enum16925 field24702 = 18;
+    optional float field24703 = 20;
+    optional bool field24704 = 19;
+    repeated .benchmarks.google_message3.Enum16891 field24705 = 24;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field24706 = 15;
+    optional string field24707 = 16;
+    optional string field24708 = 17;
+    optional float field24709 = 21;
+    optional bool field24710 = 26;
+    optional .benchmarks.google_message3.UnusedEnum field24711 = 27;
+    optional bool field24712 = 28;
+    optional .benchmarks.google_message3.UnusedEnum field24713 = 29;
+    optional bool field24714 = 31;
+    optional bool field24715 = 99;
+    optional int64 field24716 = 32;
+  }
+  optional .benchmarks.google_message3.Message24403 field24684 = 30;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message24404 field24685 = 9129287;
+  }
+}
+
+message Message27300 {
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field27302 = 1;
+  optional string field27303 = 2;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message27300 field27304 = 24956467;
+  }
+}
+
+message Message27453 {
+  optional string field27459 = 15;
+  repeated string field27460 = 1;
+  repeated float field27461 = 6;
+  repeated int32 field27462 = 27;
+  repeated int32 field27463 = 28;
+  repeated .benchmarks.google_message3.Message27454 field27464 = 24;
+  repeated string field27465 = 2;
+  repeated float field27466 = 7;
+  repeated string field27467 = 22;
+  repeated string field27468 = 23;
+  optional string field27469 = 26;
+  repeated .benchmarks.google_message3.Message27357 field27470 = 8;
+  optional .benchmarks.google_message3.Message27360 field27471 = 16;
+  optional string field27472 = 25;
+  optional string field27473 = 11;
+  optional bool field27474 = 13;
+  optional bool field27475 = 14;
+  optional bool field27476 = 17;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field27477 = 12;
+  optional bool field27478 = 34268945;
+  optional bool field27479 = 20;
+  optional string field27480 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field27481 = 10;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message27453 field27482 = 8086204;
+  }
+}
+
+extend .benchmarks.google_message3.Message16945 {
+  optional string field17026 = 472;
+  repeated string field17027 = 818;
+  optional .benchmarks.google_message3.Message0 field17031 = 215;
+  repeated .benchmarks.google_message3.Message0 field17032 = 292;
+  repeated .benchmarks.google_message3.Message0 field17038 = 234;
+  repeated .benchmarks.google_message3.Message0 field17039 = 235;
+  optional .benchmarks.google_message3.Message0 field17042 = 246;
+  optional string field17043 = 224;
+  optional string field17044 = 225;
+  repeated string field17048 = 63;
+  repeated string field17049 = 64;
+  repeated .benchmarks.google_message3.Message0 field17052 = 233;
+  repeated .benchmarks.google_message3.Message0 field17053 = 66;
+  repeated string field17056 = 275;
+  optional string field17057 = 226;
+  repeated .benchmarks.google_message3.Message0 field17060 = 27;
+  repeated string field17073 = 75;
+  repeated .benchmarks.google_message3.Message0 field17076 = 77;
+  repeated string field17078 = 296;
+  repeated .benchmarks.google_message3.Message0 field17082 = 160;
+  repeated .benchmarks.google_message3.Message0 field17091 = 585;
+  repeated .benchmarks.google_message3.Message0 field17098 = 987;
+  repeated .benchmarks.google_message3.Message0 field17101 = 157;
+  repeated string field17102 = 158;
+  repeated string field17107 = 166;
+  repeated string field17133 = 567;
+  repeated string field17134 = 572;
+  repeated string field17160 = 49;
+  repeated string field17168 = 32;
+  repeated string field17170 = 34;
+  repeated .benchmarks.google_message3.Message0 field17172 = 509;
+  repeated string field17174 = 39;
+  repeated .benchmarks.google_message3.Message0 field17175 = 40;
+  repeated .benchmarks.google_message3.Message0 field17178 = 511;
+  repeated .benchmarks.google_message3.Message0 field17185 = 50;
+  repeated int32 field17207 = 1081;
+  repeated .benchmarks.google_message3.Message0 field17238 = 184;
+  repeated .benchmarks.google_message3.Message0 field17289 = 177;
+  repeated .benchmarks.google_message3.Message0 field17290 = 178;
+  repeated .benchmarks.google_message3.Message0 field17296 = 474;
+  repeated string field17298 = 44;
+  repeated .benchmarks.google_message3.Message0 field17301 = 47;
+  optional .benchmarks.google_message3.Message0 field17412 = 21;
+  repeated .benchmarks.google_message3.Message0 field17438 = 132;
+  repeated .benchmarks.google_message3.Message0 field17458 = 512;
+  repeated string field17460 = 560;
+  repeated string field17466 = 552;
+  repeated .benchmarks.google_message3.Message0 field17617 = 1080;
+  repeated int32 field17618 = 1084;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
new file mode 100644
index 0000000..3219553
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
@@ -0,0 +1,1280 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_2.proto";
+import "datasets/google_message3/benchmark_message3_3.proto";
+import "datasets/google_message3/benchmark_message3_5.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message34390 {
+  repeated .benchmarks.google_message3.Message34387 field34452 = 1;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message34390 field34453 = 92144610;
+  }
+}
+
+message Message34624 {
+  optional .benchmarks.google_message3.Message34621 field34683 = 1;
+  optional .benchmarks.google_message3.Message34621 field34684 = 2;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message34624 field34685 = 18178548;
+  }
+}
+
+message Message34791 {
+  optional fixed64 field34793 = 1;
+  repeated group Message34792 = 2 {
+    required string field34808 = 3;
+    optional string field34809 = 4;
+  }
+  optional int32 field34795 = 5;
+  optional int32 field34796 = 6;
+  optional int32 field34797 = 7;
+  optional int32 field34798 = 8;
+  optional int32 field34799 = 9;
+  optional int32 field34800 = 10;
+  optional bool field34801 = 11;
+  optional float field34802 = 12;
+  optional int32 field34803 = 13;
+  optional string field34804 = 14;
+  optional int64 field34805 = 15;
+  repeated fixed64 field34806 = 17 [packed = true];
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message34791 field34807 = 6330340;
+  }
+}
+
+message Message35483 {
+  optional int32 field35499 = 1;
+  optional string field35500 = 2;
+  optional string field35501 = 3;
+  optional string field35502 = 4;
+  repeated .benchmarks.google_message3.Message35476 field35503 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field35504 = 6;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message35483 field35505 = 7913554;
+  }
+}
+
+message Message35807 {
+  optional int32 field35810 = 1;
+  optional int32 field35811 = 2;
+  optional int32 field35812 = 3;
+  optional int32 field35813 = 4;
+  optional int32 field35814 = 5;
+  optional int32 field35815 = 6;
+  optional int32 field35816 = 7;
+  optional int32 field35817 = 8;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message35807 field35818 = 3803299;
+  }
+}
+
+message Message37487 {
+  optional bytes field37501 = 2;
+  optional bool field37502 = 3;
+}
+
+message Message13062 {
+  optional int64 field13075 = 1;
+  optional string field13076 = 2;
+  optional int32 field13077 = 3;
+  optional string field13078 = 4;
+  optional int32 field13079 = 5;
+}
+
+message Message952 {
+  repeated .benchmarks.google_message3.Message949 field963 = 1;
+}
+
+message Message36876 {
+  optional .benchmarks.google_message3.Message2356 field36980 = 1;
+  repeated group Message36877 = 111 {
+    required string field37044 = 112;
+    optional int32 field37045 = 113;
+    optional bytes field37046 = 114;
+    optional int32 field37047 = 115;
+    optional int32 field37048 = 157;
+  }
+  repeated group Message36878 = 168 {
+  }
+  repeated group Message36879 = 55 {
+    required string field37050 = 56;
+    optional int32 field37051 = 69;
+  }
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field36984 = 78;
+  optional group Message36880 = 137 {
+  }
+  optional uint64 field36986 = 59;
+  optional bytes field36987 = 121;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field36988 = 2;
+  optional .benchmarks.google_message3.Message7029 field36989 = 118;
+  optional .benchmarks.google_message3.Message35573 field36990 = 11;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field36991 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field36992 = 22;
+  optional float field36993 = 13;
+  optional int32 field36994 = 20;
+  optional bool field36995 = 51;
+  optional bool field36996 = 57;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field36997 = 100;
+  optional int32 field36998 = 47;
+  optional int32 field36999 = 48;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37000 = 68;
+  repeated group Message36881 = 23 {
+  }
+  optional .benchmarks.google_message3.Message4144 field37002 = 125;
+  repeated group Message36882 = 35 {
+  }
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37004 = 49;
+  optional .benchmarks.google_message3.Message18921 field37005 = 52;
+  optional .benchmarks.google_message3.Message36858 field37006 = 46;
+  optional .benchmarks.google_message3.Message18831 field37007 = 54;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37008 = 58;
+  optional .benchmarks.google_message3.Message18283 field37009 = 10;
+  optional string field37010 = 44;
+  optional string field37011 = 103;
+  optional .benchmarks.google_message3.Message0 field37012 = 43;
+  optional .benchmarks.google_message3.Message0 field37013 = 143;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37014 = 53;
+  optional .benchmarks.google_message3.Message36869 field37015 = 15;
+  optional group Message36883 = 3 {
+  }
+  repeated group Message36884 = 16 {
+  }
+  repeated group Message36885 = 27 {
+  }
+  optional group Message36886 = 32 {
+  }
+  repeated .benchmarks.google_message3.UnusedEnum field37020 = 71;
+  repeated int32 field37021 = 70;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37022 = 66;
+  optional .benchmarks.google_message3.Message13090 field37023 = 67;
+  optional group Message36887 = 62 {
+  }
+  repeated .benchmarks.google_message3.Message10155 field37025 = 50;
+  repeated .benchmarks.google_message3.Message11874 field37026 = 151;
+  optional string field37027 = 12;
+  optional int64 field37028 = 72;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37029 = 73;
+  optional .benchmarks.google_message3.Message35546 field37030 = 108;
+  optional group Message36888 = 74 {
+    optional uint64 field37089 = 75;
+    optional bool field37090 = 76;
+    optional uint64 field37091 = 165;
+    optional double field37092 = 166;
+    optional uint64 field37093 = 109;
+    optional bytes field37094 = 122;
+  }
+  repeated .benchmarks.google_message3.Message19255 field37032 = 104;
+  optional .benchmarks.google_message3.Message33968 field37033 = 105;
+  optional bool field37034 = 106;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field37035 = 107;
+  optional .benchmarks.google_message3.Message6644 field37036 = 110;
+  optional bytes field37037 = 133;
+  optional group Message36889 = 116 {
+    optional int64 field37095 = 117;
+    optional string field37096 = 145;
+    optional int32 field37097 = 123;
+    optional bool field37098 = 163;
+    optional int32 field37099 = 164;
+    optional int32 field37100 = 149;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field37101 = 129;
+    optional .benchmarks.google_message3.Message13174 field37102 = 124;
+    optional .benchmarks.google_message3.Message13169 field37103 = 128;
+    optional uint64 field37104 = 132;
+    repeated .benchmarks.google_message3.Enum36890 field37105 = 131;
+    optional bool field37106 = 134;
+    optional bool field37107 = 140;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field37108 = 135;
+    optional float field37109 = 136;
+    optional float field37110 = 156;
+    optional bool field37111 = 142;
+    optional int64 field37112 = 167;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field37113 = 146;
+    optional bool field37114 = 148;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field37115 = 154;
+    optional .benchmarks.google_message3.UnusedEnum field37116 = 158;
+    repeated .benchmarks.google_message3.UnusedEnum field37117 = 159;
+    optional int32 field37118 = 160;
+    repeated string field37119 = 161;
+  }
+  repeated group Message36910 = 119 {
+  }
+  optional group Message36911 = 126 {
+    optional .benchmarks.google_message3.UnusedEmptyMessage field37121 = 127;
+    optional .benchmarks.google_message3.Message35538 field37122 = 130;
+    optional .benchmarks.google_message3.Message35540 field37123 = 144;
+    optional .benchmarks.google_message3.Message35542 field37124 = 150;
+  }
+  optional group Message36912 = 152 {
+    optional .benchmarks.google_message3.Message3901 field37125 = 153;
+    optional .benchmarks.google_message3.Message3901 field37126 = 162;
+  }
+  optional .benchmarks.google_message3.UnusedEmptyMessage field37042 = 155;
+}
+
+message Message1328 {
+}
+
+message Message6850 {
+}
+
+message Message6863 {
+  optional .benchmarks.google_message3.Enum6858 field6931 = 1;
+  optional .benchmarks.google_message3.Enum6858 field6932 = 2;
+  optional .benchmarks.google_message3.UnusedEnum field6933 = 36;
+  optional bool field6934 = 27;
+  optional .benchmarks.google_message3.Message6773 field6935 = 26;
+  optional int32 field6936 = 30;
+  optional int32 field6937 = 37;
+  optional .benchmarks.google_message3.Enum6815 field6938 = 31;
+  optional string field6939 = 3;
+  optional int32 field6940 = 4;
+  optional .benchmarks.google_message3.Enum6822 field6941 = 15;
+  optional bool field6942 = 10;
+  optional bool field6943 = 17;
+  optional float field6944 = 18;
+  optional float field6945 = 19;
+  optional int32 field6946 = 5;
+  optional int32 field6947 = 6;
+  optional bool field6948 = 7;
+  optional int32 field6949 = 12;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6950 = 8;
+  optional uint64 field6951 = 9;
+  optional string field6952 = 11;
+  optional bytes field6953 = 13;
+  optional int32 field6954 = 14;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6955 = 16;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6956 = 22;
+  optional .benchmarks.google_message3.Message3886 field6957 = 38;
+  optional string field6958 = 20;
+  optional uint32 field6959 = 21;
+  optional .benchmarks.google_message3.Message6743 field6960 = 23;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6961 = 29;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6962 = 33;
+  optional bool field6963 = 34;
+}
+
+message Message6871 {
+}
+
+message Message7547 {
+  required bytes field7549 = 1;
+  required int32 field7550 = 2;
+}
+
+message Message7648 {
+  optional string field7669 = 1;
+  optional int32 field7670 = 2;
+  optional int32 field7671 = 3;
+  optional int32 field7672 = 4;
+  optional int32 field7673 = 5;
+  optional int32 field7674 = 6;
+  optional float field7675 = 7;
+  optional bool field7676 = 8;
+  optional bool field7677 = 9;
+  optional bool field7678 = 10;
+  optional bool field7679 = 11;
+  optional bool field7680 = 12;
+}
+
+message Message7865 {
+}
+
+message Message7928 {
+  optional string field7940 = 1;
+  optional int64 field7941 = 2;
+}
+
+message Message7919 {
+  optional fixed64 field7931 = 1;
+  optional int64 field7932 = 2;
+  optional bytes field7933 = 3;
+}
+
+message Message7920 {
+  optional int64 field7934 = 1;
+  optional int64 field7935 = 2;
+}
+
+message Message7921 {
+  optional int32 field7936 = 1;
+  optional int64 field7937 = 2;
+  optional float field7938 = 3;
+  optional .benchmarks.google_message3.UnusedEnum field7939 = 4;
+}
+
+message Message8511 {
+  optional .benchmarks.google_message3.Message8224 field8539 = 1;
+  optional string field8540 = 2;
+  optional bool field8541 = 3;
+  optional int64 field8542 = 4;
+  optional string field8543 = 5;
+}
+
+message Message8512 {
+  optional .benchmarks.google_message3.Message8301 field8544 = 1;
+  optional .benchmarks.google_message3.Message8302 field8545 = 2;
+  optional string field8546 = 3;
+  optional bool field8547 = 4;
+  optional int64 field8548 = 5;
+  optional string field8549 = 6;
+}
+
+message Message8513 {
+  repeated .benchmarks.google_message3.Message8392 field8550 = 1;
+  optional string field8551 = 2;
+  optional bool field8552 = 3;
+  optional string field8553 = 4;
+}
+
+message Message8514 {
+  optional string field8554 = 1;
+  optional int64 field8555 = 2;
+  optional bool field8556 = 3;
+  repeated .benchmarks.google_message3.Message8130 field8557 = 4;
+  optional string field8558 = 5;
+}
+
+message Message8515 {
+  optional .benchmarks.google_message3.Message8479 field8559 = 1;
+  optional .benchmarks.google_message3.Message8478 field8560 = 2;
+  optional string field8561 = 3;
+}
+
+message Message10320 {
+  optional .benchmarks.google_message3.Enum10335 field10347 = 1;
+  repeated .benchmarks.google_message3.Message10319 field10348 = 2;
+  optional int32 field10349 = 3;
+  optional int32 field10350 = 4;
+  optional int32 field10351 = 5;
+  optional int32 field10352 = 6;
+  optional .benchmarks.google_message3.Enum10337 field10353 = 7;
+}
+
+message Message10321 {
+  optional int32 field10354 = 1;
+  optional int32 field10355 = 2;
+  optional uint64 field10356 = 3;
+}
+
+message Message10322 {
+  optional .benchmarks.google_message3.Message4016 field10357 = 1;
+  optional bool field10358 = 2;
+  optional bool field10359 = 3;
+}
+
+message Message11988 {
+  optional string field12021 = 1;
+  optional string field12022 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field12023 = 3;
+  optional .benchmarks.google_message3.Message10155 field12024 = 4;
+}
+
+message Message12668 {
+  repeated .benchmarks.google_message3.Message12669 field12677 = 1;
+  optional int32 field12678 = 2;
+  optional int32 field12679 = 3;
+  optional int32 field12680 = 4;
+}
+
+message Message12825 {
+  repeated .benchmarks.google_message3.Message12818 field12862 = 1;
+  optional int32 field12863 = 2;
+  optional .benchmarks.google_message3.Message12819 field12864 = 3;
+  optional .benchmarks.google_message3.Message12820 field12865 = 4;
+  optional int32 field12866 = 5;
+  repeated .benchmarks.google_message3.Message12821 field12867 = 6;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field12868 = 7;
+}
+
+message Message16478 {
+  repeated .benchmarks.google_message3.Message16479 field16481 = 1;
+  optional bool field16482 = 3;
+  optional int32 field16483 = 2;
+}
+
+message Message16552 {
+  optional fixed64 field16565 = 1;
+  optional int32 field16566 = 2;
+  optional .benchmarks.google_message3.Enum16553 field16567 = 3;
+}
+
+message Message16660 {
+  optional string field16668 = 1;
+  optional string field16669 = 2;
+  optional int32 field16670 = 3;
+}
+
+message Message16727 {
+  required .benchmarks.google_message3.Enum16728 field16782 = 1;
+  required string field16783 = 2;
+  optional string field16784 = 3;
+  optional int32 field16785 = 23;
+  required string field16786 = 4;
+  optional string field16787 = 5;
+  optional string field16788 = 6;
+  required .benchmarks.google_message3.Enum16732 field16789 = 7;
+  optional string field16790 = 8;
+  optional string field16791 = 9;
+  optional string field16792 = 10;
+  optional .benchmarks.google_message3.Enum16738 field16793 = 11;
+  optional int32 field16794 = 12;
+  repeated .benchmarks.google_message3.Message16722 field16795 = 13;
+  optional bool field16796 = 19;
+  optional bool field16797 = 24;
+  optional string field16798 = 14;
+  optional int64 field16799 = 15;
+  optional bool field16800 = 16;
+  optional string field16801 = 17;
+  optional .benchmarks.google_message3.Enum16698 field16802 = 18;
+  optional .benchmarks.google_message3.Message16724 field16803 = 20;
+  optional bool field16804 = 22;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field16805 = 25;
+  extensions 1000 to 536870911;
+}
+
+message Message16725 {
+  optional .benchmarks.google_message3.Enum16728 field16774 = 1;
+  repeated string field16775 = 2;
+}
+
+message Message17726 {
+  optional string field17801 = 1;
+  repeated string field17802 = 2;
+  optional string field17803 = 3;
+  repeated string field17804 = 4;
+  optional string field17805 = 5;
+  repeated string field17806 = 6;
+  optional string field17807 = 7;
+  optional string field17808 = 8;
+  repeated string field17809 = 15;
+  repeated string field17810 = 16;
+  repeated string field17811 = 17;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17812 = 18;
+  optional string field17813 = 9;
+  optional string field17814 = 10;
+  optional string field17815 = 11;
+  optional string field17816 = 12;
+  optional string field17817 = 13;
+  optional string field17818 = 14;
+  optional string field17819 = 19;
+  repeated .benchmarks.google_message3.Message17728 field17820 = 20;
+  repeated .benchmarks.google_message3.Message17728 field17821 = 21;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17822 = 30;
+}
+
+message Message17782 {
+  optional string field18153 = 1;
+  optional string field18154 = 2;
+}
+
+message Message17783 {
+  optional string field18155 = 1;
+  optional string field18156 = 2;
+  optional string field18157 = 3;
+  repeated group Message17784 = 4 {
+    optional string field18162 = 5;
+    optional string field18163 = 6;
+    optional string field18164 = 7;
+    repeated string field18165 = 8;
+    optional string field18166 = 17;
+    optional string field18167 = 18;
+  }
+  repeated group Message17785 = 9 {
+    optional string field18168 = 10;
+    optional string field18169 = 11;
+    optional .benchmarks.google_message3.Message17783 field18170 = 12;
+    optional string field18171 = 13;
+    optional string field18172 = 14;
+    repeated string field18173 = 15;
+  }
+  repeated string field18160 = 16;
+}
+
+message Message16945 {
+  optional string field16946 = 1;
+  optional string field16947 = 2;
+  optional string field16948 = 3;
+  optional string field16949 = 4;
+  optional string field16950 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field16951 = 872;
+  repeated .benchmarks.google_message3.Message0 field16952 = 16;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16953 = 54;
+  repeated .benchmarks.google_message3.Message0 field16954 = 55;
+  repeated string field16955 = 58;
+  repeated string field16956 = 59;
+  repeated string field16957 = 62;
+  repeated string field16958 = 37;
+  repeated string field16959 = 18;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16960 = 38;
+  repeated .benchmarks.google_message3.Message0 field16961 = 67;
+  repeated .benchmarks.google_message3.Message0 field16962 = 130;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16963 = 136;
+  repeated string field16964 = 138;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16965 = 156;
+  repeated string field16966 = 139;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16967 = 126;
+  repeated string field16968 = 152;
+  repeated .benchmarks.google_message3.Message0 field16969 = 183;
+  repeated string field16970 = 168;
+  repeated string field16971 = 212;
+  repeated string field16972 = 213;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16973 = 189;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16974 = 190;
+  repeated string field16975 = 191;
+  repeated string field16976 = 192;
+  repeated .benchmarks.google_message3.Message0 field16977 = 193;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16978 = 194;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16979 = 195;
+  repeated int32 field16980 = 196;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16981 = 95;
+  repeated string field16982 = 96;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16983 = 97;
+  repeated string field16984 = 1086;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16985 = 98;
+  repeated string field16986 = 99;
+  repeated string field16987 = 100;
+  repeated string field16988 = 48;
+  optional string field16989 = 22;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field16990 = 51;
+  repeated string field16991 = 81;
+  repeated string field16992 = 85;
+  repeated string field16993 = 169;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field16994 = 260;
+  optional int32 field16995 = 198;
+  optional int32 field16996 = 204;
+  optional string field16997 = 1087;
+  repeated string field16998 = 197;
+  repeated string field16999 = 206;
+  optional string field17000 = 211;
+  repeated string field17001 = 205;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17002 = 68;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17003 = 69;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17004 = 70;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17005 = 71;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17006 = 72;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17007 = 19;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17008 = 24;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field17009 = 23;
+  repeated .benchmarks.google_message3.Message0 field17010 = 131;
+  repeated string field17011 = 133;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17012 = 142;
+  repeated string field17013 = 143;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field17014 = 153;
+  repeated .benchmarks.google_message3.Message0 field17015 = 170;
+  repeated string field17016 = 171;
+  repeated string field17017 = 172;
+  repeated string field17018 = 173;
+  repeated string field17019 = 174;
+  repeated string field17020 = 175;
+  repeated string field17021 = 186;
+  repeated string field17022 = 101;
+  repeated .benchmarks.google_message3.Message0 field17023 = 102;
+  repeated string field17024 = 274;
+  extensions 17 to 17;
+  extensions 21 to 21;
+  extensions 25 to 25;
+  extensions 27 to 27;
+  extensions 29 to 29;
+  extensions 30 to 30;
+  extensions 31 to 31;
+  extensions 32 to 32;
+  extensions 33 to 33;
+  extensions 34 to 34;
+  extensions 35 to 35;
+  extensions 36 to 36;
+  extensions 39 to 39;
+  extensions 40 to 40;
+  extensions 41 to 41;
+  extensions 42 to 42;
+  extensions 43 to 43;
+  extensions 44 to 44;
+  extensions 45 to 45;
+  extensions 46 to 46;
+  extensions 47 to 47;
+  extensions 49 to 49;
+  extensions 50 to 50;
+  extensions 52 to 52;
+  extensions 53 to 53;
+  extensions 56 to 56;
+  extensions 57 to 57;
+  extensions 60 to 60;
+  extensions 61 to 61;
+  extensions 63 to 63;
+  extensions 64 to 64;
+  extensions 65 to 65;
+  extensions 66 to 66;
+  extensions 73 to 73;
+  extensions 74 to 74;
+  extensions 75 to 75;
+  extensions 76 to 76;
+  extensions 77 to 77;
+  extensions 78 to 78;
+  extensions 79 to 79;
+  extensions 80 to 80;
+  extensions 82 to 82;
+  extensions 83 to 83;
+  extensions 84 to 84;
+  extensions 86 to 86;
+  extensions 87 to 87;
+  extensions 88 to 88;
+  extensions 89 to 89;
+  extensions 90 to 90;
+  extensions 91 to 91;
+  extensions 92 to 92;
+  extensions 93 to 93;
+  extensions 94 to 94;
+  extensions 103 to 103;
+  extensions 104 to 104;
+  extensions 105 to 105;
+  extensions 106 to 106;
+  extensions 107 to 107;
+  extensions 108 to 108;
+  extensions 109 to 109;
+  extensions 110 to 110;
+  extensions 111 to 111;
+  extensions 112 to 112;
+  extensions 113 to 113;
+  extensions 114 to 114;
+  extensions 115 to 115;
+  extensions 116 to 116;
+  extensions 117 to 117;
+  extensions 118 to 118;
+  extensions 119 to 119;
+  extensions 120 to 120;
+  extensions 121 to 121;
+  extensions 122 to 122;
+  extensions 123 to 123;
+  extensions 124 to 124;
+  extensions 125 to 125;
+  extensions 127 to 127;
+  extensions 128 to 128;
+  extensions 129 to 129;
+  extensions 132 to 132;
+  extensions 134 to 134;
+  extensions 135 to 135;
+  extensions 137 to 137;
+  extensions 140 to 140;
+  extensions 141 to 141;
+  extensions 144 to 144;
+  extensions 145 to 145;
+  extensions 146 to 146;
+  extensions 147 to 147;
+  extensions 148 to 148;
+  extensions 149 to 149;
+  extensions 150 to 150;
+  extensions 151 to 151;
+  extensions 154 to 154;
+  extensions 155 to 155;
+  extensions 157 to 157;
+  extensions 158 to 158;
+  extensions 159 to 159;
+  extensions 160 to 160;
+  extensions 161 to 161;
+  extensions 162 to 162;
+  extensions 163 to 163;
+  extensions 164 to 164;
+  extensions 165 to 165;
+  extensions 166 to 166;
+  extensions 167 to 167;
+  extensions 176 to 176;
+  extensions 177 to 177;
+  extensions 178 to 178;
+  extensions 179 to 179;
+  extensions 180 to 180;
+  extensions 181 to 181;
+  extensions 182 to 182;
+  extensions 184 to 184;
+  extensions 185 to 185;
+  extensions 187 to 187;
+  extensions 188 to 188;
+  extensions 199 to 199;
+  extensions 200 to 200;
+  extensions 201 to 201;
+  extensions 202 to 202;
+  extensions 203 to 203;
+  extensions 207 to 207;
+  extensions 208 to 208;
+  extensions 209 to 209;
+  extensions 210 to 210;
+  extensions 214 to 214;
+  extensions 215 to 215;
+  extensions 216 to 216;
+  extensions 217 to 217;
+  extensions 218 to 218;
+  extensions 219 to 219;
+  extensions 220 to 220;
+  extensions 221 to 221;
+  extensions 222 to 222;
+  extensions 223 to 223;
+  extensions 224 to 224;
+  extensions 225 to 225;
+  extensions 226 to 226;
+  extensions 227 to 227;
+  extensions 228 to 228;
+  extensions 229 to 229;
+  extensions 230 to 230;
+  extensions 231 to 231;
+  extensions 232 to 232;
+  extensions 233 to 233;
+  extensions 234 to 234;
+  extensions 235 to 235;
+  extensions 236 to 236;
+  extensions 237 to 237;
+  extensions 238 to 238;
+  extensions 239 to 239;
+  extensions 240 to 240;
+  extensions 241 to 241;
+  extensions 242 to 242;
+  extensions 243 to 243;
+  extensions 244 to 244;
+  extensions 245 to 245;
+  extensions 246 to 246;
+  extensions 247 to 247;
+  extensions 248 to 248;
+  extensions 249 to 249;
+  extensions 250 to 250;
+  extensions 251 to 251;
+  extensions 252 to 252;
+  extensions 253 to 253;
+  extensions 254 to 254;
+  extensions 255 to 255;
+  extensions 256 to 256;
+  extensions 257 to 257;
+  extensions 258 to 258;
+  extensions 259 to 259;
+  extensions 261 to 261;
+  extensions 262 to 262;
+  extensions 263 to 263;
+  extensions 264 to 264;
+  extensions 265 to 265;
+  extensions 266 to 266;
+  extensions 267 to 267;
+  extensions 268 to 268;
+  extensions 269 to 269;
+  extensions 270 to 270;
+  extensions 271 to 271;
+  extensions 272 to 272;
+  extensions 273 to 273;
+  extensions 275 to 275;
+  extensions 276 to 276;
+  extensions 277 to 277;
+  extensions 278 to 278;
+  extensions 279 to 279;
+  extensions 280 to 280;
+  extensions 281 to 281;
+  extensions 282 to 282;
+  extensions 283 to 283;
+  extensions 284 to 284;
+  extensions 285 to 285;
+  extensions 286 to 286;
+  extensions 290 to 290;
+  extensions 291 to 291;
+  extensions 292 to 292;
+  extensions 293 to 293;
+  extensions 294 to 294;
+  extensions 295 to 295;
+  extensions 296 to 296;
+  extensions 297 to 297;
+  extensions 298 to 298;
+  extensions 299 to 299;
+  extensions 300 to 300;
+  extensions 301 to 301;
+  extensions 302 to 302;
+  extensions 303 to 303;
+  extensions 304 to 304;
+  extensions 305 to 305;
+  extensions 306 to 306;
+  extensions 307 to 307;
+  extensions 308 to 308;
+  extensions 309 to 309;
+  extensions 310 to 310;
+  extensions 311 to 311;
+  extensions 312 to 312;
+  extensions 313 to 313;
+  extensions 314 to 314;
+  extensions 315 to 315;
+  extensions 316 to 316;
+  extensions 317 to 317;
+  extensions 318 to 318;
+  extensions 319 to 319;
+  extensions 320 to 320;
+  extensions 321 to 321;
+  extensions 322 to 322;
+  extensions 323 to 323;
+  extensions 324 to 324;
+  extensions 325 to 325;
+  extensions 326 to 326;
+  extensions 327 to 327;
+  extensions 328 to 328;
+  extensions 329 to 329;
+  extensions 330 to 330;
+  extensions 331 to 331;
+  extensions 332 to 332;
+  extensions 333 to 333;
+  extensions 334 to 334;
+  extensions 335 to 335;
+  extensions 336 to 336;
+  extensions 337 to 337;
+  extensions 338 to 338;
+  extensions 339 to 339;
+  extensions 340 to 340;
+  extensions 341 to 341;
+  extensions 342 to 342;
+  extensions 343 to 343;
+  extensions 344 to 344;
+  extensions 345 to 345;
+  extensions 346 to 346;
+  extensions 347 to 347;
+  extensions 348 to 348;
+  extensions 349 to 349;
+  extensions 350 to 350;
+  extensions 351 to 351;
+  extensions 352 to 352;
+  extensions 353 to 353;
+  extensions 354 to 354;
+  extensions 355 to 355;
+  extensions 356 to 356;
+  extensions 357 to 357;
+  extensions 358 to 358;
+  extensions 359 to 359;
+  extensions 360 to 360;
+  extensions 361 to 361;
+  extensions 362 to 362;
+  extensions 363 to 363;
+  extensions 364 to 364;
+  extensions 365 to 365;
+  extensions 366 to 366;
+  extensions 367 to 367;
+  extensions 368 to 368;
+  extensions 369 to 369;
+  extensions 370 to 370;
+  extensions 371 to 371;
+  extensions 372 to 372;
+  extensions 373 to 373;
+  extensions 374 to 374;
+  extensions 375 to 375;
+  extensions 376 to 376;
+  extensions 377 to 377;
+  extensions 378 to 378;
+  extensions 379 to 379;
+  extensions 380 to 380;
+  extensions 381 to 381;
+  extensions 382 to 382;
+  extensions 383 to 383;
+  extensions 384 to 384;
+  extensions 385 to 385;
+  extensions 386 to 386;
+  extensions 387 to 387;
+  extensions 388 to 388;
+  extensions 389 to 389;
+  extensions 390 to 390;
+  extensions 391 to 391;
+  extensions 392 to 392;
+  extensions 393 to 393;
+  extensions 394 to 394;
+  extensions 395 to 395;
+  extensions 396 to 396;
+  extensions 397 to 397;
+  extensions 398 to 398;
+  extensions 399 to 399;
+  extensions 400 to 400;
+  extensions 401 to 401;
+  extensions 402 to 402;
+  extensions 403 to 403;
+  extensions 404 to 404;
+  extensions 405 to 405;
+  extensions 406 to 406;
+  extensions 407 to 407;
+  extensions 408 to 408;
+  extensions 409 to 409;
+  extensions 410 to 410;
+  extensions 411 to 411;
+  extensions 412 to 412;
+  extensions 413 to 413;
+  extensions 414 to 414;
+  extensions 415 to 415;
+  extensions 416 to 416;
+  extensions 417 to 417;
+  extensions 418 to 418;
+  extensions 419 to 419;
+  extensions 420 to 420;
+  extensions 421 to 421;
+  extensions 422 to 422;
+  extensions 423 to 423;
+  extensions 424 to 424;
+  extensions 425 to 425;
+  extensions 426 to 426;
+  extensions 427 to 427;
+  extensions 428 to 428;
+  extensions 429 to 429;
+  extensions 430 to 430;
+  extensions 431 to 431;
+  extensions 432 to 432;
+  extensions 433 to 433;
+  extensions 434 to 434;
+  extensions 435 to 435;
+  extensions 436 to 436;
+  extensions 437 to 437;
+  extensions 438 to 438;
+  extensions 439 to 439;
+  extensions 440 to 440;
+  extensions 441 to 441;
+  extensions 442 to 442;
+  extensions 443 to 443;
+  extensions 444 to 444;
+  extensions 445 to 445;
+  extensions 446 to 446;
+  extensions 447 to 447;
+  extensions 448 to 448;
+  extensions 449 to 449;
+  extensions 450 to 450;
+  extensions 451 to 451;
+  extensions 452 to 452;
+  extensions 453 to 453;
+  extensions 454 to 454;
+  extensions 455 to 455;
+  extensions 456 to 456;
+  extensions 457 to 457;
+  extensions 458 to 458;
+  extensions 459 to 459;
+  extensions 460 to 460;
+  extensions 461 to 461;
+  extensions 462 to 462;
+  extensions 463 to 463;
+  extensions 464 to 464;
+  extensions 465 to 465;
+  extensions 466 to 466;
+  extensions 467 to 467;
+  extensions 468 to 468;
+  extensions 469 to 469;
+  extensions 470 to 470;
+  extensions 471 to 471;
+  extensions 472 to 472;
+  extensions 473 to 473;
+  extensions 474 to 474;
+  extensions 509 to 509;
+  extensions 511 to 511;
+  extensions 512 to 512;
+  extensions 513 to 513;
+  extensions 514 to 514;
+  extensions 515 to 515;
+  extensions 516 to 516;
+  extensions 517 to 517;
+  extensions 518 to 518;
+  extensions 519 to 519;
+  extensions 520 to 520;
+  extensions 521 to 521;
+  extensions 522 to 522;
+  extensions 523 to 523;
+  extensions 524 to 524;
+  extensions 525 to 525;
+  extensions 526 to 526;
+  extensions 527 to 527;
+  extensions 528 to 528;
+  extensions 529 to 529;
+  extensions 530 to 530;
+  extensions 531 to 531;
+  extensions 532 to 532;
+  extensions 533 to 533;
+  extensions 534 to 534;
+  extensions 535 to 535;
+  extensions 536 to 536;
+  extensions 537 to 537;
+  extensions 538 to 538;
+  extensions 539 to 539;
+  extensions 540 to 540;
+  extensions 541 to 541;
+  extensions 542 to 542;
+  extensions 543 to 543;
+  extensions 544 to 544;
+  extensions 545 to 545;
+  extensions 546 to 546;
+  extensions 547 to 547;
+  extensions 548 to 548;
+  extensions 549 to 549;
+  extensions 550 to 550;
+  extensions 551 to 551;
+  extensions 552 to 552;
+  extensions 553 to 553;
+  extensions 554 to 554;
+  extensions 555 to 555;
+  extensions 556 to 556;
+  extensions 557 to 557;
+  extensions 558 to 558;
+  extensions 559 to 559;
+  extensions 560 to 560;
+  extensions 561 to 561;
+  extensions 562 to 562;
+  extensions 563 to 563;
+  extensions 564 to 564;
+  extensions 565 to 565;
+  extensions 566 to 566;
+  extensions 567 to 567;
+  extensions 568 to 568;
+  extensions 569 to 569;
+  extensions 570 to 570;
+  extensions 571 to 571;
+  extensions 572 to 572;
+  extensions 573 to 573;
+  extensions 574 to 574;
+  extensions 575 to 575;
+  extensions 576 to 576;
+  extensions 577 to 577;
+  extensions 578 to 578;
+  extensions 579 to 579;
+  extensions 580 to 580;
+  extensions 581 to 581;
+  extensions 582 to 582;
+  extensions 583 to 583;
+  extensions 584 to 584;
+  extensions 585 to 585;
+  extensions 586 to 586;
+  extensions 587 to 587;
+  extensions 588 to 588;
+  extensions 589 to 589;
+  extensions 590 to 590;
+  extensions 604 to 604;
+  extensions 605 to 605;
+  extensions 606 to 606;
+  extensions 607 to 607;
+  extensions 608 to 608;
+  extensions 609 to 609;
+  extensions 610 to 610;
+  extensions 611 to 611;
+  extensions 612 to 612;
+  extensions 613 to 613;
+  extensions 614 to 614;
+  extensions 615 to 615;
+  extensions 616 to 616;
+  extensions 617 to 617;
+  extensions 618 to 618;
+  extensions 619 to 619;
+  extensions 620 to 620;
+  extensions 621 to 621;
+  extensions 622 to 622;
+  extensions 623 to 623;
+  extensions 624 to 624;
+  extensions 625 to 625;
+  extensions 626 to 626;
+  extensions 627 to 627;
+  extensions 628 to 628;
+  extensions 629 to 629;
+  extensions 813 to 813;
+  extensions 814 to 814;
+  extensions 815 to 815;
+  extensions 816 to 816;
+  extensions 817 to 817;
+  extensions 818 to 818;
+  extensions 819 to 819;
+  extensions 820 to 820;
+  extensions 821 to 821;
+  extensions 822 to 822;
+  extensions 823 to 823;
+  extensions 824 to 824;
+  extensions 827 to 827;
+  extensions 828 to 828;
+  extensions 829 to 829;
+  extensions 830 to 830;
+  extensions 831 to 831;
+  extensions 832 to 832;
+  extensions 833 to 833;
+  extensions 834 to 834;
+  extensions 835 to 835;
+  extensions 836 to 836;
+  extensions 837 to 837;
+  extensions 838 to 838;
+  extensions 839 to 839;
+  extensions 840 to 840;
+  extensions 841 to 841;
+  extensions 842 to 842;
+  extensions 843 to 843;
+  extensions 844 to 844;
+  extensions 845 to 845;
+  extensions 846 to 846;
+  extensions 847 to 847;
+  extensions 848 to 848;
+  extensions 849 to 849;
+  extensions 850 to 850;
+  extensions 851 to 851;
+  extensions 852 to 852;
+  extensions 853 to 853;
+  extensions 854 to 854;
+  extensions 855 to 855;
+  extensions 856 to 856;
+  extensions 857 to 857;
+  extensions 858 to 858;
+  extensions 859 to 859;
+  extensions 860 to 860;
+  extensions 861 to 861;
+  extensions 862 to 862;
+  extensions 863 to 863;
+  extensions 864 to 864;
+  extensions 865 to 865;
+  extensions 866 to 866;
+  extensions 867 to 867;
+  extensions 868 to 868;
+  extensions 869 to 869;
+  extensions 870 to 870;
+  extensions 871 to 871;
+  extensions 880 to 880;
+  extensions 881 to 881;
+  extensions 882 to 882;
+  extensions 883 to 883;
+  extensions 884 to 884;
+  extensions 885 to 885;
+  extensions 886 to 886;
+  extensions 887 to 887;
+  extensions 888 to 888;
+  extensions 890 to 890;
+  extensions 891 to 891;
+  extensions 892 to 892;
+  extensions 912 to 912;
+  extensions 914 to 914;
+  extensions 915 to 915;
+  extensions 916 to 916;
+  extensions 917 to 917;
+  extensions 918 to 918;
+  extensions 919 to 919;
+  extensions 920 to 920;
+  extensions 921 to 921;
+  extensions 922 to 922;
+  extensions 923 to 923;
+  extensions 924 to 924;
+  extensions 925 to 925;
+  extensions 926 to 926;
+  extensions 927 to 927;
+  extensions 928 to 928;
+  extensions 929 to 929;
+  extensions 930 to 930;
+  extensions 931 to 931;
+  extensions 932 to 932;
+  extensions 933 to 933;
+  extensions 934 to 934;
+  extensions 935 to 935;
+  extensions 936 to 936;
+  extensions 937 to 937;
+  extensions 938 to 938;
+  extensions 939 to 939;
+  extensions 940 to 940;
+  extensions 941 to 941;
+  extensions 942 to 942;
+  extensions 943 to 943;
+  extensions 944 to 944;
+  extensions 945 to 945;
+  extensions 946 to 946;
+  extensions 947 to 947;
+  extensions 949 to 949;
+  extensions 950 to 950;
+  extensions 951 to 951;
+  extensions 952 to 952;
+  extensions 954 to 954;
+  extensions 955 to 955;
+  extensions 956 to 956;
+  extensions 957 to 957;
+  extensions 958 to 958;
+  extensions 959 to 959;
+  extensions 960 to 960;
+  extensions 961 to 961;
+  extensions 962 to 962;
+  extensions 963 to 963;
+  extensions 964 to 964;
+  extensions 965 to 965;
+  extensions 966 to 966;
+  extensions 967 to 967;
+  extensions 968 to 968;
+  extensions 969 to 969;
+  extensions 970 to 970;
+  extensions 971 to 971;
+  extensions 972 to 972;
+  extensions 973 to 973;
+  extensions 974 to 974;
+  extensions 975 to 975;
+  extensions 976 to 976;
+  extensions 977 to 977;
+  extensions 978 to 978;
+  extensions 979 to 979;
+  extensions 980 to 980;
+  extensions 981 to 981;
+  extensions 982 to 982;
+  extensions 983 to 983;
+  extensions 984 to 984;
+  extensions 985 to 985;
+  extensions 987 to 987;
+  extensions 988 to 988;
+  extensions 1000 to 1000;
+  extensions 1001 to 1001;
+  extensions 1002 to 1002;
+  extensions 1003 to 1003;
+  extensions 1004 to 1004;
+  extensions 1005 to 1005;
+  extensions 1006 to 1006;
+  extensions 1007 to 1007;
+  extensions 1008 to 1008;
+  extensions 1009 to 1009;
+  extensions 1010 to 1010;
+  extensions 1011 to 1011;
+  extensions 1012 to 1012;
+  extensions 1013 to 1013;
+  extensions 1014 to 1014;
+  extensions 1015 to 1015;
+  extensions 1016 to 1016;
+  extensions 1017 to 1017;
+  extensions 1018 to 1018;
+  extensions 1019 to 1019;
+  extensions 1020 to 1020;
+  extensions 1021 to 1021;
+  extensions 1022 to 1022;
+  extensions 1023 to 1023;
+  extensions 1024 to 1024;
+  extensions 1025 to 1025;
+  extensions 1026 to 1026;
+  extensions 1027 to 1027;
+  extensions 1028 to 1028;
+  extensions 1029 to 1029;
+  extensions 1030 to 1030;
+  extensions 1031 to 1031;
+  extensions 1032 to 1032;
+  extensions 1033 to 1033;
+  extensions 1034 to 1034;
+  extensions 1035 to 1035;
+  extensions 1036 to 1036;
+  extensions 1037 to 1037;
+  extensions 1038 to 1038;
+  extensions 1039 to 1039;
+  extensions 1040 to 1040;
+  extensions 1041 to 1041;
+  extensions 1042 to 1042;
+  extensions 1043 to 1043;
+  extensions 1044 to 1044;
+  extensions 1045 to 1045;
+  extensions 1046 to 1046;
+  extensions 1047 to 1047;
+  extensions 1048 to 1048;
+  extensions 1049 to 1049;
+  extensions 1050 to 1050;
+  extensions 1051 to 1051;
+  extensions 1052 to 1052;
+  extensions 1053 to 1053;
+  extensions 1054 to 1054;
+  extensions 1055 to 1055;
+  extensions 1056 to 1056;
+  extensions 1057 to 1057;
+  extensions 1058 to 1058;
+  extensions 1079 to 1079;
+  extensions 1080 to 1080;
+  extensions 1081 to 1081;
+  extensions 1082 to 1082;
+  extensions 1083 to 1083;
+  extensions 1084 to 1084;
+  extensions 1085 to 1085;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message16945 field17025 = 22068132;
+  }
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
new file mode 100644
index 0000000..7ab993b
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
@@ -0,0 +1,499 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_3.proto";
+import "datasets/google_message3/benchmark_message3_4.proto";
+import "datasets/google_message3/benchmark_message3_5.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message22853 {
+  optional .benchmarks.google_message3.Enum22854 field22869 = 1;
+  repeated uint32 field22870 = 2 [packed = true];
+  repeated float field22871 = 3 [packed = true];
+  repeated float field22872 = 5 [packed = true];
+  optional .benchmarks.google_message3.UnusedEmptyMessage field22873 = 4;
+}
+
+message Message24345 {
+  optional string field24533 = 1;
+  optional .benchmarks.google_message3.UnusedEnum field24534 = 22;
+  optional .benchmarks.google_message3.Message24346 field24535 = 2;
+  optional string field24536 = 3;
+  optional string field24537 = 4;
+  optional .benchmarks.google_message3.UnusedEnum field24538 = 23;
+  optional string field24539 = 5;
+  required string field24540 = 6;
+  optional string field24541 = 7;
+  optional string field24542 = 8;
+  optional .benchmarks.google_message3.Message24316 field24543 = 9;
+  optional .benchmarks.google_message3.Message24376 field24544 = 10;
+  optional string field24545 = 11;
+  optional string field24546 = 19;
+  optional string field24547 = 20;
+  optional string field24548 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24549 = 12;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24550 = 13;
+  repeated string field24551 = 14;
+  optional string field24552 = 15;
+  optional int32 field24553 = 18;
+  optional .benchmarks.google_message3.Message24379 field24554 = 16;
+  optional string field24555 = 17;
+  repeated .benchmarks.google_message3.Message24356 field24556 = 24;
+  repeated .benchmarks.google_message3.Message24366 field24557 = 25;
+}
+
+message Message24403 {
+  optional .benchmarks.google_message3.Message24401 field24681 = 1;
+  optional .benchmarks.google_message3.Message24402 field24682 = 2;
+}
+
+message Message24391 {
+  optional string field24631 = 1;
+  optional string field24632 = 2;
+  repeated string field24633 = 3;
+  optional string field24634 = 4;
+  repeated string field24635 = 5;
+  repeated string field24636 = 16;
+  optional string field24637 = 17;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24638 = 25;
+  optional string field24639 = 7;
+  optional string field24640 = 18;
+  optional string field24641 = 19;
+  optional string field24642 = 20;
+  optional int32 field24643 = 24;
+  optional .benchmarks.google_message3.Message24379 field24644 = 8;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24645 = 9;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24646 = 10;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24647 = 11;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24648 = 12;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24649 = 13;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24650 = 14;
+  optional string field24651 = 21;
+  optional int32 field24652 = 22;
+  optional int32 field24653 = 23;
+  repeated string field24654 = 15;
+  repeated string field24655 = 6;
+}
+
+message Message27454 {
+}
+
+message Message27357 {
+  optional string field27410 = 1;
+  optional float field27411 = 2;
+  optional string field27412 = 3;
+  optional bool field27413 = 4;
+  optional bool field27414 = 5;
+}
+
+message Message27360 {
+  optional .benchmarks.google_message3.Message27358 field27426 = 1;
+  optional .benchmarks.google_message3.Enum27361 field27427 = 2;
+  optional .benchmarks.google_message3.Message27358 field27428 = 3;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field27429 = 4;
+}
+
+message Message34387 {
+  optional string field34446 = 1;
+  repeated .benchmarks.google_message3.Message34381 field34447 = 2;
+  optional .benchmarks.google_message3.UnusedEnum field34448 = 3;
+  optional .benchmarks.google_message3.Enum34388 field34449 = 4;
+  optional int64 field34450 = 5;
+}
+
+message Message34621 {
+  optional double field34651 = 1;
+  optional double field34652 = 2;
+  optional double field34653 = 3;
+  optional double field34654 = 4;
+  optional double field34655 = 11;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34656 = 13;
+  optional .benchmarks.google_message3.Message34619 field34657 = 14;
+  optional string field34658 = 5;
+  optional string field34659 = 9;
+  optional double field34660 = 12;
+  optional bytes field34661 = 19;
+  optional string field34662 = 15;
+  optional string field34663 = 16;
+  optional string field34664 = 17;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34665 = 18;
+  optional .benchmarks.google_message3.Message34621 field34666 = 20;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field34667 = 100;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34668 = 101;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message34621 field34669 = 17562023;
+  }
+}
+
+message Message35476 {
+  optional string field35484 = 1;
+  optional string field35485 = 2;
+  optional string field35486 = 3;
+  optional .benchmarks.google_message3.Enum35477 field35487 = 4;
+  optional float field35488 = 5;
+  optional float field35489 = 6;
+  optional float field35490 = 7;
+  optional float field35491 = 8;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field35492 = 9;
+  optional int32 field35493 = 10;
+  optional int32 field35494 = 11;
+  optional int32 field35495 = 12;
+  optional string field35496 = 13;
+  optional string field35497 = 14;
+}
+
+message Message949 {
+  optional string field955 = 1;
+  optional int64 field956 = 2;
+  optional int64 field957 = 3;
+  optional .benchmarks.google_message3.Message730 field958 = 4;
+  repeated string field959 = 5;
+  optional string field960 = 6;
+  optional bool field961 = 7;
+}
+
+message Message36869 {
+  optional int32 field36970 = 1;
+  optional int32 field36971 = 2;
+}
+
+message Message33968 {
+  repeated group Message33969 = 1 {
+  }
+  repeated .benchmarks.google_message3.Message33958 field33989 = 3;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field33990 = 106;
+  optional bool field33991 = 108;
+  optional .benchmarks.google_message3.UnusedEnum field33992 = 107;
+}
+
+message Message6644 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6701 = 8;
+  optional string field6702 = 1;
+  optional double field6703 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6704 = 9;
+  optional bytes field6705 = 3;
+  optional bytes field6706 = 19;
+  optional .benchmarks.google_message3.Message6637 field6707 = 4;
+  repeated .benchmarks.google_message3.Message6126 field6708 = 18;
+  optional bool field6709 = 6;
+  optional .benchmarks.google_message3.Message6643 field6710 = 10;
+  optional string field6711 = 12;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6712 = 14;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6713 = 15;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6714 = 16;
+  optional int32 field6715 = 17;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6716 = 20;
+}
+
+message Message18831 {
+  repeated group Message18832 = 1 {
+    optional int32 field18836 = 2;
+    optional string field18837 = 5;
+    optional float field18838 = 3;
+    optional float field18839 = 9;
+    optional int32 field18840 = 11;
+    repeated uint64 field18841 = 4;
+    repeated group Message18833 = 6 {
+      required uint64 field18843 = 7;
+      optional string field18844 = 8;
+      optional float field18845 = 10;
+      optional int32 field18846 = 12;
+      optional bool field18847 = 13;
+    }
+  }
+}
+
+message Message13090 {
+  optional .benchmarks.google_message3.Message13083 field13141 = 1;
+  optional .benchmarks.google_message3.Message13088 field13142 = 2;
+}
+
+message Message11874 {
+  optional .benchmarks.google_message3.Message10391 field11888 = 3;
+  optional string field11889 = 4;
+  optional .benchmarks.google_message3.Message11873 field11890 = 6;
+  optional bool field11891 = 7;
+  extensions 1 to 1;
+  extensions 2 to 2;
+  extensions 5 to 5;
+}
+
+message Message4144 {
+  repeated group Message4145 = 1 {
+    required .benchmarks.google_message3.Enum4146 field4165 = 2;
+    required int32 field4166 = 3;
+    optional .benchmarks.google_message3.Enum4160 field4167 = 9;
+    optional bytes field4168 = 4;
+    optional .benchmarks.google_message3.Enum4152 field4169 = 5;
+    optional string field4170 = 6;
+  }
+}
+
+message Message35573 {
+  optional fixed64 field35695 = 16;
+  optional string field35696 = 1000;
+  optional string field35697 = 1004;
+  optional int32 field35698 = 1003;
+  repeated group Message35574 = 1012 {
+  }
+  optional int64 field35700 = 1011;
+  optional int64 field35701 = 1005;
+  optional int64 field35702 = 1006;
+  optional int64 field35703 = 1007;
+  optional int64 field35704 = 1008;
+  repeated group Message35575 = 1 {
+    optional int64 field35709 = 2;
+    optional string field35710 = 3;
+    optional string field35711 = 19;
+    optional int32 field35712 = 20;
+    optional int32 field35713 = 21;
+    optional int32 field35714 = 22;
+    optional bool field35715 = 23;
+    optional int32 field35716 = 47;
+    optional int32 field35717 = 48;
+    optional bool field35718 = 24;
+    optional fixed64 field35719 = 25;
+    optional bytes field35720 = 52;
+    optional int32 field35721 = 18;
+    optional fixed32 field35722 = 43;
+    optional bool field35723 = 26;
+    optional int32 field35724 = 27;
+    optional int32 field35725 = 17;
+    optional bool field35726 = 45;
+    repeated int32 field35727 = 33;
+    repeated int32 field35728 = 58;
+    optional float field35729 = 34;
+    optional float field35730 = 1009;
+    optional int32 field35731 = 28;
+    repeated fixed64 field35732 = 1001;
+    repeated fixed64 field35733 = 1002;
+    optional int32 field35734 = 44;
+    optional int32 field35735 = 50;
+    optional int32 field35736 = 36;
+    optional int32 field35737 = 40;
+    optional bool field35738 = 1016;
+    optional bool field35739 = 1010;
+    optional int32 field35740 = 37;
+    optional int32 field35741 = 38;
+    optional string field35742 = 46;
+    optional uint32 field35743 = 60;
+    repeated bytes field35744 = 56;
+    optional .benchmarks.google_message3.Message0 field35745 = 57;
+    required group Message35576 = 4 {
+      optional fixed64 field35747 = 5;
+      optional int32 field35748 = 6;
+      optional int32 field35749 = 49;
+      optional int32 field35750 = 7;
+      optional uint32 field35751 = 59;
+      optional int32 field35752 = 14;
+      optional int32 field35753 = 15;
+      optional int32 field35754 = 35;
+      optional bytes field35755 = 53;
+      optional int32 field35756 = 8;
+      optional string field35757 = 9;
+      optional fixed64 field35758 = 10;
+      optional int32 field35759 = 11;
+      optional int32 field35760 = 12;
+      optional int32 field35761 = 41;
+      optional int32 field35762 = 30;
+      optional int32 field35763 = 31;
+      optional int32 field35764 = 13;
+      optional bytes field35765 = 39;
+      optional string field35766 = 29;
+      optional int32 field35767 = 42;
+      repeated int32 field35768 = 32;
+      repeated int32 field35769 = 51;
+      optional int64 field35770 = 54;
+      optional .benchmarks.google_message3.Message0 field35771 = 55;
+    }
+  }
+}
+
+message Message36858 {
+  repeated int32 field36956 = 1;
+  repeated string field36957 = 2;
+  repeated string field36958 = 12;
+  optional int32 field36959 = 3;
+  optional int32 field36960 = 4;
+  optional int32 field36961 = 14;
+  optional string field36962 = 11;
+  optional bool field36963 = 5;
+  optional bool field36964 = 13;
+  optional int64 field36965 = 6;
+  optional .benchmarks.google_message3.Message35506 field36966 = 7;
+  repeated group Message36859 = 8 {
+    required .benchmarks.google_message3.Enum36860 field36968 = 9;
+    optional float field36969 = 10;
+  }
+}
+
+message Message13174 {
+  required int32 field13237 = 6;
+  optional int32 field13238 = 3;
+  required int32 field13239 = 4;
+  optional int32 field13240 = 8;
+  optional double field13241 = 5;
+  optional double field13242 = 7;
+  optional int32 field13243 = 17;
+  optional int32 field13244 = 19;
+  optional double field13245 = 20;
+  optional int32 field13246 = 9;
+  optional double field13247 = 10;
+  optional int32 field13248 = 11;
+  optional .benchmarks.google_message3.Message13151 field13249 = 21;
+  optional int32 field13250 = 1;
+  optional double field13251 = 2;
+  optional double field13252 = 15;
+  optional double field13253 = 16;
+  optional double field13254 = 12;
+  optional double field13255 = 13;
+  optional double field13256 = 14;
+  optional int32 field13257 = 18;
+}
+
+message Message18283 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18478 = 1;
+  optional int32 field18479 = 4;
+  optional int32 field18480 = 106;
+  optional int32 field18481 = 107;
+  optional int32 field18482 = 108;
+  optional int32 field18483 = 109;
+  optional int32 field18484 = 105;
+  optional int32 field18485 = 113;
+  optional int32 field18486 = 114;
+  optional int32 field18487 = 124;
+  optional int32 field18488 = 125;
+  optional int32 field18489 = 128;
+  optional int32 field18490 = 135;
+  optional bool field18491 = 166;
+  optional bool field18492 = 136;
+  optional int32 field18493 = 140;
+  optional int32 field18494 = 171;
+  optional int32 field18495 = 148;
+  optional int32 field18496 = 145;
+  optional float field18497 = 117;
+  optional int32 field18498 = 146;
+  optional string field18499 = 3;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18500 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18501 = 6;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18502 = 9;
+  optional .benchmarks.google_message3.Message18253 field18503 = 155;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18504 = 184;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18505 = 163;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18506 = 16;
+  repeated int32 field18507 = 20;
+  repeated int32 field18508 = 7;
+  repeated string field18509 = 194;
+  optional bytes field18510 = 30;
+  optional int32 field18511 = 31;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18512 = 178;
+  optional string field18513 = 8;
+  optional float field18514 = 2;
+  optional float field18515 = 100;
+  optional float field18516 = 101;
+  optional float field18517 = 102;
+  optional int32 field18518 = 103;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field18519 = 104;
+  optional int32 field18520 = 110;
+  optional int32 field18521 = 112;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18522 = 111;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18523 = 115;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18524 = 119;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18525 = 127;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18526 = 185;
+  optional int32 field18527 = 120;
+  optional int32 field18528 = 132;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18529 = 126;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18530 = 129;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18531 = 131;
+  optional fixed64 field18532 = 150;
+  optional int32 field18533 = 133;
+  optional int32 field18534 = 134;
+  optional int32 field18535 = 139;
+  optional fixed64 field18536 = 137;
+  optional fixed64 field18537 = 138;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18538 = 141;
+  optional int32 field18539 = 142;
+  optional int32 field18540 = 181;
+  optional .benchmarks.google_message3.Message16816 field18541 = 143;
+  optional .benchmarks.google_message3.Message16685 field18542 = 154;
+  optional int32 field18543 = 144;
+  optional int64 field18544 = 147;
+  optional int64 field18545 = 149;
+  optional int32 field18546 = 151;
+  optional int32 field18547 = 152;
+  optional int32 field18548 = 153;
+  optional float field18549 = 161;
+  optional .benchmarks.google_message3.Message0 field18550 = 123;
+  repeated int64 field18551 = 156;
+  optional int32 field18552 = 157;
+  repeated fixed64 field18553 = 188;
+  optional int32 field18554 = 158;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18555 = 159;
+  optional bool field18556 = 160;
+  optional uint64 field18557 = 162;
+  optional int32 field18558 = 164;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18559 = 10;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18560 = 167;
+  optional int32 field18561 = 168;
+  repeated fixed64 field18562 = 169;
+  repeated string field18563 = 170;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18564 = 172;
+  optional int64 field18565 = 173;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18566 = 174;
+  optional int64 field18567 = 175;
+  optional uint32 field18568 = 189;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18569 = 176;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18570 = 177;
+  optional uint32 field18571 = 179;
+  optional uint32 field18572 = 180;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18573 = 182;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18574 = 183;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18575 = 121;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18576 = 186;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18577 = 187;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18578 = 190;
+  optional int32 field18579 = 191;
+  optional float field18580 = 192;
+  optional bool field18581 = 193;
+  extensions 116 to 116;
+  extensions 118 to 118;
+  extensions 130 to 130;
+  extensions 165 to 165;
+}
+
+message Message13169 {
+  repeated .benchmarks.google_message3.Message13168 field13223 = 1;
+  required .benchmarks.google_message3.Message13167 field13224 = 2;
+  optional string field13225 = 3;
+}
+
+message Message19255 {
+  optional string field19257 = 1;
+}
+
+message Message35542 {
+  optional bool field35543 = 1;
+  optional bool field35544 = 2;
+  optional bool field35545 = 3;
+}
+
+message Message3901 {
+  optional int32 field3990 = 1;
+  optional int32 field3991 = 2;
+  optional int32 field3992 = 3;
+  optional int32 field3993 = 4;
+  optional int32 field3994 = 7;
+  optional int32 field3995 = 8;
+  optional int32 field3996 = 9;
+  optional int32 field3997 = 10;
+  optional int32 field3998 = 11;
+  optional int32 field3999 = 12;
+  optional .benchmarks.google_message3.UnusedEnum field4000 = 6;
+  optional int32 field4001 = 5;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
new file mode 100644
index 0000000..e71d266
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
@@ -0,0 +1,466 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_4.proto";
+import "datasets/google_message3/benchmark_message3_5.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message35546 {
+  optional int64 field35556 = 1;
+  optional int32 field35557 = 2;
+  optional bool field35558 = 3;
+  optional int64 field35559 = 13;
+  optional group Message35547 = 4 {
+    required int32 field35569 = 5;
+    required int32 field35570 = 6;
+  }
+  optional group Message35548 = 10 {
+    required int64 field35571 = 11;
+    required int64 field35572 = 12;
+  }
+  optional bool field35562 = 14;
+  optional bool field35563 = 15;
+  optional int32 field35564 = 16;
+  optional bool field35565 = 17;
+  optional bool field35566 = 18;
+  optional string field35567 = 100;
+}
+
+message Message2356 {
+  optional .benchmarks.google_message3.Message1374 field2368 = 121;
+  optional uint64 field2369 = 1;
+  optional int32 field2370 = 2;
+  optional int32 field2371 = 17;
+  required string field2372 = 3;
+  optional int32 field2373 = 7;
+  optional bytes field2374 = 8;
+  optional string field2375 = 4;
+  optional string field2376 = 101;
+  optional int32 field2377 = 102;
+  optional int32 field2378 = 103;
+  optional int32 field2379 = 104;
+  optional int32 field2380 = 113;
+  optional int32 field2381 = 114;
+  optional int32 field2382 = 115;
+  optional int32 field2383 = 117;
+  optional int32 field2384 = 118;
+  optional int32 field2385 = 119;
+  optional int32 field2386 = 105;
+  optional bytes field2387 = 5;
+  optional group Message2357 = 6 {
+    optional int64 field2399 = 9;
+    optional int32 field2400 = 10;
+    optional int32 field2401 = 11;
+    optional int32 field2402 = 12;
+    optional int32 field2403 = 13;
+    optional int32 field2404 = 116;
+    optional int32 field2405 = 106;
+    required bytes field2406 = 14;
+    optional int32 field2407 = 45;
+    optional int32 field2408 = 112;
+    optional bool field2409 = 122;
+    optional bytes field2410 = 124;
+  }
+  optional string field2389 = 120;
+  optional group Message2358 = 107 {
+  }
+  repeated group Message2359 = 40 {
+    optional string field2413 = 41;
+    optional string field2414 = 42;
+    optional string field2415 = 43;
+    optional string field2416 = 44;
+    optional int32 field2417 = 46;
+    optional string field2418 = 47;
+    optional float field2419 = 110;
+    optional float field2420 = 111;
+  }
+  optional int32 field2392 = 50;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field2393 = 60;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field2394 = 70;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field2395 = 80;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field2396 = 90;
+  optional string field2397 = 100;
+  optional string field2398 = 123;
+}
+
+message Message7029 {
+  required int32 field7183 = 1;
+  optional int32 field7184 = 2;
+  optional int32 field7185 = 3;
+  optional int32 field7186 = 4;
+  optional int32 field7187 = 5;
+  optional int32 field7188 = 6;
+  optional int32 field7189 = 17;
+  optional int32 field7190 = 18;
+  optional int32 field7191 = 49;
+  optional int32 field7192 = 28;
+  optional int32 field7193 = 33;
+  optional int32 field7194 = 25;
+  optional int32 field7195 = 26;
+  optional int32 field7196 = 40;
+  optional int32 field7197 = 41;
+  optional int32 field7198 = 42;
+  optional int32 field7199 = 43;
+  optional int32 field7200 = 19;
+  optional int32 field7201 = 7;
+  optional int32 field7202 = 8;
+  optional int32 field7203 = 9;
+  optional int32 field7204 = 10;
+  optional int32 field7205 = 11;
+  optional int32 field7206 = 12;
+  repeated group Message7030 = 13 {
+    optional string field7226 = 14;
+    optional string field7227 = 15;
+    optional int64 field7228 = 16;
+  }
+  repeated group Message7031 = 21 {
+    optional string field7229 = 22;
+    optional int32 field7230 = 23;
+    optional int32 field7231 = 24;
+    optional int32 field7232 = 30;
+    optional int32 field7233 = 31;
+    optional int32 field7234 = 35;
+  }
+  optional int32 field7209 = 20;
+  optional float field7210 = 27;
+  optional int32 field7211 = 29;
+  optional int32 field7212 = 32;
+  optional string field7213 = 48;
+  optional bool field7214 = 34;
+  optional int32 field7215 = 36;
+  optional float field7216 = 37;
+  optional bool field7217 = 38;
+  optional bool field7218 = 39;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field7219 = 44;
+  optional int32 field7220 = 45;
+  optional int32 field7221 = 46;
+  optional int32 field7222 = 47;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field7223 = 50;
+  optional int32 field7224 = 51;
+}
+
+message Message35538 {
+  required int64 field35539 = 1;
+}
+
+message Message18921 {
+  optional string field18946 = 1;
+  optional fixed64 field18947 = 2;
+  optional int32 field18948 = 3;
+  optional double field18949 = 4;
+  optional bool field18950 = 17;
+  optional bool field18951 = 23;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field18952 = 24;
+  repeated group Message18922 = 5 {
+    optional uint64 field18959 = 6;
+    optional string field18960 = 13;
+    optional bool field18961 = 21;
+    optional bool field18962 = 33;
+    optional int32 field18963 = 7;
+    optional int32 field18964 = 8;
+    optional string field18965 = 9;
+    optional .benchmarks.google_message3.Message18856 field18966 = 10;
+    optional uint64 field18967 = 34;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18968 = 11;
+    optional uint64 field18969 = 35;
+    optional float field18970 = 12;
+    repeated string field18971 = 14;
+    optional bool field18972 = 15;
+    optional bool field18973 = 16;
+    optional float field18974 = 22;
+    optional int32 field18975 = 18;
+    optional int32 field18976 = 19;
+    optional int32 field18977 = 20;
+    optional .benchmarks.google_message3.UnusedEmptyMessage field18978 = 25;
+    optional .benchmarks.google_message3.UnusedEnum field18979 = 26;
+    repeated string field18980 = 27;
+    optional float field18981 = 28;
+  }
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field18954 = 29;
+  repeated .benchmarks.google_message3.Message18943 field18955 = 30;
+  repeated .benchmarks.google_message3.Message18944 field18956 = 31;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field18957 = 32;
+}
+
+message Message35540 {
+  optional bool field35541 = 1;
+}
+
+message Message3886 {
+  repeated group Message3887 = 1 {
+    required string field3932 = 2;
+    optional string field3933 = 9;
+    optional .benchmarks.google_message3.Message3850 field3934 = 3;
+    optional bytes field3935 = 8;
+  }
+}
+
+message Message6743 {
+  optional .benchmarks.google_message3.Message6721 field6759 = 1;
+  optional .benchmarks.google_message3.Message6723 field6760 = 2;
+  optional .benchmarks.google_message3.Message6723 field6761 = 8;
+  optional .benchmarks.google_message3.Message6725 field6762 = 3;
+  optional .benchmarks.google_message3.Message6726 field6763 = 4;
+  optional .benchmarks.google_message3.Message6733 field6764 = 5;
+  optional .benchmarks.google_message3.Message6734 field6765 = 6;
+  optional .benchmarks.google_message3.Message6742 field6766 = 7;
+}
+
+message Message6773 {
+  optional .benchmarks.google_message3.Enum6769 field6794 = 1;
+  optional int32 field6795 = 9;
+  optional .benchmarks.google_message3.UnusedEnum field6796 = 10;
+  optional int32 field6797 = 11;
+  optional int32 field6798 = 2;
+  optional .benchmarks.google_message3.Enum6774 field6799 = 3;
+  optional double field6800 = 5;
+  optional double field6801 = 7;
+  optional double field6802 = 8;
+  optional .benchmarks.google_message3.Enum6782 field6803 = 6;
+}
+
+message Message8224 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8255 = 1;
+  optional .benchmarks.google_message3.Message8184 field8256 = 2;
+  optional .benchmarks.google_message3.Message7966 field8257 = 3;
+  optional string field8258 = 4;
+  optional string field8259 = 5;
+  optional bool field8260 = 6;
+  optional int64 field8261 = 7;
+  optional string field8262 = 8;
+  optional int64 field8263 = 9;
+  optional double field8264 = 10;
+  optional int64 field8265 = 11;
+  repeated string field8266 = 12;
+  optional int64 field8267 = 13;
+  optional int32 field8268 = 14;
+  optional int32 field8269 = 15;
+  optional int64 field8270 = 16;
+  optional double field8271 = 17;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8272 = 18;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8273 = 19;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8274 = 20;
+  optional bool field8275 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8276 = 22;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8277 = 23;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8278 = 24;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8279 = 25;
+  optional bool field8280 = 26;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8281 = 27;
+}
+
+message Message8392 {
+  optional string field8395 = 1;
+  optional string field8396 = 2;
+  optional .benchmarks.google_message3.Message7966 field8397 = 3;
+  optional string field8398 = 4;
+  optional string field8399 = 5;
+  optional string field8400 = 6;
+  optional string field8401 = 7;
+  optional string field8402 = 8;
+  optional string field8403 = 9;
+}
+
+message Message8130 {
+  optional string field8156 = 1;
+  optional string field8157 = 2;
+  optional string field8158 = 4;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8159 = 6;
+  repeated string field8160 = 7;
+  optional int64 field8161 = 8;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8162 = 9;
+  optional string field8163 = 10;
+  optional string field8164 = 11;
+  optional string field8165 = 12;
+  optional string field8166 = 13;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8167 = 14;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8168 = 15;
+  optional string field8169 = 16;
+  optional .benchmarks.google_message3.UnusedEnum field8170 = 17;
+  optional .benchmarks.google_message3.UnusedEnum field8171 = 18;
+  optional bool field8172 = 19;
+  optional bool field8173 = 20;
+  optional double field8174 = 21;
+  optional int32 field8175 = 22;
+  optional int32 field8176 = 23;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8177 = 24;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8178 = 25;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8179 = 26;
+}
+
+message Message8478 {
+  optional string field8489 = 7;
+  optional .benchmarks.google_message3.Message7966 field8490 = 1;
+  optional .benchmarks.google_message3.Message8476 field8491 = 2;
+  optional int64 field8492 = 3;
+  optional .benchmarks.google_message3.Message8476 field8493 = 4;
+  repeated .benchmarks.google_message3.Message8477 field8494 = 5;
+  optional .benchmarks.google_message3.Message8454 field8495 = 6;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8496 = 8;
+}
+
+message Message8479 {
+  optional .benchmarks.google_message3.Message8475 field8497 = 1;
+  optional .benchmarks.google_message3.Message7966 field8498 = 2;
+  optional .benchmarks.google_message3.Message8476 field8499 = 3;
+  optional .benchmarks.google_message3.Message8476 field8500 = 4;
+  optional string field8501 = 6;
+  optional string field8502 = 7;
+  optional .benchmarks.google_message3.Message7966 field8503 = 8;
+  optional .benchmarks.google_message3.Message8455 field8504 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8505 = 9;
+}
+
+message Message10319 {
+  optional .benchmarks.google_message3.Enum10325 field10340 = 1;
+  optional int32 field10341 = 4;
+  optional int32 field10342 = 5;
+  optional bytes field10343 = 3;
+  optional string field10344 = 2;
+  optional string field10345 = 6;
+  optional string field10346 = 7;
+}
+
+message Message4016 {
+  required int32 field4017 = 1;
+  required int32 field4018 = 2;
+  required int32 field4019 = 3;
+  required int32 field4020 = 4;
+}
+
+message Message12669 {
+  optional .benchmarks.google_message3.Message12559 field12681 = 1;
+  optional float field12682 = 2;
+  optional bool field12683 = 3;
+  optional .benchmarks.google_message3.Enum12670 field12684 = 4;
+}
+
+message Message12819 {
+  optional double field12834 = 1;
+  optional double field12835 = 2;
+  optional double field12836 = 3;
+  optional double field12837 = 4;
+  optional double field12838 = 5;
+  optional double field12839 = 6;
+}
+
+message Message12820 {
+  optional int32 field12840 = 1;
+  optional int32 field12841 = 2;
+  optional int32 field12842 = 3;
+  optional int32 field12843 = 8;
+  optional int32 field12844 = 4;
+  optional int32 field12845 = 5;
+  optional int32 field12846 = 6;
+  optional int32 field12847 = 7;
+}
+
+message Message12821 {
+  optional int32 field12848 = 1;
+  optional int32 field12849 = 2;
+  optional int32 field12850 = 3;
+  optional int32 field12851 = 4;
+  optional int32 field12852 = 5;
+}
+
+message Message12818 {
+  optional uint64 field12829 = 1;
+  optional int32 field12830 = 2;
+  optional int32 field12831 = 3;
+  optional int32 field12832 = 5;
+  repeated .benchmarks.google_message3.Message12817 field12833 = 4;
+}
+
+message Message16479 {
+  optional .benchmarks.google_message3.Message16480 field16484 = 1;
+  optional int32 field16485 = 5;
+  optional float field16486 = 2;
+  optional uint32 field16487 = 4;
+  optional bool field16488 = 3;
+  optional uint32 field16489 = 6;
+}
+
+message Message16722 {
+  optional string field16752 = 1;
+  optional string field16753 = 2;
+  optional string field16754 = 3;
+  optional int32 field16755 = 5;
+  optional string field16756 = 4;
+}
+
+message Message16724 {
+  optional int64 field16761 = 1;
+  optional float field16762 = 2;
+  optional int64 field16763 = 3;
+  optional int64 field16764 = 4;
+  optional bool field16765 = 5;
+  repeated string field16766 = 6;
+  repeated string field16767 = 7;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field16768 = 8;
+  optional bool field16769 = 9;
+  optional uint32 field16770 = 10;
+  optional .benchmarks.google_message3.Enum16728 field16771 = 11;
+  repeated int32 field16772 = 12;
+  optional bool field16773 = 13;
+}
+
+message Message17728 {
+}
+
+message Message24356 {
+  optional string field24559 = 1;
+  optional string field24560 = 2;
+  optional int32 field24561 = 14;
+  optional string field24562 = 3;
+  optional string field24563 = 4;
+  optional string field24564 = 5;
+  optional .benchmarks.google_message3.UnusedEnum field24565 = 13;
+  optional string field24566 = 6;
+  optional .benchmarks.google_message3.Enum24361 field24567 = 12;
+  optional string field24568 = 7;
+  optional string field24569 = 8;
+  optional string field24570 = 9;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24571 = 10;
+  repeated string field24572 = 11;
+  repeated string field24573 = 15;
+}
+
+message Message24376 {
+  optional string field24589 = 1;
+  optional string field24590 = 2;
+  optional string field24591 = 3;
+  required .benchmarks.google_message3.Message24377 field24592 = 4;
+  optional .benchmarks.google_message3.Message24317 field24593 = 5;
+  optional string field24594 = 6;
+  optional .benchmarks.google_message3.Message24378 field24595 = 7;
+  repeated string field24596 = 8;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24597 = 14;
+  repeated string field24598 = 9;
+  repeated string field24599 = 10;
+  repeated string field24600 = 11;
+  optional string field24601 = 12;
+  repeated string field24602 = 13;
+}
+
+message Message24366 {
+  optional string field24574 = 1;
+  optional string field24575 = 2;
+  optional string field24576 = 3;
+  optional int32 field24577 = 10;
+  optional string field24578 = 13;
+  optional string field24579 = 4;
+  optional string field24580 = 5;
+  optional .benchmarks.google_message3.UnusedEnum field24581 = 9;
+  optional string field24582 = 14;
+  optional .benchmarks.google_message3.UnusedEnum field24583 = 15;
+  optional string field24584 = 6;
+  optional string field24585 = 12;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24586 = 7;
+  repeated string field24587 = 8;
+  repeated string field24588 = 11;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
new file mode 100644
index 0000000..597cec6
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
@@ -0,0 +1,491 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_5.proto";
+import "datasets/google_message3/benchmark_message3_6.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message24346 {
+}
+
+message Message24401 {
+  optional .benchmarks.google_message3.Message24400 field24679 = 1;
+}
+
+message Message24402 {
+  optional .benchmarks.google_message3.Message24400 field24680 = 1;
+}
+
+message Message24379 {
+  optional string field24603 = 1;
+  optional string field24604 = 2;
+  optional string field24605 = 3;
+  required .benchmarks.google_message3.Message24380 field24606 = 4;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24607 = 5;
+  optional string field24608 = 6;
+  optional .benchmarks.google_message3.Message24381 field24609 = 7;
+  repeated string field24610 = 8;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24611 = 17;
+  repeated string field24612 = 9;
+  repeated string field24613 = 10;
+  repeated string field24614 = 11;
+  optional string field24615 = 14;
+  optional string field24616 = 12;
+  optional string field24617 = 16;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24618 = 13;
+  repeated string field24619 = 15;
+  repeated string field24620 = 18;
+}
+
+message Message27358 {
+  optional int32 field27415 = 1;
+  optional int32 field27416 = 2;
+}
+
+message Message34381 {
+  optional string field34398 = 1;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34399 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34400 = 3;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34401 = 4;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34402 = 5;
+  optional bool field34403 = 6;
+  optional bool field34404 = 7;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34405 = 8;
+  optional bool field34406 = 9;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34407 = 10;
+}
+
+message Message34619 {
+  optional double field34641 = 1;
+  optional double field34642 = 2;
+  optional double field34643 = 3;
+  optional double field34644 = 4;
+  optional double field34645 = 11;
+  optional double field34646 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field34647 = 100;
+}
+
+message Message730 {
+  optional string field897 = 19;
+  repeated string field898 = 27;
+  repeated string field899 = 28;
+  repeated string field900 = 21;
+  optional string field901 = 30;
+  repeated uint32 field902 = 20;
+  repeated uint32 field903 = 32;
+  repeated string field904 = 16;
+  repeated .benchmarks.google_message3.Message697 field905 = 6;
+  repeated .benchmarks.google_message3.Message704 field906 = 7;
+  repeated string field907 = 18;
+  repeated .benchmarks.google_message3.Message703 field908 = 8;
+  repeated string field909 = 9;
+  optional .benchmarks.google_message3.Message716 field910 = 10;
+  optional .benchmarks.google_message3.Message718 field911 = 11;
+  optional bool field912 = 14;
+  repeated .benchmarks.google_message3.Message715 field913 = 4;
+  repeated string field914 = 17;
+  repeated string field915 = 23;
+  repeated .benchmarks.google_message3.Message719 field916 = 24;
+  repeated .benchmarks.google_message3.Message728 field917 = 26;
+  repeated .benchmarks.google_message3.Message702 field918 = 35;
+  optional string field919 = 36;
+  repeated string field920 = 37;
+  optional int64 field921 = 38;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field922 = 39;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field923 = 1;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field924 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field925 = 3;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field926 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field927 = 13;
+  repeated string field928 = 22;
+  optional bytes field929 = 31;
+  extensions 25 to 25;
+  extensions 29 to 29;
+  extensions 34 to 34;
+  extensions 15 to 15;
+}
+
+message Message33958 {
+  optional string field33977 = 1;
+  optional string field33978 = 9;
+  repeated group Message33959 = 2 {
+    required string field33982 = 3;
+    optional string field33983 = 4;
+    optional string field33984 = 5;
+    optional fixed64 field33985 = 8;
+    optional bool field33986 = 10;
+    optional .benchmarks.google_message3.Message0 field33987 = 6;
+  }
+  optional .benchmarks.google_message3.Enum33960 field33980 = 7;
+  extend .benchmarks.google_message3.Message0 {
+    optional .benchmarks.google_message3.Message33958 field33981 = 10747482;
+  }
+}
+
+message Message6637 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6670 = 2;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field6671 = 1;
+  optional int32 field6672 = 3;
+  repeated string field6673 = 4;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6674 = 5;
+}
+
+message Message6643 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6683 = 3;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6684 = 4;
+  optional double field6685 = 5;
+  optional double field6686 = 6;
+  optional int32 field6687 = 1;
+  optional int32 field6688 = 2;
+  optional double field6689 = 9;
+  optional bytes field6690 = 10;
+  optional int32 field6691 = 11;
+  optional bool field6692 = 12;
+  optional bool field6693 = 13;
+  optional .benchmarks.google_message3.Message6578 field6694 = 15;
+  optional .benchmarks.google_message3.UnusedEnum field6695 = 16;
+  optional int64 field6696 = 17;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field6697 = 22;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6698 = 19;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6699 = 20;
+  optional int32 field6700 = 21;
+}
+
+message Message6126 {
+  required string field6152 = 1;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field6153 = 9;
+  optional int32 field6154 = 14;
+  optional bytes field6155 = 10;
+  optional .benchmarks.google_message3.Message6024 field6156 = 12;
+  optional int32 field6157 = 4;
+  optional string field6158 = 5;
+  optional int32 field6159 = 6;
+  repeated int32 field6160 = 2;
+  repeated int32 field6161 = 3;
+  repeated .benchmarks.google_message3.Message6052 field6162 = 7;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field6163 = 11;
+  optional .benchmarks.google_message3.Enum6065 field6164 = 15;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field6165 = 8;
+  optional bool field6166 = 13;
+  optional bool field6167 = 16;
+  optional bool field6168 = 18;
+  repeated .benchmarks.google_message3.Message6054 field6169 = 17;
+  optional int32 field6170 = 19;
+}
+
+message Message13083 {
+  optional float field13096 = 1;
+  repeated group Message13084 = 2 {
+    required float field13107 = 3;
+    required int32 field13108 = 4;
+    optional float field13109 = 5;
+    repeated .benchmarks.google_message3.Enum13092 field13110 = 6;
+  }
+  optional float field13098 = 44;
+  optional float field13099 = 45;
+  optional uint64 field13100 = 46;
+  optional float field13101 = 47;
+  optional group Message13085 = 16 {
+  }
+  repeated group Message13086 = 23 {
+  }
+  repeated group Message13087 = 29 {
+  }
+  optional .benchmarks.google_message3.UnusedEmptyMessage field13105 = 43;
+}
+
+message Message13088 {
+  repeated group Message13089 = 1 {
+    required string field13139 = 2;
+    optional float field13140 = 3;
+  }
+  optional int64 field13136 = 4;
+  optional bool field13137 = 5;
+}
+
+message Message10391 {
+  optional .benchmarks.google_message3.Enum10392 field10411 = 1;
+  optional .benchmarks.google_message3.UnusedEnum field10412 = 2;
+  optional int64 field10413 = 3;
+  optional string field10414 = 4;
+  optional string field10415 = 5;
+  optional bytes field10416 = 6;
+  optional bool field10417 = 8;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field10418 = 9;
+  optional bool field10419 = 10;
+}
+
+message Message11873 {
+  optional string field11876 = 1;
+  optional string field11877 = 4;
+  optional .benchmarks.google_message3.Message10573 field11878 = 5;
+  optional .benchmarks.google_message3.Message10582 field11879 = 6;
+  optional .benchmarks.google_message3.Message10824 field11880 = 7;
+  optional .benchmarks.google_message3.Message10773 field11881 = 12;
+  optional .benchmarks.google_message3.Message11866 field11882 = 8;
+  optional .benchmarks.google_message3.Message10818 field11883 = 13;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field11884 = 16;
+  optional .benchmarks.google_message3.Message10155 field11885 = 11;
+  optional .benchmarks.google_message3.Message10469 field11886 = 14;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field11887 = 15;
+  extensions 9 to 9;
+  extensions 10 to 10;
+}
+
+message Message35506 {
+  optional int32 field35524 = 1;
+  optional string field35525 = 2;
+  optional .benchmarks.google_message3.Enum35507 field35526 = 3;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field35527 = 4;
+}
+
+message Message13151 {
+  repeated .benchmarks.google_message3.Message13145 field13158 = 1;
+}
+
+message Message18253 {
+  repeated group Message18254 = 1 {
+    required fixed64 field18362 = 2;
+    required double field18363 = 3;
+  }
+}
+
+message Message16685 {
+  repeated .benchmarks.google_message3.Message16686 field16694 = 2;
+}
+
+message Message16816 {
+  optional float field16826 = 1;
+  optional .benchmarks.google_message3.Enum16819 field16827 = 2;
+  optional float field16828 = 3;
+  repeated group Message16817 = 4 {
+  }
+  optional bool field16830 = 7;
+  optional bool field16831 = 8;
+  repeated group Message16818 = 12 {
+  }
+  optional string field16833 = 10;
+  optional bool field16834 = 13;
+  optional bool field16835 = 14;
+}
+
+message Message13168 {
+  required int32 field13212 = 1;
+  optional fixed64 field13213 = 7;
+  optional bool field13214 = 8;
+  optional fixed64 field13215 = 10;
+  optional bool field13216 = 11;
+  optional .benchmarks.google_message3.Message12796 field13217 = 9;
+  required double field13218 = 2;
+  required bool field13219 = 3;
+  optional int32 field13220 = 4;
+  required bool field13221 = 5;
+  optional int32 field13222 = 6;
+}
+
+message Message13167 {
+  required int32 field13199 = 1;
+  optional int32 field13200 = 2;
+  optional int32 field13201 = 3;
+  optional bool field13202 = 8;
+  optional fixed64 field13203 = 12;
+  optional bool field13204 = 13;
+  optional .benchmarks.google_message3.Message12796 field13205 = 11;
+  optional fixed64 field13206 = 9;
+  optional bool field13207 = 10;
+  repeated int32 field13208 = 4;
+  optional int32 field13209 = 5;
+  optional int32 field13210 = 6;
+  optional int32 field13211 = 7;
+}
+
+message Message1374 {
+  required string field1375 = 1;
+  optional string field1376 = 2;
+}
+
+message Message18943 {
+}
+
+message Message18944 {
+}
+
+message Message18856 {
+  optional string field18857 = 1;
+  optional string field18858 = 2;
+  optional bool field18859 = 31;
+  optional string field18860 = 26;
+  optional string field18861 = 3;
+  optional string field18862 = 4;
+  optional string field18863 = 5;
+  optional string field18864 = 17;
+  optional string field18865 = 6;
+  optional string field18866 = 7;
+  optional string field18867 = 8;
+  optional string field18868 = 9;
+  optional string field18869 = 10;
+  optional string field18870 = 11;
+  optional string field18871 = 21;
+  optional string field18872 = 18;
+  optional string field18873 = 19;
+  optional string field18874 = 20;
+  optional string field18875 = 22;
+  optional string field18876 = 23;
+  optional string field18877 = 24;
+  optional string field18878 = 25;
+  optional string field18879 = 12;
+  optional string field18880 = 13;
+  optional string field18881 = 29;
+  optional string field18882 = 30;
+  optional string field18883 = 15;
+  optional string field18884 = 16;
+  repeated string field18885 = 14;
+  optional string field18886 = 27;
+  optional string field18887 = 28;
+}
+
+message Message3850 {
+  optional .benchmarks.google_message3.Enum3851 field3924 = 2;
+  optional bool field3925 = 12;
+  optional int32 field3926 = 4;
+  optional bool field3927 = 10;
+  optional bool field3928 = 13;
+  optional bool field3929 = 14;
+}
+
+message Message6721 {
+  optional .benchmarks.google_message3.Message6722 field6744 = 1;
+  optional bool field6745 = 2;
+  optional bool field6746 = 3;
+  optional bool field6747 = 4;
+}
+
+message Message6742 {
+  optional bool field6758 = 1;
+}
+
+message Message6726 {
+  optional int64 field6752 = 1;
+  repeated .benchmarks.google_message3.Message6727 field6753 = 2;
+}
+
+message Message6733 {
+  optional int64 field6754 = 1;
+  optional int64 field6755 = 2;
+  optional bool field6756 = 3;
+}
+
+message Message6723 {
+  optional int64 field6748 = 1;
+  repeated .benchmarks.google_message3.Message6724 field6749 = 2;
+}
+
+message Message6725 {
+  optional int32 field6750 = 1;
+  optional int32 field6751 = 2;
+}
+
+message Message6734 {
+  repeated .benchmarks.google_message3.Message6735 field6757 = 1;
+}
+
+message Message8184 {
+  optional .benchmarks.google_message3.Message7966 field8228 = 1;
+  optional bool field8229 = 2;
+  repeated .benchmarks.google_message3.Message8183 field8230 = 3;
+}
+
+message Message8477 {
+  optional .benchmarks.google_message3.Message7966 field8486 = 1;
+  optional int64 field8487 = 2;
+  optional string field8488 = 3;
+}
+
+message Message8454 {
+  optional .benchmarks.google_message3.Message8449 field8465 = 1;
+  optional int64 field8466 = 3;
+  optional int32 field8467 = 4;
+  optional bool field8468 = 5;
+  extend .benchmarks.google_message3.Message8301 {
+    optional .benchmarks.google_message3.Message8454 field8469 = 66;
+  }
+}
+
+message Message8476 {
+  optional string field8483 = 1;
+  optional string field8484 = 2;
+  optional string field8485 = 3;
+}
+
+message Message8455 {
+  optional .benchmarks.google_message3.Message8449 field8470 = 1;
+  repeated .benchmarks.google_message3.Message8456 field8471 = 2;
+  optional .benchmarks.google_message3.Message8457 field8472 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8473 = 6;
+  extend .benchmarks.google_message3.Message8302 {
+    optional .benchmarks.google_message3.Message8455 field8474 = 66;
+  }
+}
+
+message Message8475 {
+  optional string field8481 = 1;
+  optional int64 field8482 = 2;
+}
+
+message Message12559 {
+}
+
+message Message12817 {
+  optional int32 field12826 = 1;
+  optional int32 field12827 = 2;
+  optional int32 field12828 = 3;
+}
+
+message Message16480 {
+  optional .benchmarks.google_message3.Message13358 field16490 = 1;
+  optional .benchmarks.google_message3.Enum16042 field16491 = 2;
+  optional .benchmarks.google_message3.Message13912 field16492 = 3;
+  optional string field16493 = 4;
+  optional string field16494 = 5;
+  optional string field16495 = 6;
+  optional string field16496 = 7;
+  optional .benchmarks.google_message3.Message13358 field16497 = 8;
+  optional fixed32 field16498 = 9;
+}
+
+message Message24317 {
+  optional string field24446 = 1;
+  optional .benchmarks.google_message3.Message24312 field24447 = 2;
+  repeated .benchmarks.google_message3.Message24315 field24448 = 3;
+  repeated .benchmarks.google_message3.Message24313 field24449 = 4;
+  repeated .benchmarks.google_message3.Message24316 field24450 = 5;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field24451 = 6;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field24452 = 7;
+  repeated string field24453 = 8;
+  repeated string field24454 = 9;
+  repeated string field24455 = 10;
+  repeated string field24456 = 28;
+  optional string field24457 = 11;
+  optional string field24458 = 12;
+  optional string field24459 = 13;
+  optional string field24460 = 14;
+  repeated string field24461 = 15;
+  optional string field24462 = 16;
+  repeated string field24463 = 17;
+  repeated string field24464 = 18;
+  repeated string field24465 = 19;
+  repeated string field24466 = 20;
+  repeated string field24467 = 21;
+  repeated string field24468 = 22;
+  repeated string field24469 = 23;
+  repeated string field24470 = 24;
+  optional string field24471 = 25;
+  optional string field24472 = 26;
+  repeated string field24473 = 27;
+  optional bool field24474 = 40;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
new file mode 100644
index 0000000..bc6cbc1
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
@@ -0,0 +1,473 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_6.proto";
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message24377 {
+}
+
+message Message24378 {
+}
+
+message Message24400 {
+  optional int32 field24674 = 1;
+  optional int32 field24675 = 2;
+  optional int32 field24676 = 3;
+  optional int32 field24677 = 4;
+  optional int32 field24678 = 5;
+}
+
+message Message24380 {
+}
+
+message Message24381 {
+}
+
+message Message719 {
+  repeated string field881 = 1;
+  repeated string field882 = 2;
+  repeated string field883 = 3;
+  optional .benchmarks.google_message3.Enum720 field884 = 4;
+}
+
+message Message728 {
+  required string field887 = 1;
+  repeated string field888 = 2;
+  repeated .benchmarks.google_message3.Message703 field889 = 3;
+  repeated .benchmarks.google_message3.Message715 field890 = 4;
+  repeated string field891 = 5;
+  repeated string field892 = 6;
+  optional .benchmarks.google_message3.Message718 field893 = 7;
+  optional .benchmarks.google_message3.Message716 field894 = 8;
+  repeated string field895 = 9;
+  extensions 10 to 10;
+  extensions 11 to 11;
+  extensions 12 to 12;
+}
+
+message Message704 {
+  optional string field800 = 1;
+  optional string field801 = 7;
+  optional string field802 = 2;
+  optional string field803 = 3;
+  optional string field804 = 4;
+  optional string field805 = 5;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field806 = 6;
+}
+
+message Message697 {
+  optional string field743 = 7;
+  repeated string field744 = 1;
+  repeated string field745 = 2;
+  repeated string field746 = 33;
+  repeated string field747 = 29;
+  repeated string field748 = 30;
+  repeated string field749 = 31;
+  repeated string field750 = 32;
+  repeated string field751 = 13;
+  repeated string field752 = 6;
+  repeated string field753 = 3;
+  repeated string field754 = 14;
+  repeated string field755 = 15;
+  repeated string field756 = 16;
+  repeated string field757 = 4;
+  repeated string field758 = 34;
+  repeated string field759 = 35;
+  repeated string field760 = 5;
+  repeated string field761 = 17;
+  repeated string field762 = 18;
+  repeated string field763 = 19;
+  optional bool field764 = 36;
+  repeated string field765 = 8;
+  repeated string field766 = 9;
+  optional string field767 = 27;
+  optional bool field768 = 25;
+  optional .benchmarks.google_message3.Message700 field769 = 10;
+  optional bool field770 = 11;
+  optional bool field771 = 24;
+  repeated string field772 = 12;
+  repeated string field773 = 20;
+  repeated string field774 = 21;
+  repeated string field775 = 22;
+  repeated .benchmarks.google_message3.Message699 field776 = 23;
+  repeated .benchmarks.google_message3.Message698 field777 = 37;
+  optional int64 field778 = 38;
+  extensions 28 to 28;
+  extensions 26 to 26;
+}
+
+message Message0 {
+  option message_set_wire_format = true;
+  extensions 4 to 2147483646;
+}
+
+message Message6578 {
+  optional .benchmarks.google_message3.Enum6579 field6632 = 1;
+  optional .benchmarks.google_message3.Enum6588 field6633 = 2;
+}
+
+message Message6024 {
+  optional .benchmarks.google_message3.Enum6025 field6048 = 1;
+  optional string field6049 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field6050 = 3;
+}
+
+message Message6052 {
+  required string field6084 = 1;
+  required bytes field6085 = 2;
+}
+
+message Message6054 {
+  required string field6089 = 1;
+  optional string field6090 = 2;
+}
+
+message Message10573 {
+  repeated .benchmarks.google_message3.Message10576 field10580 = 1;
+  optional string field10581 = 2;
+  extensions 10000 to 536870911;
+}
+
+message Message10824 {
+  required string field10825 = 1;
+  optional int32 field10826 = 2;
+}
+
+message Message10582 {
+  required bool field10583 = 1;
+  required double field10584 = 2;
+  optional bool field10585 = 3;
+  optional double field10586 = 4;
+  optional double field10587 = 5;
+  optional bool field10588 = 6;
+}
+
+message Message10155 {
+  required int32 field10195 = 1;
+  required int32 field10196 = 2;
+  optional .benchmarks.google_message3.Enum10157 field10197 = 59;
+  optional int32 field10198 = 18;
+  optional int32 field10199 = 19;
+  optional int32 field10200 = 21;
+  repeated group Message10156 = 50 {
+    optional .benchmarks.google_message3.Enum8862 field10266 = 51;
+    optional int32 field10267 = 52;
+    optional int32 field10268 = 53;
+    optional int32 field10269 = 54;
+  }
+  optional int32 field10202 = 3;
+  optional int32 field10203 = 4;
+  optional int32 field10204 = 5;
+  optional bool field10205 = 84;
+  optional bool field10206 = 33;
+  optional int32 field10207 = 75;
+  optional float field10208 = 26;
+  optional int32 field10209 = 27;
+  optional int32 field10210 = 49;
+  optional int32 field10211 = 10;
+  optional float field10212 = 78;
+  optional .benchmarks.google_message3.Message9151 field10213 = 91;
+  optional int32 field10214 = 11;
+  optional int32 field10215 = 12;
+  optional float field10216 = 41;
+  optional .benchmarks.google_message3.Message10154 field10217 = 61;
+  optional int32 field10218 = 23;
+  optional bytes field10219 = 24;
+  optional int32 field10220 = 65;
+  repeated bytes field10221 = 66;
+  optional int32 field10222 = 70;
+  optional bytes field10223 = 71;
+  repeated fixed64 field10224 = 73;
+  optional float field10225 = 29;
+  optional int32 field10226 = 30;
+  optional float field10227 = 31;
+  optional int32 field10228 = 32;
+  optional float field10229 = 34;
+  optional int32 field10230 = 35;
+  optional string field10231 = 22;
+  optional fixed64 field10232 = 13;
+  optional fixed64 field10233 = 20;
+  optional bool field10234 = 79;
+  repeated .benchmarks.google_message3.Enum10167 field10235 = 80 [packed = true];
+  optional int32 field10236 = 14;
+  optional int32 field10237 = 15;
+  optional int32 field10238 = 28;
+  repeated string field10239 = 16;
+  optional .benchmarks.google_message3.Message9182 field10240 = 17;
+  optional int32 field10241 = 63;
+  optional float field10242 = 64;
+  optional float field10243 = 37;
+  repeated float field10244 = 43;
+  optional int32 field10245 = 44;
+  optional .benchmarks.google_message3.Message9242 field10246 = 45;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field10247 = 46;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field10248 = 62;
+  optional .benchmarks.google_message3.Message8944 field10249 = 48;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field10250 = 87;
+  optional int32 field10251 = 58;
+  optional int32 field10252 = 92;
+  optional .benchmarks.google_message3.Message9123 field10253 = 93;
+  optional .benchmarks.google_message3.Message9160 field10254 = 60;
+  optional .benchmarks.google_message3.Message8890 field10255 = 67;
+  optional string field10256 = 69;
+  optional int64 field10257 = 74;
+  optional float field10258 = 82;
+  optional float field10259 = 85;
+  optional float field10260 = 86;
+  optional int64 field10261 = 83;
+  optional string field10262 = 77;
+  optional bool field10263 = 88;
+  repeated .benchmarks.google_message3.Message9628 field10264 = 94;
+  extensions 57 to 57;
+  extensions 1000 to 536870911;
+}
+
+message Message11866 {
+  required .benchmarks.google_message3.Message11014 field11868 = 1;
+  optional bool field11869 = 2;
+  optional double field11870 = 3;
+  optional double field11871 = 4;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field11872 = 5;
+}
+
+message Message10469 {
+  optional string field10473 = 1;
+  optional float field10474 = 2;
+  optional int32 field10475 = 3;
+  optional int32 field10476 = 4;
+  optional int32 field10477 = 5;
+  optional bool field10478 = 6;
+  optional bool field10479 = 7;
+  optional int32 field10480 = 8;
+  optional float field10481 = 9;
+}
+
+message Message10818 {
+  optional .benchmarks.google_message3.Message10800 field10819 = 1;
+  optional .benchmarks.google_message3.Message10801 field10820 = 2;
+}
+
+message Message10773 {
+  optional bool field10774 = 9;
+  optional bool field10775 = 1;
+  optional bool field10776 = 23;
+  optional bool field10777 = 2;
+  optional bool field10778 = 3;
+  optional int32 field10779 = 4;
+  optional int32 field10780 = 5;
+  optional int32 field10781 = 6;
+  optional int32 field10782 = 7;
+  optional int32 field10783 = 8;
+  optional int32 field10784 = 10;
+  optional .benchmarks.google_message3.Message10749 field10785 = 11;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field10786 = 12;
+  optional bool field10787 = 13;
+  optional bool field10788 = 15;
+  optional bool field10789 = 16;
+  optional int32 field10790 = 17;
+  optional int32 field10791 = 18;
+  optional bool field10792 = 19;
+  optional bool field10793 = 20;
+  optional bool field10794 = 21;
+  optional .benchmarks.google_message3.UnusedEnum field10795 = 14;
+  optional .benchmarks.google_message3.UnusedEnum field10796 = 22;
+}
+
+message Message13145 {
+  required .benchmarks.google_message3.Enum13146 field13155 = 1;
+  optional float field13156 = 2;
+  optional float field13157 = 3;
+  extensions 1000 to 536870911;
+}
+
+message Message16686 {
+}
+
+message Message12796 {
+  repeated fixed64 field12800 = 1;
+  optional uint64 field12801 = 2;
+}
+
+message Message6722 {
+}
+
+message Message6727 {
+}
+
+message Message6724 {
+}
+
+message Message6735 {
+}
+
+message Message8183 {
+  optional string field8226 = 1;
+  optional string field8227 = 2;
+}
+
+message Message8301 {
+  optional string field8328 = 1;
+  optional .benchmarks.google_message3.Message7966 field8329 = 2;
+  optional string field8330 = 3;
+  optional string field8331 = 4;
+  repeated .benchmarks.google_message3.Message8290 field8332 = 5;
+  optional .benchmarks.google_message3.Message7966 field8333 = 6;
+  repeated .benchmarks.google_message3.Message8298 field8334 = 7;
+  optional .benchmarks.google_message3.Message8300 field8335 = 8;
+  optional int64 field8336 = 9;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8337 = 10;
+  optional .benchmarks.google_message3.Message7965 field8338 = 11;
+  extensions 64 to 536870911;
+}
+
+message Message8456 {
+}
+
+message Message8302 {
+  optional string field8339 = 1;
+  optional .benchmarks.google_message3.Message7966 field8340 = 2;
+  optional string field8341 = 3;
+  optional string field8342 = 4;
+  optional string field8343 = 5;
+  optional string field8344 = 6;
+  optional string field8345 = 7;
+  optional int64 field8346 = 8;
+  optional int64 field8347 = 9;
+  repeated .benchmarks.google_message3.Message8290 field8348 = 10;
+  optional string field8349 = 11;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8350 = 12;
+  optional .benchmarks.google_message3.Message8291 field8351 = 13;
+  optional int64 field8352 = 14;
+  optional .benchmarks.google_message3.Message8296 field8353 = 15;
+  optional string field8354 = 16;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field8355 = 17;
+  repeated int32 field8356 = 18;
+  repeated int32 field8357 = 19;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field8358 = 20;
+  optional .benchmarks.google_message3.Message7965 field8359 = 21;
+  extensions 64 to 536870911;
+}
+
+message Message8457 {
+}
+
+message Message8449 {
+  optional string field8458 = 1;
+  optional bool field8459 = 2;
+  optional .benchmarks.google_message3.Enum8450 field8460 = 3;
+  repeated string field8461 = 4;
+  optional string field8462 = 5;
+  optional string field8463 = 6;
+  optional .benchmarks.google_message3.Message7966 field8464 = 7;
+}
+
+message Message13358 {
+  required fixed64 field13359 = 1;
+  required fixed64 field13360 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field13361 = 3;
+}
+
+message Message13912 {
+  required fixed32 field13913 = 1;
+  required fixed32 field13914 = 2;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field13915 = 500;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field13916 = 15;
+}
+
+message Message24316 {
+  repeated string field24443 = 1;
+  repeated string field24444 = 2;
+  repeated string field24445 = 3;
+}
+
+message Message24312 {
+  optional string field24421 = 1;
+  optional string field24422 = 2;
+  repeated string field24423 = 3;
+  repeated string field24424 = 4;
+  repeated string field24425 = 5;
+  repeated string field24426 = 6;
+}
+
+message Message24313 {
+  optional string field24427 = 1;
+  optional string field24428 = 2;
+  repeated string field24429 = 3;
+  optional string field24430 = 4;
+  optional string field24431 = 5;
+  optional string field24432 = 6;
+  optional string field24433 = 7;
+  repeated string field24434 = 8;
+  optional string field24435 = 9;
+  repeated string field24436 = 10;
+}
+
+message Message24315 {
+  required string field24440 = 1;
+  repeated string field24441 = 2;
+  repeated string field24442 = 3;
+}
+
+message Message716 {
+  required string field872 = 1;
+  required int32 field873 = 2;
+  optional bool field874 = 3;
+  optional .benchmarks.google_message3.Message717 field875 = 4;
+}
+
+message Message718 {
+  repeated string field878 = 1;
+  repeated string field879 = 2;
+  optional string field880 = 3;
+}
+
+message Message703 {
+  required string field795 = 1;
+  repeated string field796 = 2;
+  repeated string field797 = 3;
+  optional string field798 = 4;
+  repeated string field799 = 5;
+}
+
+message Message715 {
+  required string field859 = 1;
+  optional string field860 = 7;
+  repeated .benchmarks.google_message3.Message707 field861 = 2;
+  repeated .benchmarks.google_message3.Message708 field862 = 3;
+  repeated .benchmarks.google_message3.Message711 field863 = 4;
+  repeated .benchmarks.google_message3.Message712 field864 = 5;
+  repeated .benchmarks.google_message3.Message713 field865 = 6;
+  repeated .benchmarks.google_message3.Message714 field866 = 8;
+  repeated .benchmarks.google_message3.Message710 field867 = 9;
+  repeated .benchmarks.google_message3.Message709 field868 = 10;
+  repeated .benchmarks.google_message3.Message705 field869 = 11;
+  repeated .benchmarks.google_message3.Message702 field870 = 12;
+  repeated .benchmarks.google_message3.Message706 field871 = 13;
+}
+
+message Message700 {
+  repeated string field789 = 1;
+  repeated string field790 = 2;
+}
+
+message Message699 {
+  required string field787 = 1;
+  repeated string field788 = 2;
+}
+
+message Message698 {
+  optional string field779 = 1;
+  optional string field780 = 2;
+  optional string field781 = 3;
+  optional string field782 = 4;
+  optional uint64 field783 = 5;
+  optional uint32 field784 = 6;
+  optional int64 field785 = 7;
+  repeated string field786 = 8;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
new file mode 100644
index 0000000..98e1529
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
@@ -0,0 +1,454 @@
+syntax = "proto2";
+
+import "datasets/google_message3/benchmark_message3_7.proto";
+import "datasets/google_message3/benchmark_message3_8.proto";
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message10576 {
+}
+
+message Message10154 {
+  optional bytes field10192 = 1;
+  optional int32 field10193 = 2;
+}
+
+message Message8944 {
+  optional string field9045 = 2;
+  optional string field9046 = 3;
+  optional string field9047 = 23;
+  optional string field9048 = 52;
+  optional int32 field9049 = 53;
+  optional int32 field9050 = 54;
+  optional float field9051 = 55;
+  optional float field9052 = 56;
+  optional string field9053 = 57;
+  optional int64 field9054 = 1;
+  optional bool field9055 = 4;
+  optional int32 field9056 = 5;
+  optional int32 field9057 = 6;
+  optional int32 field9058 = 7;
+  optional float field9059 = 8;
+  optional float field9060 = 11;
+  optional float field9061 = 9;
+  optional float field9062 = 10;
+  optional float field9063 = 13;
+  optional bool field9064 = 14;
+  optional float field9065 = 70;
+  optional int32 field9066 = 71;
+  optional .benchmarks.google_message3.Enum8945 field9067 = 15;
+  optional int32 field9068 = 16;
+  optional int32 field9069 = 17;
+  optional float field9070 = 18;
+  optional float field9071 = 19;
+  optional int32 field9072 = 28;
+  optional int32 field9073 = 29;
+  optional float field9074 = 60;
+  optional float field9075 = 61;
+  optional int32 field9076 = 72;
+  optional int32 field9077 = 73;
+  optional .benchmarks.google_message3.Enum8951 field9078 = 62;
+  optional string field9079 = 20;
+  optional string field9080 = 21;
+  optional string field9081 = 22;
+  optional double field9082 = 31;
+  optional double field9083 = 32;
+  optional double field9084 = 33;
+  optional double field9085 = 36;
+  optional .benchmarks.google_message3.UnusedEnum field9086 = 37;
+  optional double field9087 = 38;
+  optional double field9088 = 39;
+  optional double field9089 = 63;
+  optional double field9090 = 64;
+  optional double field9091 = 65;
+  optional double field9092 = 34;
+  optional .benchmarks.google_message3.UnusedEnum field9093 = 35;
+  optional .benchmarks.google_message3.UnusedEnum field9094 = 66;
+  optional string field9095 = 40;
+  optional string field9096 = 41;
+  optional string field9097 = 42;
+  optional string field9098 = 43;
+  optional string field9099 = 44;
+  optional string field9100 = 45;
+  optional string field9101 = 46;
+  optional string field9102 = 47;
+  optional string field9103 = 48;
+  optional string field9104 = 49;
+  optional .benchmarks.google_message3.Message8939 field9105 = 100;
+  optional int64 field9106 = 101;
+}
+
+message Message9182 {
+  optional string field9205 = 1;
+  optional string field9206 = 2;
+  optional float field9207 = 16;
+  optional int32 field9208 = 17;
+  optional int32 field9209 = 27;
+  optional int32 field9210 = 7;
+  optional int32 field9211 = 8;
+  optional float field9212 = 26;
+  optional float field9213 = 22;
+  optional bool field9214 = 28;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field9215 = 21;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field9216 = 25;
+  repeated .benchmarks.google_message3.Message9181 field9217 = 29;
+  optional bool field9218 = 18;
+  optional bool field9219 = 19;
+  optional bool field9220 = 20;
+  optional .benchmarks.google_message3.Message9164 field9221 = 30;
+  optional .benchmarks.google_message3.Message9165 field9222 = 31;
+  optional .benchmarks.google_message3.Message9166 field9223 = 32;
+  optional float field9224 = 33;
+  optional .benchmarks.google_message3.Message9151 field9225 = 34;
+  optional float field9226 = 35;
+  optional float field9227 = 36;
+  optional float field9228 = 37;
+  optional float field9229 = 38;
+  optional float field9230 = 39;
+  extensions 3 to 6;
+  extensions 9 to 15;
+  extensions 23 to 23;
+  extensions 24 to 24;
+  extensions 1000 to 536870911;
+}
+
+message Message9160 {
+  optional int32 field9161 = 1;
+  optional bytes field9162 = 2;
+}
+
+message Message9242 {
+  repeated .benchmarks.google_message3.Enum9243 field9327 = 1;
+}
+
+message Message8890 {
+  repeated .benchmarks.google_message3.Message8888 field8916 = 1;
+}
+
+message Message9123 {
+  optional float field9135 = 1;
+}
+
+message Message9628 {
+  optional .benchmarks.google_message3.Message9627 field9673 = 1;
+  optional string field9674 = 2;
+  repeated int32 field9675 = 3;
+  optional int32 field9676 = 4;
+}
+
+message Message11014 {
+  optional int32 field11780 = 40;
+  optional string field11781 = 46;
+  optional bool field11782 = 47;
+  optional .benchmarks.google_message3.Enum11107 field11783 = 1;
+  optional int32 field11784 = 2;
+  optional double field11785 = 4;
+  optional int32 field11786 = 5;
+  optional int32 field11787 = 6;
+  optional double field11788 = 7;
+  optional double field11789 = 8;
+  optional int64 field11790 = 9;
+  optional bool field11791 = 10;
+  optional int64 field11792 = 28;
+  optional bool field11793 = 37;
+  optional .benchmarks.google_message3.Enum11541 field11794 = 44;
+  optional double field11795 = 49;
+  optional double field11796 = 51;
+  optional int64 field11797 = 54;
+  optional int64 field11798 = 55;
+  optional .benchmarks.google_message3.UnusedEnum field11799 = 57;
+  optional .benchmarks.google_message3.Enum11468 field11800 = 58;
+  optional int32 field11801 = 59;
+  optional .benchmarks.google_message3.UnusedEnum field11802 = 60;
+  optional int32 field11803 = 61;
+  optional int32 field11804 = 62;
+  optional int32 field11805 = 69;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field11806 = 68;
+  repeated .benchmarks.google_message3.Message11018 field11807 = 71;
+  optional bool field11808 = 50;
+  optional bool field11809 = 56;
+  optional bool field11810 = 66;
+  optional bool field11811 = 63;
+  optional bool field11812 = 64;
+  optional bool field11813 = 65;
+  optional bool field11814 = 67;
+  optional .benchmarks.google_message3.Enum11107 field11815 = 15;
+  optional int64 field11816 = 16;
+  optional double field11817 = 17;
+  optional int64 field11818 = 18;
+  optional int32 field11819 = 19;
+  optional int64 field11820 = 20;
+  optional int32 field11821 = 42;
+  optional int64 field11822 = 52;
+  optional int64 field11823 = 53;
+  optional int64 field11824 = 41;
+  optional double field11825 = 48;
+  repeated .benchmarks.google_message3.Message11020 field11826 = 70;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field11827 = 72;
+  optional double field11828 = 25;
+  optional string field11829 = 26;
+  optional int64 field11830 = 27;
+  optional int64 field11831 = 32;
+  optional uint64 field11832 = 33;
+  optional bool field11833 = 29;
+  optional bool field11834 = 34;
+  optional string field11835 = 30;
+  optional int32 field11836 = 3;
+  optional int32 field11837 = 31;
+  optional int32 field11838 = 73;
+  optional int32 field11839 = 35;
+  optional .benchmarks.google_message3.Enum11022 field11840 = 36;
+  optional .benchmarks.google_message3.Message11013 field11841 = 38;
+  optional double field11842 = 39;
+  optional int32 field11843 = 45;
+  optional bool field11844 = 74;
+}
+
+message Message10801 {
+  optional .benchmarks.google_message3.Message10800 field10812 = 1;
+  repeated .benchmarks.google_message3.Message10802 field10813 = 2;
+  optional int32 field10814 = 3;
+}
+
+message Message10749 {
+  repeated .benchmarks.google_message3.Message10748 field10754 = 1;
+}
+
+message Message8298 {
+  optional .benchmarks.google_message3.Message7966 field8321 = 1;
+  optional int64 field8322 = 2;
+  optional string field8323 = 3;
+}
+
+message Message8300 {
+  optional string field8326 = 1;
+  optional .benchmarks.google_message3.Message7966 field8327 = 2;
+}
+
+message Message8291 {
+  optional string field8306 = 1;
+  optional int32 field8307 = 2;
+  optional string field8308 = 3;
+  optional string field8309 = 4;
+  optional .benchmarks.google_message3.Enum8292 field8310 = 5;
+}
+
+message Message8296 {
+  optional .benchmarks.google_message3.Message7966 field8311 = 1;
+  optional string field8312 = 2;
+  optional .benchmarks.google_message3.Message7966 field8313 = 3;
+  optional int32 field8314 = 4;
+  optional int32 field8315 = 5;
+  optional string field8316 = 6;
+}
+
+message Message7965 {
+  optional int32 field7967 = 1;
+  optional int32 field7968 = 2;
+}
+
+message Message8290 {
+  optional string field8304 = 1;
+  optional string field8305 = 2;
+}
+
+message Message717 {
+  repeated string field876 = 1;
+  optional double field877 = 2;
+}
+
+message Message713 {
+  required .benchmarks.google_message3.Message708 field852 = 1;
+  repeated string field853 = 2;
+}
+
+message Message705 {
+  required string field807 = 1;
+  optional string field808 = 2;
+  optional string field809 = 3;
+  optional bool field810 = 4;
+  optional string field811 = 5;
+  optional string field812 = 6;
+  repeated string field813 = 7;
+}
+
+message Message709 {
+  repeated string field829 = 1;
+  repeated string field830 = 2;
+  repeated string field831 = 3;
+  repeated string field832 = 4;
+  repeated string field833 = 5;
+}
+
+message Message702 {
+  optional string field793 = 1;
+  optional string field794 = 2;
+}
+
+message Message714 {
+  optional string field854 = 1;
+  optional string field855 = 2;
+  optional string field856 = 3;
+  optional string field857 = 4;
+  optional uint32 field858 = 5;
+}
+
+message Message710 {
+  repeated string field834 = 1;
+  optional string field835 = 2;
+  optional string field836 = 3;
+  repeated string field837 = 4;
+  repeated string field838 = 5;
+}
+
+message Message706 {
+  repeated string field814 = 1;
+  optional string field815 = 2;
+  repeated string field816 = 3;
+  repeated string field817 = 4;
+}
+
+message Message707 {
+  required string field818 = 1;
+  required string field819 = 2;
+  required string field820 = 3;
+  optional bool field821 = 4;
+  repeated string field822 = 5;
+}
+
+message Message711 {
+  optional .benchmarks.google_message3.UnusedEmptyMessage field839 = 1;
+  repeated string field840 = 4;
+  repeated string field841 = 2;
+  repeated string field842 = 3;
+}
+
+message Message712 {
+  repeated string field843 = 1;
+  required string field844 = 2;
+  optional string field845 = 3;
+  repeated string field846 = 4;
+  repeated string field847 = 5;
+  optional string field848 = 6;
+  repeated string field849 = 7;
+  optional string field850 = 8;
+  optional string field851 = 9;
+}
+
+message Message8939 {
+  optional string field9010 = 1;
+  optional string field9011 = 2;
+  optional string field9012 = 3;
+  repeated string field9013 = 4;
+  optional string field9014 = 5;
+  repeated group Message8940 = 11 {
+  }
+  optional int64 field9016 = 21;
+  optional int64 field9017 = 22;
+  optional int64 field9018 = 23;
+  optional group Message8941 = 31 {
+    optional string field9033 = 32;
+    optional string field9034 = 33;
+    optional string field9035 = 34;
+    optional string field9036 = 35;
+    optional string field9037 = 36;
+    optional string field9038 = 37;
+  }
+  optional .benchmarks.google_message3.Message8942 field9020 = 38;
+  repeated .benchmarks.google_message3.UnusedEmptyMessage field9021 = 39;
+  repeated string field9022 = 41;
+  optional string field9023 = 42;
+  optional string field9024 = 43;
+  optional string field9025 = 44;
+  optional string field9026 = 45;
+  optional string field9027 = 46;
+  optional string field9028 = 47;
+  optional .benchmarks.google_message3.UnusedEnum field9029 = 48;
+  optional .benchmarks.google_message3.UnusedEnum field9030 = 49;
+  optional group Message8943 = 51 {
+    optional string field9039 = 1;
+    optional string field9040 = 2;
+    optional string field9041 = 3;
+    optional string field9042 = 4;
+    optional string field9043 = 5;
+    optional string field9044 = 6;
+  }
+}
+
+message Message9181 {
+  optional string field9204 = 1;
+}
+
+message Message9164 {
+  optional int32 field9168 = 1;
+  optional int32 field9169 = 2;
+  optional int32 field9170 = 3;
+}
+
+message Message9165 {
+  optional float field9171 = 1;
+  optional float field9172 = 2;
+}
+
+message Message9166 {
+  optional float field9173 = 1;
+  optional int32 field9174 = 2;
+}
+
+message Message9151 {
+  optional double field9152 = 1;
+  optional double field9153 = 2;
+  optional float field9154 = 3;
+  optional float field9155 = 4;
+  optional float field9156 = 5;
+  optional float field9157 = 6;
+  optional float field9158 = 7;
+  optional float field9159 = 8;
+}
+
+message Message8888 {
+  optional int32 field8908 = 1;
+  optional .benchmarks.google_message3.Enum8900 field8909 = 4;
+  repeated int32 field8910 = 2 [packed = true];
+  optional bytes field8911 = 3;
+}
+
+message Message9627 {
+  required int32 field9668 = 1;
+  required int32 field9669 = 2;
+  required int32 field9670 = 3;
+  required int32 field9671 = 4;
+  optional float field9672 = 5;
+}
+
+message Message11020 {
+}
+
+message Message11013 {
+  optional bytes field11757 = 19;
+  optional bytes field11758 = 1;
+  optional bytes field11759 = 2;
+  optional bytes field11760 = 3;
+  optional bytes field11761 = 4;
+  optional bytes field11762 = 5;
+  optional bytes field11763 = 6;
+  optional bytes field11764 = 7;
+  optional bytes field11765 = 8;
+  optional bytes field11766 = 9;
+  optional bytes field11767 = 10;
+  optional bytes field11768 = 11;
+  optional bytes field11769 = 12;
+  optional bytes field11770 = 13;
+  optional bytes field11771 = 14;
+  optional bytes field11772 = 15;
+  optional bytes field11773 = 16;
+  optional bytes field11774 = 17;
+  optional bytes field11775 = 18;
+  optional bytes field11776 = 20;
+  optional bytes field11777 = 21;
+  optional .benchmarks.google_message3.UnusedEmptyMessage field11778 = 23;
+  repeated .benchmarks.google_message3.Message11011 field11779 = 22;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
new file mode 100644
index 0000000..2497db5
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
@@ -0,0 +1,56 @@
+syntax = "proto2";
+
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message11018 {
+}
+
+message Message10800 {
+  optional string field10808 = 1;
+  optional int64 field10809 = 2;
+  optional bool field10810 = 3;
+  optional float field10811 = 4;
+}
+
+message Message10802 {
+}
+
+message Message10748 {
+  optional string field10750 = 1;
+  optional int32 field10751 = 2;
+  optional int32 field10752 = 3;
+  optional int32 field10753 = 4;
+}
+
+message Message7966 {
+  optional string field7969 = 1;
+  optional bool field7970 = 2;
+}
+
+message Message708 {
+  optional .benchmarks.google_message3.Message741 field823 = 1;
+  repeated string field824 = 6;
+  optional string field825 = 2;
+  optional string field826 = 3;
+  repeated string field827 = 4;
+  repeated string field828 = 5;
+}
+
+message Message8942 {
+}
+
+message Message11011 {
+  required bytes field11752 = 1;
+  required bytes field11753 = 2;
+}
+
+message UnusedEmptyMessage {
+}
+
+message Message741 {
+  repeated string field936 = 1;
+}
+
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
new file mode 100644
index 0000000..1d2b147
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
@@ -0,0 +1,1900 @@
+syntax = "proto2";
+
+package benchmarks.google_message3;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+enum Enum720 {
+  ENUM_VALUE721 = 1;
+  ENUM_VALUE722 = 2;
+}
+
+enum Enum3476 {
+  ENUM_VALUE3477 = 0;
+  ENUM_VALUE3478 = 1;
+  ENUM_VALUE3479 = 2;
+  ENUM_VALUE3480 = 3;
+  ENUM_VALUE3481 = 4;
+  ENUM_VALUE3482 = 5;
+  ENUM_VALUE3483 = 6;
+  ENUM_VALUE3484 = 7;
+  ENUM_VALUE3485 = 8;
+  ENUM_VALUE3486 = 9;
+  ENUM_VALUE3487 = 10;
+  ENUM_VALUE3488 = 11;
+  ENUM_VALUE3489 = 12;
+  ENUM_VALUE3490 = 13;
+  ENUM_VALUE3491 = 14;
+  ENUM_VALUE3492 = 15;
+  ENUM_VALUE3493 = 16;
+  ENUM_VALUE3494 = 17;
+  ENUM_VALUE3495 = 18;
+  ENUM_VALUE3496 = 19;
+  ENUM_VALUE3497 = 20;
+  ENUM_VALUE3498 = 21;
+  ENUM_VALUE3499 = 22;
+  ENUM_VALUE3500 = 23;
+  ENUM_VALUE3501 = 24;
+  ENUM_VALUE3502 = 25;
+  ENUM_VALUE3503 = 26;
+  ENUM_VALUE3504 = 27;
+  ENUM_VALUE3505 = 28;
+  ENUM_VALUE3506 = 29;
+  ENUM_VALUE3507 = 30;
+  ENUM_VALUE3508 = 31;
+  ENUM_VALUE3509 = 32;
+  ENUM_VALUE3510 = 33;
+  ENUM_VALUE3511 = 34;
+  ENUM_VALUE3512 = 35;
+  ENUM_VALUE3513 = 36;
+  ENUM_VALUE3514 = 37;
+  ENUM_VALUE3515 = 38;
+  ENUM_VALUE3516 = 39;
+  ENUM_VALUE3517 = 40;
+  ENUM_VALUE3518 = 41;
+  ENUM_VALUE3519 = 42;
+  ENUM_VALUE3520 = 43;
+  ENUM_VALUE3521 = 44;
+  ENUM_VALUE3522 = 45;
+  ENUM_VALUE3523 = 46;
+  ENUM_VALUE3524 = 47;
+  ENUM_VALUE3525 = 48;
+  ENUM_VALUE3526 = 49;
+  ENUM_VALUE3527 = 50;
+  ENUM_VALUE3528 = 51;
+  ENUM_VALUE3529 = 52;
+  ENUM_VALUE3530 = 53;
+  ENUM_VALUE3531 = 54;
+  ENUM_VALUE3532 = 55;
+  ENUM_VALUE3533 = 56;
+  ENUM_VALUE3534 = 57;
+  ENUM_VALUE3535 = 58;
+  ENUM_VALUE3536 = 59;
+  ENUM_VALUE3537 = 60;
+  ENUM_VALUE3538 = 61;
+  ENUM_VALUE3539 = 62;
+  ENUM_VALUE3540 = 63;
+  ENUM_VALUE3541 = 64;
+  ENUM_VALUE3542 = 65;
+  ENUM_VALUE3543 = 66;
+  ENUM_VALUE3544 = 67;
+  ENUM_VALUE3545 = 68;
+  ENUM_VALUE3546 = 69;
+  ENUM_VALUE3547 = 70;
+  ENUM_VALUE3548 = 71;
+  ENUM_VALUE3549 = 72;
+  ENUM_VALUE3550 = 73;
+  ENUM_VALUE3551 = 74;
+  ENUM_VALUE3552 = 75;
+  ENUM_VALUE3553 = 76;
+  ENUM_VALUE3554 = 77;
+  ENUM_VALUE3555 = 78;
+  ENUM_VALUE3556 = 79;
+  ENUM_VALUE3557 = 80;
+  ENUM_VALUE3558 = 81;
+  ENUM_VALUE3559 = 82;
+  ENUM_VALUE3560 = 83;
+  ENUM_VALUE3561 = 84;
+  ENUM_VALUE3562 = 85;
+  ENUM_VALUE3563 = 86;
+  ENUM_VALUE3564 = 87;
+  ENUM_VALUE3565 = 88;
+  ENUM_VALUE3566 = 89;
+  ENUM_VALUE3567 = 90;
+  ENUM_VALUE3568 = 91;
+  ENUM_VALUE3569 = 92;
+  ENUM_VALUE3570 = 93;
+  ENUM_VALUE3571 = 94;
+  ENUM_VALUE3572 = 95;
+  ENUM_VALUE3573 = 96;
+  ENUM_VALUE3574 = 97;
+  ENUM_VALUE3575 = 98;
+  ENUM_VALUE3576 = 99;
+  ENUM_VALUE3577 = 100;
+  ENUM_VALUE3578 = 101;
+  ENUM_VALUE3579 = 102;
+  ENUM_VALUE3580 = 103;
+  ENUM_VALUE3581 = 104;
+  ENUM_VALUE3582 = 105;
+  ENUM_VALUE3583 = 106;
+  ENUM_VALUE3584 = 107;
+  ENUM_VALUE3585 = 108;
+  ENUM_VALUE3586 = 109;
+  ENUM_VALUE3587 = 110;
+  ENUM_VALUE3588 = 111;
+  ENUM_VALUE3589 = 112;
+  ENUM_VALUE3590 = 113;
+  ENUM_VALUE3591 = 114;
+  ENUM_VALUE3592 = 115;
+  ENUM_VALUE3593 = 116;
+  ENUM_VALUE3594 = 117;
+  ENUM_VALUE3595 = 118;
+  ENUM_VALUE3596 = 119;
+  ENUM_VALUE3597 = 120;
+  ENUM_VALUE3598 = 121;
+  ENUM_VALUE3599 = 122;
+  ENUM_VALUE3600 = 123;
+  ENUM_VALUE3601 = 124;
+  ENUM_VALUE3602 = 125;
+  ENUM_VALUE3603 = 126;
+  ENUM_VALUE3604 = 127;
+  ENUM_VALUE3605 = 128;
+  ENUM_VALUE3606 = 129;
+  ENUM_VALUE3607 = 130;
+  ENUM_VALUE3608 = 131;
+  ENUM_VALUE3609 = 132;
+  ENUM_VALUE3610 = 133;
+  ENUM_VALUE3611 = 134;
+  ENUM_VALUE3612 = 135;
+  ENUM_VALUE3613 = 136;
+  ENUM_VALUE3614 = 137;
+  ENUM_VALUE3615 = 138;
+  ENUM_VALUE3616 = 139;
+  ENUM_VALUE3617 = 140;
+  ENUM_VALUE3618 = 141;
+  ENUM_VALUE3619 = 142;
+  ENUM_VALUE3620 = 143;
+  ENUM_VALUE3621 = 144;
+  ENUM_VALUE3622 = 145;
+  ENUM_VALUE3623 = 146;
+  ENUM_VALUE3624 = 147;
+  ENUM_VALUE3625 = 148;
+  ENUM_VALUE3626 = 149;
+  ENUM_VALUE3627 = 150;
+  ENUM_VALUE3628 = 151;
+  ENUM_VALUE3629 = 152;
+  ENUM_VALUE3630 = 153;
+  ENUM_VALUE3631 = 154;
+  ENUM_VALUE3632 = 155;
+  ENUM_VALUE3633 = 156;
+  ENUM_VALUE3634 = 157;
+  ENUM_VALUE3635 = 158;
+  ENUM_VALUE3636 = 159;
+  ENUM_VALUE3637 = 160;
+  ENUM_VALUE3638 = 161;
+  ENUM_VALUE3639 = 162;
+  ENUM_VALUE3640 = 163;
+  ENUM_VALUE3641 = 164;
+  ENUM_VALUE3642 = 165;
+  ENUM_VALUE3643 = 166;
+  ENUM_VALUE3644 = 167;
+  ENUM_VALUE3645 = 168;
+  ENUM_VALUE3646 = 169;
+  ENUM_VALUE3647 = 170;
+  ENUM_VALUE3648 = 171;
+  ENUM_VALUE3649 = 172;
+  ENUM_VALUE3650 = 173;
+  ENUM_VALUE3651 = 174;
+  ENUM_VALUE3652 = 175;
+  ENUM_VALUE3653 = 176;
+  ENUM_VALUE3654 = 177;
+  ENUM_VALUE3655 = 178;
+  ENUM_VALUE3656 = 179;
+  ENUM_VALUE3657 = 180;
+  ENUM_VALUE3658 = 181;
+  ENUM_VALUE3659 = 182;
+  ENUM_VALUE3660 = 183;
+}
+
+enum Enum3805 {
+  ENUM_VALUE3806 = 0;
+  ENUM_VALUE3807 = 1;
+  ENUM_VALUE3808 = 2;
+  ENUM_VALUE3809 = 3;
+  ENUM_VALUE3810 = 4;
+  ENUM_VALUE3811 = 5;
+  ENUM_VALUE3812 = 6;
+  ENUM_VALUE3813 = 7;
+  ENUM_VALUE3814 = 8;
+  ENUM_VALUE3815 = 9;
+  ENUM_VALUE3816 = 11;
+  ENUM_VALUE3817 = 10;
+}
+
+enum Enum3783 {
+  ENUM_VALUE3784 = 0;
+  ENUM_VALUE3785 = 1;
+  ENUM_VALUE3786 = 2;
+  ENUM_VALUE3787 = 3;
+  ENUM_VALUE3788 = 4;
+  ENUM_VALUE3789 = 5;
+  ENUM_VALUE3790 = 6;
+  ENUM_VALUE3791 = 7;
+  ENUM_VALUE3792 = 8;
+  ENUM_VALUE3793 = 9;
+  ENUM_VALUE3794 = 10;
+  ENUM_VALUE3795 = 11;
+  ENUM_VALUE3796 = 12;
+  ENUM_VALUE3797 = 13;
+  ENUM_VALUE3798 = 14;
+  ENUM_VALUE3799 = 15;
+  ENUM_VALUE3800 = 16;
+  ENUM_VALUE3801 = 20;
+  ENUM_VALUE3802 = 21;
+  ENUM_VALUE3803 = 50;
+}
+
+enum Enum3851 {
+  ENUM_VALUE3852 = 0;
+  ENUM_VALUE3853 = 1;
+  ENUM_VALUE3854 = 2;
+  ENUM_VALUE3855 = 3;
+  ENUM_VALUE3856 = 4;
+  ENUM_VALUE3857 = 5;
+  ENUM_VALUE3858 = 6;
+  ENUM_VALUE3859 = 7;
+  ENUM_VALUE3860 = 8;
+  ENUM_VALUE3861 = 9;
+  ENUM_VALUE3862 = 10;
+  ENUM_VALUE3863 = 11;
+  ENUM_VALUE3864 = 12;
+  ENUM_VALUE3865 = 13;
+  ENUM_VALUE3866 = 14;
+  ENUM_VALUE3867 = 15;
+  ENUM_VALUE3868 = 16;
+  ENUM_VALUE3869 = 17;
+}
+
+enum UnusedEnum {
+  UNUSED_ENUM_VALUE1 = 0;
+  UNUSED_ENUM_VALUE2 = 1;
+}
+
+enum Enum4146 {
+  ENUM_VALUE4147 = 0;
+  ENUM_VALUE4148 = 1;
+  ENUM_VALUE4149 = 2;
+  ENUM_VALUE4150 = 3;
+  ENUM_VALUE4151 = 4;
+}
+
+enum Enum4160 {
+  ENUM_VALUE4161 = 0;
+  ENUM_VALUE4162 = 1;
+}
+
+enum Enum4152 {
+  ENUM_VALUE4153 = 0;
+  ENUM_VALUE4154 = 1;
+  ENUM_VALUE4155 = 2;
+  ENUM_VALUE4156 = 3;
+  ENUM_VALUE4157 = 4;
+  ENUM_VALUE4158 = 5;
+  ENUM_VALUE4159 = 6;
+}
+
+enum Enum6025 {
+  ENUM_VALUE6026 = 0;
+  ENUM_VALUE6027 = 1;
+  ENUM_VALUE6028 = 2;
+  ENUM_VALUE6029 = 3;
+  ENUM_VALUE6030 = 4;
+  ENUM_VALUE6031 = 5;
+  ENUM_VALUE6032 = 6;
+  ENUM_VALUE6033 = 7;
+  ENUM_VALUE6034 = 8;
+  ENUM_VALUE6035 = 9;
+  ENUM_VALUE6036 = 10;
+  ENUM_VALUE6037 = 11;
+  ENUM_VALUE6038 = 12;
+  ENUM_VALUE6039 = 13;
+  ENUM_VALUE6040 = 14;
+  ENUM_VALUE6041 = 15;
+  ENUM_VALUE6042 = 16;
+  ENUM_VALUE6043 = 17;
+  ENUM_VALUE6044 = 18;
+  ENUM_VALUE6045 = 19;
+  ENUM_VALUE6046 = 20;
+  ENUM_VALUE6047 = 21;
+}
+
+enum Enum6065 {
+  ENUM_VALUE6066 = 0;
+  ENUM_VALUE6067 = 1;
+  ENUM_VALUE6068 = 2;
+  ENUM_VALUE6069 = 3;
+  ENUM_VALUE6070 = 4;
+  ENUM_VALUE6071 = 5;
+  ENUM_VALUE6072 = 6;
+  ENUM_VALUE6073 = 7;
+  ENUM_VALUE6074 = 8;
+  ENUM_VALUE6075 = 9;
+  ENUM_VALUE6076 = 10;
+  ENUM_VALUE6077 = 11;
+  ENUM_VALUE6078 = 12;
+  ENUM_VALUE6079 = 13;
+  ENUM_VALUE6080 = 14;
+}
+
+enum Enum6579 {
+  ENUM_VALUE6580 = 0;
+  ENUM_VALUE6581 = 2;
+  ENUM_VALUE6582 = 3;
+  ENUM_VALUE6583 = 5;
+  ENUM_VALUE6584 = 10;
+  ENUM_VALUE6585 = 15;
+  ENUM_VALUE6586 = 25;
+  ENUM_VALUE6587 = 30;
+}
+
+enum Enum6588 {
+  ENUM_VALUE6589 = 0;
+  ENUM_VALUE6590 = 1;
+  ENUM_VALUE6591 = 2;
+  ENUM_VALUE6592 = 3;
+  ENUM_VALUE6593 = 4;
+  ENUM_VALUE6594 = 5;
+  ENUM_VALUE6595 = 6;
+  ENUM_VALUE6596 = 7;
+  ENUM_VALUE6597 = 8;
+  ENUM_VALUE6598 = 9;
+  ENUM_VALUE6599 = 10;
+  ENUM_VALUE6600 = 11;
+  ENUM_VALUE6601 = 12;
+  ENUM_VALUE6602 = 13;
+  ENUM_VALUE6603 = 14;
+  ENUM_VALUE6604 = 15;
+  ENUM_VALUE6605 = 16;
+  ENUM_VALUE6606 = 17;
+  ENUM_VALUE6607 = 19;
+  ENUM_VALUE6608 = 20;
+  ENUM_VALUE6609 = 21;
+  ENUM_VALUE6610 = 22;
+  ENUM_VALUE6611 = 23;
+  ENUM_VALUE6612 = 24;
+  ENUM_VALUE6613 = 25;
+  ENUM_VALUE6614 = 26;
+  ENUM_VALUE6615 = 27;
+  ENUM_VALUE6616 = 28;
+  ENUM_VALUE6617 = 29;
+  ENUM_VALUE6618 = 30;
+  ENUM_VALUE6619 = 31;
+  ENUM_VALUE6620 = 32;
+  ENUM_VALUE6621 = 33;
+  ENUM_VALUE6622 = 34;
+}
+
+enum Enum6769 {
+  ENUM_VALUE6770 = 0;
+  ENUM_VALUE6771 = 1;
+  ENUM_VALUE6772 = 2;
+}
+
+enum Enum6774 {
+  ENUM_VALUE6775 = 0;
+  ENUM_VALUE6776 = 1;
+  ENUM_VALUE6777 = 2;
+  ENUM_VALUE6778 = 3;
+  ENUM_VALUE6779 = 4;
+  ENUM_VALUE6780 = 5;
+  ENUM_VALUE6781 = 6;
+}
+
+enum Enum6782 {
+  ENUM_VALUE6783 = 0;
+  ENUM_VALUE6784 = 1;
+  ENUM_VALUE6785 = 2;
+  ENUM_VALUE6786 = 3;
+  ENUM_VALUE6787 = 4;
+  ENUM_VALUE6788 = 5;
+}
+
+enum Enum6858 {
+  ENUM_VALUE6859 = 1;
+  ENUM_VALUE6860 = 2;
+  ENUM_VALUE6861 = 3;
+  ENUM_VALUE6862 = 4;
+}
+
+enum Enum6815 {
+  ENUM_VALUE6816 = 0;
+  ENUM_VALUE6817 = 1;
+  ENUM_VALUE6818 = 2;
+  ENUM_VALUE6819 = 3;
+  ENUM_VALUE6820 = 4;
+  ENUM_VALUE6821 = 5;
+}
+
+enum Enum6822 {
+  ENUM_VALUE6823 = 0;
+  ENUM_VALUE6824 = 1;
+  ENUM_VALUE6825 = 2;
+  ENUM_VALUE6826 = 3;
+}
+
+enum Enum7654 {
+  ENUM_VALUE7655 = 1;
+  ENUM_VALUE7656 = 2;
+  ENUM_VALUE7657 = 3;
+}
+
+enum Enum8292 {
+  ENUM_VALUE8293 = 0;
+  ENUM_VALUE8294 = 1;
+  ENUM_VALUE8295 = 2;
+}
+
+enum Enum8450 {
+  ENUM_VALUE8451 = 0;
+  ENUM_VALUE8452 = 1;
+  ENUM_VALUE8453 = 2;
+}
+
+enum Enum8900 {
+  ENUM_VALUE8901 = 0;
+  ENUM_VALUE8902 = 1;
+  ENUM_VALUE8903 = 2;
+  ENUM_VALUE8904 = 3;
+  ENUM_VALUE8905 = 4;
+}
+
+enum Enum8945 {
+  ENUM_VALUE8946 = 0;
+  ENUM_VALUE8947 = 1;
+  ENUM_VALUE8948 = 2;
+  ENUM_VALUE8949 = 3;
+  ENUM_VALUE8950 = 4;
+}
+
+enum Enum8951 {
+  ENUM_VALUE8952 = 1;
+  ENUM_VALUE8953 = 2;
+  ENUM_VALUE8954 = 3;
+  ENUM_VALUE8955 = 4;
+  ENUM_VALUE8956 = 5;
+  ENUM_VALUE8957 = 6;
+  ENUM_VALUE8958 = 7;
+  ENUM_VALUE8959 = 8;
+}
+
+enum Enum9243 {
+  ENUM_VALUE9244 = -1;
+  ENUM_VALUE9245 = 0;
+  ENUM_VALUE9246 = 1;
+  ENUM_VALUE9247 = 2;
+  ENUM_VALUE9248 = 3;
+  ENUM_VALUE9249 = 4;
+  ENUM_VALUE9250 = 5;
+  ENUM_VALUE9251 = 6;
+  ENUM_VALUE9252 = 7;
+  ENUM_VALUE9253 = 8;
+  ENUM_VALUE9254 = 9;
+  ENUM_VALUE9255 = 10;
+  ENUM_VALUE9256 = 11;
+  ENUM_VALUE9257 = 12;
+  ENUM_VALUE9258 = 13;
+  ENUM_VALUE9259 = 14;
+  ENUM_VALUE9260 = 15;
+  ENUM_VALUE9261 = 16;
+  ENUM_VALUE9262 = 17;
+  ENUM_VALUE9263 = 71;
+  ENUM_VALUE9264 = 72;
+  ENUM_VALUE9265 = 73;
+  ENUM_VALUE9266 = 74;
+  ENUM_VALUE9267 = 18;
+  ENUM_VALUE9268 = 20;
+  ENUM_VALUE9269 = 21;
+  ENUM_VALUE9270 = 22;
+  ENUM_VALUE9271 = 23;
+  ENUM_VALUE9272 = 61;
+  ENUM_VALUE9273 = 62;
+  ENUM_VALUE9274 = 63;
+  ENUM_VALUE9275 = 64;
+  ENUM_VALUE9276 = 66;
+  ENUM_VALUE9277 = 67;
+  ENUM_VALUE9278 = 24;
+  ENUM_VALUE9279 = 25;
+  ENUM_VALUE9280 = 26;
+  ENUM_VALUE9281 = 27;
+  ENUM_VALUE9282 = 28;
+  ENUM_VALUE9283 = 29;
+  ENUM_VALUE9284 = 30;
+  ENUM_VALUE9285 = 31;
+  ENUM_VALUE9286 = 32;
+  ENUM_VALUE9287 = 33;
+  ENUM_VALUE9288 = 34;
+  ENUM_VALUE9289 = 35;
+  ENUM_VALUE9290 = 36;
+  ENUM_VALUE9291 = 37;
+  ENUM_VALUE9292 = 38;
+  ENUM_VALUE9293 = 39;
+  ENUM_VALUE9294 = 40;
+  ENUM_VALUE9295 = 41;
+  ENUM_VALUE9296 = 42;
+  ENUM_VALUE9297 = 43;
+  ENUM_VALUE9298 = 44;
+  ENUM_VALUE9299 = 45;
+  ENUM_VALUE9300 = 46;
+  ENUM_VALUE9301 = 47;
+  ENUM_VALUE9302 = 48;
+  ENUM_VALUE9303 = 49;
+  ENUM_VALUE9304 = 50;
+  ENUM_VALUE9305 = 51;
+  ENUM_VALUE9306 = 52;
+  ENUM_VALUE9307 = 53;
+  ENUM_VALUE9308 = 54;
+  ENUM_VALUE9309 = 55;
+  ENUM_VALUE9310 = 56;
+  ENUM_VALUE9311 = 57;
+  ENUM_VALUE9312 = 58;
+  ENUM_VALUE9313 = 59;
+  ENUM_VALUE9314 = 60;
+  ENUM_VALUE9315 = 68;
+  ENUM_VALUE9316 = 69;
+  ENUM_VALUE9317 = 70;
+  ENUM_VALUE9318 = 1000;
+  ENUM_VALUE9319 = 1001;
+  ENUM_VALUE9320 = 1002;
+  ENUM_VALUE9321 = 1003;
+  ENUM_VALUE9322 = 1004;
+  ENUM_VALUE9323 = 1005;
+  ENUM_VALUE9324 = 1006;
+  ENUM_VALUE9325 = 1007;
+  ENUM_VALUE9326 = 65;
+}
+
+enum Enum10157 {
+  ENUM_VALUE10158 = 0;
+  ENUM_VALUE10159 = 1;
+  ENUM_VALUE10160 = 2;
+  ENUM_VALUE10161 = 3;
+  ENUM_VALUE10162 = 4;
+  ENUM_VALUE10163 = 5;
+  ENUM_VALUE10164 = 6;
+  ENUM_VALUE10165 = 7;
+  ENUM_VALUE10166 = 8;
+}
+
+enum Enum10167 {
+  ENUM_VALUE10168 = 0;
+  ENUM_VALUE10169 = 1;
+  ENUM_VALUE10170 = 2;
+  ENUM_VALUE10171 = 3;
+  ENUM_VALUE10172 = 4;
+  ENUM_VALUE10173 = 5;
+  ENUM_VALUE10174 = 6;
+  ENUM_VALUE10175 = 7;
+  ENUM_VALUE10176 = 8;
+}
+
+enum Enum8862 {
+  ENUM_VALUE8863 = 0;
+  ENUM_VALUE8864 = 1;
+  ENUM_VALUE8865 = 2;
+  ENUM_VALUE8866 = 3;
+  ENUM_VALUE8867 = 4;
+  ENUM_VALUE8868 = 5;
+  ENUM_VALUE8869 = 6;
+  ENUM_VALUE8870 = 7;
+  ENUM_VALUE8871 = 13;
+  ENUM_VALUE8872 = 14;
+  ENUM_VALUE8873 = 8;
+  ENUM_VALUE8874 = 9;
+  ENUM_VALUE8875 = 10;
+  ENUM_VALUE8876 = 11;
+  ENUM_VALUE8877 = 12;
+  ENUM_VALUE8878 = 15;
+}
+
+enum Enum10325 {
+  ENUM_VALUE10326 = 0;
+  ENUM_VALUE10327 = 1;
+  ENUM_VALUE10328 = 2;
+  ENUM_VALUE10329 = 3;
+  ENUM_VALUE10330 = 4;
+  ENUM_VALUE10331 = 5;
+  ENUM_VALUE10332 = 6;
+  ENUM_VALUE10333 = 7;
+  ENUM_VALUE10334 = 8;
+}
+
+enum Enum10335 {
+  ENUM_VALUE10336 = 0;
+}
+
+enum Enum10337 {
+  ENUM_VALUE10338 = 0;
+  ENUM_VALUE10339 = 1;
+}
+
+enum Enum10392 {
+  ENUM_VALUE10393 = 0;
+  ENUM_VALUE10394 = 1;
+  ENUM_VALUE10395 = 2;
+  ENUM_VALUE10396 = 3;
+  ENUM_VALUE10397 = 4;
+  ENUM_VALUE10398 = 5;
+  ENUM_VALUE10399 = 6;
+  ENUM_VALUE10400 = 7;
+  ENUM_VALUE10401 = 8;
+  ENUM_VALUE10402 = 15;
+  ENUM_VALUE10403 = 9;
+  ENUM_VALUE10404 = 10;
+  ENUM_VALUE10405 = 11;
+  ENUM_VALUE10406 = 12;
+  ENUM_VALUE10407 = 13;
+  ENUM_VALUE10408 = 14;
+  ENUM_VALUE10409 = 101;
+  ENUM_VALUE10410 = 102;
+}
+
+enum Enum11107 {
+  ENUM_VALUE11108 = 0;
+  ENUM_VALUE11109 = 1;
+  ENUM_VALUE11110 = 2;
+  ENUM_VALUE11111 = 3;
+  ENUM_VALUE11112 = 4;
+  ENUM_VALUE11113 = 5;
+  ENUM_VALUE11114 = 6;
+  ENUM_VALUE11115 = 7;
+  ENUM_VALUE11116 = 8;
+  ENUM_VALUE11117 = 9;
+  ENUM_VALUE11118 = 10;
+  ENUM_VALUE11119 = 11;
+  ENUM_VALUE11120 = 12;
+  ENUM_VALUE11121 = 13;
+  ENUM_VALUE11122 = 14;
+  ENUM_VALUE11123 = 15;
+  ENUM_VALUE11124 = 16;
+  ENUM_VALUE11125 = 17;
+  ENUM_VALUE11126 = 18;
+  ENUM_VALUE11127 = 19;
+  ENUM_VALUE11128 = 20;
+  ENUM_VALUE11129 = 21;
+  ENUM_VALUE11130 = 22;
+  ENUM_VALUE11131 = 23;
+  ENUM_VALUE11132 = 24;
+  ENUM_VALUE11133 = 25;
+  ENUM_VALUE11134 = 26;
+  ENUM_VALUE11135 = 27;
+  ENUM_VALUE11136 = 28;
+  ENUM_VALUE11137 = 29;
+  ENUM_VALUE11138 = 30;
+  ENUM_VALUE11139 = 31;
+  ENUM_VALUE11140 = 32;
+  ENUM_VALUE11141 = 33;
+  ENUM_VALUE11142 = 34;
+  ENUM_VALUE11143 = 35;
+  ENUM_VALUE11144 = 36;
+  ENUM_VALUE11145 = 37;
+  ENUM_VALUE11146 = 38;
+  ENUM_VALUE11147 = 39;
+  ENUM_VALUE11148 = 40;
+  ENUM_VALUE11149 = 41;
+  ENUM_VALUE11150 = 42;
+  ENUM_VALUE11151 = 43;
+  ENUM_VALUE11152 = 44;
+  ENUM_VALUE11153 = 45;
+  ENUM_VALUE11154 = 46;
+  ENUM_VALUE11155 = 47;
+  ENUM_VALUE11156 = 48;
+  ENUM_VALUE11157 = 49;
+  ENUM_VALUE11158 = 50;
+  ENUM_VALUE11159 = 51;
+  ENUM_VALUE11160 = 52;
+  ENUM_VALUE11161 = 53;
+  ENUM_VALUE11162 = 54;
+  ENUM_VALUE11163 = 55;
+  ENUM_VALUE11164 = 56;
+  ENUM_VALUE11165 = 57;
+  ENUM_VALUE11166 = 58;
+  ENUM_VALUE11167 = 59;
+  ENUM_VALUE11168 = 60;
+  ENUM_VALUE11169 = 61;
+  ENUM_VALUE11170 = 62;
+  ENUM_VALUE11171 = 63;
+  ENUM_VALUE11172 = 64;
+  ENUM_VALUE11173 = 65;
+  ENUM_VALUE11174 = 66;
+  ENUM_VALUE11175 = 67;
+  ENUM_VALUE11176 = 68;
+  ENUM_VALUE11177 = 69;
+  ENUM_VALUE11178 = 70;
+  ENUM_VALUE11179 = 71;
+  ENUM_VALUE11180 = 72;
+  ENUM_VALUE11181 = 73;
+  ENUM_VALUE11182 = 74;
+  ENUM_VALUE11183 = 75;
+  ENUM_VALUE11184 = 76;
+  ENUM_VALUE11185 = 77;
+  ENUM_VALUE11186 = 78;
+  ENUM_VALUE11187 = 79;
+  ENUM_VALUE11188 = 80;
+  ENUM_VALUE11189 = 81;
+  ENUM_VALUE11190 = 82;
+  ENUM_VALUE11191 = 83;
+  ENUM_VALUE11192 = 84;
+  ENUM_VALUE11193 = 85;
+  ENUM_VALUE11194 = 86;
+  ENUM_VALUE11195 = 87;
+  ENUM_VALUE11196 = 88;
+  ENUM_VALUE11197 = 89;
+  ENUM_VALUE11198 = 90;
+  ENUM_VALUE11199 = 91;
+  ENUM_VALUE11200 = 92;
+  ENUM_VALUE11201 = 93;
+  ENUM_VALUE11202 = 94;
+  ENUM_VALUE11203 = 95;
+  ENUM_VALUE11204 = 96;
+  ENUM_VALUE11205 = 97;
+  ENUM_VALUE11206 = 98;
+  ENUM_VALUE11207 = 99;
+  ENUM_VALUE11208 = 100;
+  ENUM_VALUE11209 = 101;
+  ENUM_VALUE11210 = 102;
+  ENUM_VALUE11211 = 103;
+  ENUM_VALUE11212 = 104;
+  ENUM_VALUE11213 = 105;
+  ENUM_VALUE11214 = 106;
+  ENUM_VALUE11215 = 107;
+  ENUM_VALUE11216 = 108;
+  ENUM_VALUE11217 = 109;
+  ENUM_VALUE11218 = 110;
+  ENUM_VALUE11219 = 111;
+  ENUM_VALUE11220 = 112;
+  ENUM_VALUE11221 = 113;
+  ENUM_VALUE11222 = 114;
+  ENUM_VALUE11223 = 115;
+  ENUM_VALUE11224 = 116;
+  ENUM_VALUE11225 = 117;
+  ENUM_VALUE11226 = 118;
+  ENUM_VALUE11227 = 119;
+  ENUM_VALUE11228 = 120;
+  ENUM_VALUE11229 = 121;
+  ENUM_VALUE11230 = 122;
+  ENUM_VALUE11231 = 123;
+  ENUM_VALUE11232 = 124;
+  ENUM_VALUE11233 = 125;
+  ENUM_VALUE11234 = 126;
+  ENUM_VALUE11235 = 127;
+  ENUM_VALUE11236 = 128;
+  ENUM_VALUE11237 = 129;
+  ENUM_VALUE11238 = 130;
+  ENUM_VALUE11239 = 131;
+  ENUM_VALUE11240 = 132;
+  ENUM_VALUE11241 = 133;
+  ENUM_VALUE11242 = 134;
+  ENUM_VALUE11243 = 135;
+  ENUM_VALUE11244 = 136;
+  ENUM_VALUE11245 = 137;
+  ENUM_VALUE11246 = 138;
+  ENUM_VALUE11247 = 139;
+  ENUM_VALUE11248 = 140;
+  ENUM_VALUE11249 = 141;
+  ENUM_VALUE11250 = 142;
+  ENUM_VALUE11251 = 143;
+  ENUM_VALUE11252 = 144;
+  ENUM_VALUE11253 = 145;
+  ENUM_VALUE11254 = 146;
+  ENUM_VALUE11255 = 147;
+  ENUM_VALUE11256 = 148;
+  ENUM_VALUE11257 = 149;
+  ENUM_VALUE11258 = 150;
+  ENUM_VALUE11259 = 151;
+  ENUM_VALUE11260 = 152;
+  ENUM_VALUE11261 = 153;
+  ENUM_VALUE11262 = 154;
+  ENUM_VALUE11263 = 155;
+  ENUM_VALUE11264 = 156;
+  ENUM_VALUE11265 = 157;
+  ENUM_VALUE11266 = 158;
+  ENUM_VALUE11267 = 159;
+  ENUM_VALUE11268 = 160;
+  ENUM_VALUE11269 = 161;
+  ENUM_VALUE11270 = 163;
+  ENUM_VALUE11271 = 164;
+  ENUM_VALUE11272 = 165;
+  ENUM_VALUE11273 = 166;
+  ENUM_VALUE11274 = 167;
+  ENUM_VALUE11275 = 168;
+  ENUM_VALUE11276 = 169;
+  ENUM_VALUE11277 = 170;
+  ENUM_VALUE11278 = 171;
+  ENUM_VALUE11279 = 172;
+  ENUM_VALUE11280 = 173;
+  ENUM_VALUE11281 = 174;
+  ENUM_VALUE11282 = 175;
+  ENUM_VALUE11283 = 176;
+  ENUM_VALUE11284 = 177;
+  ENUM_VALUE11285 = 178;
+  ENUM_VALUE11286 = 179;
+  ENUM_VALUE11287 = 180;
+  ENUM_VALUE11288 = 181;
+  ENUM_VALUE11289 = 182;
+  ENUM_VALUE11290 = 183;
+  ENUM_VALUE11291 = 184;
+  ENUM_VALUE11292 = 185;
+  ENUM_VALUE11293 = 187;
+  ENUM_VALUE11294 = 188;
+  ENUM_VALUE11295 = 189;
+  ENUM_VALUE11296 = 190;
+  ENUM_VALUE11297 = 191;
+  ENUM_VALUE11298 = 192;
+  ENUM_VALUE11299 = 193;
+  ENUM_VALUE11300 = 194;
+  ENUM_VALUE11301 = 195;
+  ENUM_VALUE11302 = 196;
+  ENUM_VALUE11303 = 197;
+  ENUM_VALUE11304 = 198;
+  ENUM_VALUE11305 = 65535;
+  ENUM_VALUE11306 = 65536;
+  ENUM_VALUE11307 = 65537;
+  ENUM_VALUE11308 = 65538;
+  ENUM_VALUE11309 = 65539;
+  ENUM_VALUE11310 = 65540;
+  ENUM_VALUE11311 = 65541;
+  ENUM_VALUE11312 = 65542;
+  ENUM_VALUE11313 = 65543;
+  ENUM_VALUE11314 = 65544;
+  ENUM_VALUE11315 = 65545;
+  ENUM_VALUE11316 = 65546;
+  ENUM_VALUE11317 = 65547;
+  ENUM_VALUE11318 = 65548;
+  ENUM_VALUE11319 = 65549;
+  ENUM_VALUE11320 = 65550;
+  ENUM_VALUE11321 = 65551;
+  ENUM_VALUE11322 = 65552;
+  ENUM_VALUE11323 = 65553;
+  ENUM_VALUE11324 = 65554;
+  ENUM_VALUE11325 = 65555;
+  ENUM_VALUE11326 = 65556;
+  ENUM_VALUE11327 = 65557;
+  ENUM_VALUE11328 = 65558;
+  ENUM_VALUE11329 = 65559;
+  ENUM_VALUE11330 = 65560;
+  ENUM_VALUE11331 = 65561;
+  ENUM_VALUE11332 = 65562;
+  ENUM_VALUE11333 = 65563;
+  ENUM_VALUE11334 = 69632;
+  ENUM_VALUE11335 = 69633;
+  ENUM_VALUE11336 = 69634;
+  ENUM_VALUE11337 = 69635;
+  ENUM_VALUE11338 = 69636;
+  ENUM_VALUE11339 = 69637;
+  ENUM_VALUE11340 = 69638;
+  ENUM_VALUE11341 = 69639;
+  ENUM_VALUE11342 = 69640;
+  ENUM_VALUE11343 = 69641;
+  ENUM_VALUE11344 = 69642;
+  ENUM_VALUE11345 = 69643;
+  ENUM_VALUE11346 = 69644;
+  ENUM_VALUE11347 = 69645;
+  ENUM_VALUE11348 = 69646;
+  ENUM_VALUE11349 = 69647;
+  ENUM_VALUE11350 = 69648;
+  ENUM_VALUE11351 = 69649;
+  ENUM_VALUE11352 = 69650;
+  ENUM_VALUE11353 = 69651;
+  ENUM_VALUE11354 = 69652;
+  ENUM_VALUE11355 = 69653;
+  ENUM_VALUE11356 = 69654;
+  ENUM_VALUE11357 = 69655;
+  ENUM_VALUE11358 = 69656;
+  ENUM_VALUE11359 = 69657;
+  ENUM_VALUE11360 = 69658;
+  ENUM_VALUE11361 = 69659;
+  ENUM_VALUE11362 = 69660;
+  ENUM_VALUE11363 = 69661;
+  ENUM_VALUE11364 = 69662;
+  ENUM_VALUE11365 = 73728;
+  ENUM_VALUE11366 = 73729;
+  ENUM_VALUE11367 = 77824;
+  ENUM_VALUE11368 = 77825;
+  ENUM_VALUE11369 = 81920;
+  ENUM_VALUE11370 = 81921;
+  ENUM_VALUE11371 = 81922;
+  ENUM_VALUE11372 = 81923;
+  ENUM_VALUE11373 = 86016;
+  ENUM_VALUE11374 = 86017;
+  ENUM_VALUE11375 = 86018;
+  ENUM_VALUE11376 = 86019;
+  ENUM_VALUE11377 = 86020;
+  ENUM_VALUE11378 = 86021;
+  ENUM_VALUE11379 = 86022;
+  ENUM_VALUE11380 = 86023;
+  ENUM_VALUE11381 = 86024;
+  ENUM_VALUE11382 = 86025;
+  ENUM_VALUE11383 = 86026;
+  ENUM_VALUE11384 = 86027;
+  ENUM_VALUE11385 = 86028;
+  ENUM_VALUE11386 = 86029;
+  ENUM_VALUE11387 = 86030;
+  ENUM_VALUE11388 = 86031;
+  ENUM_VALUE11389 = 86032;
+  ENUM_VALUE11390 = 86033;
+  ENUM_VALUE11391 = 86034;
+  ENUM_VALUE11392 = 86035;
+  ENUM_VALUE11393 = 86036;
+  ENUM_VALUE11394 = 86037;
+  ENUM_VALUE11395 = 86038;
+  ENUM_VALUE11396 = 86039;
+  ENUM_VALUE11397 = 86040;
+  ENUM_VALUE11398 = 86041;
+  ENUM_VALUE11399 = 86042;
+  ENUM_VALUE11400 = 86043;
+  ENUM_VALUE11401 = 86044;
+  ENUM_VALUE11402 = 86045;
+  ENUM_VALUE11403 = 86046;
+  ENUM_VALUE11404 = 86047;
+  ENUM_VALUE11405 = 86048;
+  ENUM_VALUE11406 = 86049;
+  ENUM_VALUE11407 = 86050;
+  ENUM_VALUE11408 = 86051;
+  ENUM_VALUE11409 = 86052;
+  ENUM_VALUE11410 = 86053;
+  ENUM_VALUE11411 = 86054;
+  ENUM_VALUE11412 = 86055;
+  ENUM_VALUE11413 = 86056;
+  ENUM_VALUE11414 = 86057;
+  ENUM_VALUE11415 = 86058;
+  ENUM_VALUE11416 = 86059;
+  ENUM_VALUE11417 = 86060;
+  ENUM_VALUE11418 = 86061;
+  ENUM_VALUE11419 = 86062;
+  ENUM_VALUE11420 = 86063;
+  ENUM_VALUE11421 = 86064;
+  ENUM_VALUE11422 = 86065;
+  ENUM_VALUE11423 = 86066;
+  ENUM_VALUE11424 = 86067;
+  ENUM_VALUE11425 = 86068;
+  ENUM_VALUE11426 = 86069;
+  ENUM_VALUE11427 = 86070;
+  ENUM_VALUE11428 = 86071;
+  ENUM_VALUE11429 = 86072;
+  ENUM_VALUE11430 = 86073;
+  ENUM_VALUE11431 = 86074;
+  ENUM_VALUE11432 = 86077;
+  ENUM_VALUE11433 = 86078;
+  ENUM_VALUE11434 = 86079;
+  ENUM_VALUE11435 = 86080;
+  ENUM_VALUE11436 = 86081;
+  ENUM_VALUE11437 = 86082;
+  ENUM_VALUE11438 = 86083;
+  ENUM_VALUE11439 = 86084;
+  ENUM_VALUE11440 = 90112;
+  ENUM_VALUE11441 = 94208;
+  ENUM_VALUE11442 = 94209;
+  ENUM_VALUE11443 = 94210;
+  ENUM_VALUE11444 = 94211;
+  ENUM_VALUE11445 = 94212;
+  ENUM_VALUE11446 = 94213;
+  ENUM_VALUE11447 = 94214;
+  ENUM_VALUE11448 = 94215;
+  ENUM_VALUE11449 = 94216;
+  ENUM_VALUE11450 = 94217;
+  ENUM_VALUE11451 = 94218;
+  ENUM_VALUE11452 = 94219;
+  ENUM_VALUE11453 = 94220;
+  ENUM_VALUE11454 = 94221;
+  ENUM_VALUE11455 = 94222;
+  ENUM_VALUE11456 = 94223;
+  ENUM_VALUE11457 = 94224;
+  ENUM_VALUE11458 = 98304;
+  ENUM_VALUE11459 = 98305;
+  ENUM_VALUE11460 = 98306;
+  ENUM_VALUE11461 = 98307;
+  ENUM_VALUE11462 = 98308;
+  ENUM_VALUE11463 = 102400;
+  ENUM_VALUE11464 = 131072;
+  ENUM_VALUE11465 = 131073;
+  ENUM_VALUE11466 = 135168;
+  ENUM_VALUE11467 = 9439507;
+}
+
+enum Enum11541 {
+  ENUM_VALUE11542 = -1;
+  ENUM_VALUE11543 = 0;
+  ENUM_VALUE11544 = 1;
+  ENUM_VALUE11545 = 2;
+  ENUM_VALUE11546 = 3;
+  ENUM_VALUE11547 = 4;
+  ENUM_VALUE11548 = 5;
+  ENUM_VALUE11549 = 6;
+  ENUM_VALUE11550 = 7;
+  ENUM_VALUE11551 = 8;
+  ENUM_VALUE11552 = 9;
+  ENUM_VALUE11553 = 10;
+  ENUM_VALUE11554 = 11;
+  ENUM_VALUE11555 = 12;
+  ENUM_VALUE11556 = 13;
+  ENUM_VALUE11557 = 14;
+  ENUM_VALUE11558 = 15;
+  ENUM_VALUE11559 = 16;
+  ENUM_VALUE11560 = 17;
+  ENUM_VALUE11561 = 18;
+  ENUM_VALUE11562 = 19;
+  ENUM_VALUE11563 = 20;
+  ENUM_VALUE11564 = 21;
+  ENUM_VALUE11565 = 22;
+  ENUM_VALUE11566 = 23;
+  ENUM_VALUE11567 = 24;
+  ENUM_VALUE11568 = 25;
+  ENUM_VALUE11569 = 26;
+  ENUM_VALUE11570 = 27;
+  ENUM_VALUE11571 = 28;
+  ENUM_VALUE11572 = 29;
+  ENUM_VALUE11573 = 30;
+  ENUM_VALUE11574 = 31;
+  ENUM_VALUE11575 = 32;
+  ENUM_VALUE11576 = 33;
+  ENUM_VALUE11577 = 34;
+  ENUM_VALUE11578 = 35;
+  ENUM_VALUE11579 = 36;
+  ENUM_VALUE11580 = 37;
+  ENUM_VALUE11581 = 38;
+  ENUM_VALUE11582 = 39;
+  ENUM_VALUE11583 = 40;
+  ENUM_VALUE11584 = 41;
+  ENUM_VALUE11585 = 42;
+  ENUM_VALUE11586 = 43;
+  ENUM_VALUE11587 = 44;
+  ENUM_VALUE11588 = 45;
+  ENUM_VALUE11589 = 46;
+  ENUM_VALUE11590 = 47;
+  ENUM_VALUE11591 = 48;
+  ENUM_VALUE11592 = 49;
+  ENUM_VALUE11593 = 50;
+  ENUM_VALUE11594 = 51;
+  ENUM_VALUE11595 = 52;
+  ENUM_VALUE11596 = 53;
+  ENUM_VALUE11597 = 54;
+  ENUM_VALUE11598 = 55;
+  ENUM_VALUE11599 = 56;
+  ENUM_VALUE11600 = 57;
+  ENUM_VALUE11601 = 58;
+  ENUM_VALUE11602 = 59;
+  ENUM_VALUE11603 = 60;
+  ENUM_VALUE11604 = 61;
+  ENUM_VALUE11605 = 62;
+  ENUM_VALUE11606 = 63;
+  ENUM_VALUE11607 = 64;
+  ENUM_VALUE11608 = 65;
+  ENUM_VALUE11609 = 66;
+  ENUM_VALUE11610 = 67;
+  ENUM_VALUE11611 = 68;
+  ENUM_VALUE11612 = 69;
+  ENUM_VALUE11613 = 70;
+  ENUM_VALUE11614 = 71;
+  ENUM_VALUE11615 = 72;
+  ENUM_VALUE11616 = 73;
+  ENUM_VALUE11617 = 74;
+  ENUM_VALUE11618 = 75;
+  ENUM_VALUE11619 = 76;
+  ENUM_VALUE11620 = 77;
+  ENUM_VALUE11621 = 78;
+  ENUM_VALUE11622 = 79;
+  ENUM_VALUE11623 = 80;
+  ENUM_VALUE11624 = 81;
+  ENUM_VALUE11625 = 82;
+  ENUM_VALUE11626 = 83;
+  ENUM_VALUE11627 = 84;
+  ENUM_VALUE11628 = 85;
+  ENUM_VALUE11629 = 86;
+  ENUM_VALUE11630 = 87;
+  ENUM_VALUE11631 = 88;
+  ENUM_VALUE11632 = 89;
+  ENUM_VALUE11633 = 90;
+  ENUM_VALUE11634 = 91;
+  ENUM_VALUE11635 = 92;
+  ENUM_VALUE11636 = 93;
+  ENUM_VALUE11637 = 94;
+  ENUM_VALUE11638 = 95;
+  ENUM_VALUE11639 = 96;
+  ENUM_VALUE11640 = 97;
+  ENUM_VALUE11641 = 98;
+  ENUM_VALUE11642 = 99;
+  ENUM_VALUE11643 = 100;
+  ENUM_VALUE11644 = 101;
+  ENUM_VALUE11645 = 102;
+  ENUM_VALUE11646 = 103;
+  ENUM_VALUE11647 = 104;
+  ENUM_VALUE11648 = 105;
+  ENUM_VALUE11649 = 106;
+  ENUM_VALUE11650 = 107;
+  ENUM_VALUE11651 = 108;
+  ENUM_VALUE11652 = 109;
+  ENUM_VALUE11653 = 110;
+  ENUM_VALUE11654 = 111;
+  ENUM_VALUE11655 = 112;
+  ENUM_VALUE11656 = 113;
+  ENUM_VALUE11657 = 114;
+  ENUM_VALUE11658 = 115;
+  ENUM_VALUE11659 = 116;
+  ENUM_VALUE11660 = 117;
+  ENUM_VALUE11661 = 118;
+  ENUM_VALUE11662 = 119;
+  ENUM_VALUE11663 = 120;
+  ENUM_VALUE11664 = 121;
+  ENUM_VALUE11665 = 122;
+  ENUM_VALUE11666 = 123;
+  ENUM_VALUE11667 = 124;
+  ENUM_VALUE11668 = 125;
+  ENUM_VALUE11669 = 126;
+  ENUM_VALUE11670 = 127;
+  ENUM_VALUE11671 = 128;
+  ENUM_VALUE11672 = 129;
+  ENUM_VALUE11673 = 130;
+  ENUM_VALUE11674 = 131;
+  ENUM_VALUE11675 = 132;
+  ENUM_VALUE11676 = 133;
+  ENUM_VALUE11677 = 134;
+  ENUM_VALUE11678 = 135;
+  ENUM_VALUE11679 = 136;
+  ENUM_VALUE11680 = 137;
+  ENUM_VALUE11681 = 138;
+  ENUM_VALUE11682 = 139;
+  ENUM_VALUE11683 = 140;
+  ENUM_VALUE11684 = 141;
+  ENUM_VALUE11685 = 142;
+  ENUM_VALUE11686 = 143;
+  ENUM_VALUE11687 = 144;
+  ENUM_VALUE11688 = 145;
+  ENUM_VALUE11689 = 146;
+  ENUM_VALUE11690 = 147;
+  ENUM_VALUE11691 = 148;
+  ENUM_VALUE11692 = 149;
+  ENUM_VALUE11693 = 150;
+  ENUM_VALUE11694 = 151;
+  ENUM_VALUE11695 = 152;
+  ENUM_VALUE11696 = 153;
+  ENUM_VALUE11697 = 154;
+  ENUM_VALUE11698 = 155;
+  ENUM_VALUE11699 = 156;
+  ENUM_VALUE11700 = 157;
+  ENUM_VALUE11701 = 158;
+  ENUM_VALUE11702 = 159;
+  ENUM_VALUE11703 = 160;
+  ENUM_VALUE11704 = 161;
+  ENUM_VALUE11705 = 162;
+  ENUM_VALUE11706 = 163;
+  ENUM_VALUE11707 = 164;
+  ENUM_VALUE11708 = 165;
+  ENUM_VALUE11709 = 166;
+  ENUM_VALUE11710 = 167;
+  ENUM_VALUE11711 = 168;
+  ENUM_VALUE11712 = 169;
+  ENUM_VALUE11713 = 170;
+  ENUM_VALUE11714 = 171;
+  ENUM_VALUE11715 = 172;
+  ENUM_VALUE11716 = 173;
+  ENUM_VALUE11717 = 174;
+  ENUM_VALUE11718 = 175;
+  ENUM_VALUE11719 = 176;
+  ENUM_VALUE11720 = 177;
+  ENUM_VALUE11721 = 178;
+  ENUM_VALUE11722 = 179;
+  ENUM_VALUE11723 = 180;
+  ENUM_VALUE11724 = 181;
+  ENUM_VALUE11725 = 182;
+  ENUM_VALUE11726 = 183;
+  ENUM_VALUE11727 = 184;
+  ENUM_VALUE11728 = 185;
+  ENUM_VALUE11729 = 186;
+  ENUM_VALUE11730 = 187;
+  ENUM_VALUE11731 = 188;
+  ENUM_VALUE11732 = 16777215;
+}
+
+enum Enum11468 {
+  ENUM_VALUE11469 = -99;
+  ENUM_VALUE11470 = 0;
+  ENUM_VALUE11471 = 1;
+  ENUM_VALUE11472 = 2;
+  ENUM_VALUE11473 = 3;
+  ENUM_VALUE11474 = 4;
+  ENUM_VALUE11475 = 28;
+  ENUM_VALUE11476 = 22;
+  ENUM_VALUE11477 = 38;
+  ENUM_VALUE11478 = 512;
+  ENUM_VALUE11479 = 2048;
+  ENUM_VALUE11480 = 66;
+  ENUM_VALUE11481 = 578;
+  ENUM_VALUE11482 = 77;
+  ENUM_VALUE11483 = 88;
+  ENUM_VALUE11484 = 100;
+  ENUM_VALUE11485 = 110;
+  ENUM_VALUE11486 = 2158;
+  ENUM_VALUE11487 = 122;
+  ENUM_VALUE11488 = 2170;
+  ENUM_VALUE11489 = 144;
+  ENUM_VALUE11490 = 244;
+  ENUM_VALUE11491 = 2292;
+  ENUM_VALUE11492 = 44;
+}
+
+enum Enum11022 {
+  ENUM_VALUE11023 = 0;
+  ENUM_VALUE11024 = 1;
+  ENUM_VALUE11025 = 2;
+  ENUM_VALUE11026 = 3;
+  ENUM_VALUE11027 = 4;
+  ENUM_VALUE11028 = 5;
+  ENUM_VALUE11029 = 6;
+  ENUM_VALUE11030 = 7;
+  ENUM_VALUE11031 = 8;
+  ENUM_VALUE11032 = 9;
+  ENUM_VALUE11033 = 10;
+  ENUM_VALUE11034 = 11;
+  ENUM_VALUE11035 = 12;
+  ENUM_VALUE11036 = 13;
+  ENUM_VALUE11037 = 14;
+  ENUM_VALUE11038 = 15;
+  ENUM_VALUE11039 = 16;
+  ENUM_VALUE11040 = 17;
+  ENUM_VALUE11041 = 18;
+  ENUM_VALUE11042 = 19;
+  ENUM_VALUE11043 = 20;
+  ENUM_VALUE11044 = 21;
+  ENUM_VALUE11045 = 22;
+  ENUM_VALUE11046 = 23;
+  ENUM_VALUE11047 = 24;
+  ENUM_VALUE11048 = 25;
+  ENUM_VALUE11049 = 26;
+  ENUM_VALUE11050 = 27;
+  ENUM_VALUE11051 = 28;
+  ENUM_VALUE11052 = 29;
+  ENUM_VALUE11053 = 30;
+  ENUM_VALUE11054 = 31;
+  ENUM_VALUE11055 = 32;
+  ENUM_VALUE11056 = 33;
+  ENUM_VALUE11057 = 34;
+  ENUM_VALUE11058 = 35;
+  ENUM_VALUE11059 = 36;
+  ENUM_VALUE11060 = 37;
+  ENUM_VALUE11061 = 38;
+  ENUM_VALUE11062 = 39;
+  ENUM_VALUE11063 = 40;
+  ENUM_VALUE11064 = 41;
+  ENUM_VALUE11065 = 42;
+  ENUM_VALUE11066 = 43;
+  ENUM_VALUE11067 = 44;
+  ENUM_VALUE11068 = 45;
+  ENUM_VALUE11069 = 46;
+  ENUM_VALUE11070 = 47;
+  ENUM_VALUE11071 = 48;
+  ENUM_VALUE11072 = 49;
+  ENUM_VALUE11073 = 50;
+  ENUM_VALUE11074 = 51;
+  ENUM_VALUE11075 = 52;
+  ENUM_VALUE11076 = 53;
+  ENUM_VALUE11077 = 54;
+  ENUM_VALUE11078 = 55;
+  ENUM_VALUE11079 = 56;
+  ENUM_VALUE11080 = 57;
+  ENUM_VALUE11081 = 58;
+  ENUM_VALUE11082 = 59;
+  ENUM_VALUE11083 = 60;
+  ENUM_VALUE11084 = 61;
+  ENUM_VALUE11085 = 62;
+  ENUM_VALUE11086 = 63;
+  ENUM_VALUE11087 = 64;
+  ENUM_VALUE11088 = 65;
+  ENUM_VALUE11089 = 66;
+  ENUM_VALUE11090 = 67;
+  ENUM_VALUE11091 = 68;
+  ENUM_VALUE11092 = 69;
+  ENUM_VALUE11093 = 70;
+  ENUM_VALUE11094 = 71;
+  ENUM_VALUE11095 = 72;
+  ENUM_VALUE11096 = 73;
+  ENUM_VALUE11097 = 74;
+  ENUM_VALUE11098 = 75;
+  ENUM_VALUE11099 = 76;
+  ENUM_VALUE11100 = 77;
+  ENUM_VALUE11101 = 78;
+  ENUM_VALUE11102 = 79;
+  ENUM_VALUE11103 = 80;
+  ENUM_VALUE11104 = 81;
+  ENUM_VALUE11105 = 82;
+  ENUM_VALUE11106 = 83;
+}
+
+enum Enum12670 {
+  ENUM_VALUE12671 = 0;
+  ENUM_VALUE12672 = 1;
+  ENUM_VALUE12673 = 2;
+}
+
+enum Enum12871 {
+  ENUM_VALUE12872 = 1;
+  ENUM_VALUE12873 = 2;
+  ENUM_VALUE12874 = 3;
+  ENUM_VALUE12875 = 4;
+  ENUM_VALUE12876 = 5;
+  ENUM_VALUE12877 = 6;
+}
+
+enum Enum13092 {
+  ENUM_VALUE13093 = 1;
+  ENUM_VALUE13094 = 2;
+  ENUM_VALUE13095 = 3;
+}
+
+enum Enum13146 {
+  ENUM_VALUE13147 = 0;
+  ENUM_VALUE13148 = 1;
+  ENUM_VALUE13149 = 2;
+  ENUM_VALUE13150 = 3;
+}
+
+enum Enum16042 {
+  ENUM_VALUE16043 = 0;
+  ENUM_VALUE16044 = 1;
+  ENUM_VALUE16045 = 17;
+  ENUM_VALUE16046 = 273;
+  ENUM_VALUE16047 = 274;
+  ENUM_VALUE16048 = 4385;
+  ENUM_VALUE16049 = 4386;
+  ENUM_VALUE16050 = 4387;
+  ENUM_VALUE16051 = 4388;
+  ENUM_VALUE16052 = 4389;
+  ENUM_VALUE16053 = 4390;
+  ENUM_VALUE16054 = 4391;
+  ENUM_VALUE16055 = 4392;
+  ENUM_VALUE16056 = 4393;
+  ENUM_VALUE16057 = 276;
+  ENUM_VALUE16058 = 277;
+  ENUM_VALUE16059 = 18;
+  ENUM_VALUE16060 = 289;
+  ENUM_VALUE16061 = 291;
+  ENUM_VALUE16062 = 4657;
+  ENUM_VALUE16063 = 74513;
+  ENUM_VALUE16064 = 4658;
+  ENUM_VALUE16065 = 4659;
+  ENUM_VALUE16066 = 4660;
+  ENUM_VALUE16067 = 4661;
+  ENUM_VALUE16068 = 4662;
+  ENUM_VALUE16069 = 4663;
+  ENUM_VALUE16070 = 4664;
+  ENUM_VALUE16071 = 292;
+  ENUM_VALUE16072 = 4673;
+  ENUM_VALUE16073 = 4674;
+  ENUM_VALUE16074 = 293;
+  ENUM_VALUE16075 = 19;
+  ENUM_VALUE16076 = 20;
+  ENUM_VALUE16077 = 321;
+  ENUM_VALUE16078 = 5137;
+  ENUM_VALUE16079 = 5138;
+  ENUM_VALUE16080 = 5139;
+  ENUM_VALUE16081 = 5140;
+  ENUM_VALUE16082 = 5141;
+  ENUM_VALUE16083 = 5142;
+  ENUM_VALUE16084 = 82273;
+  ENUM_VALUE16085 = 82274;
+  ENUM_VALUE16086 = 82275;
+  ENUM_VALUE16087 = 82276;
+  ENUM_VALUE16088 = 82277;
+  ENUM_VALUE16089 = 82278;
+  ENUM_VALUE16090 = 5143;
+  ENUM_VALUE16091 = 5144;
+  ENUM_VALUE16092 = 5145;
+  ENUM_VALUE16093 = 5146;
+  ENUM_VALUE16094 = 82337;
+  ENUM_VALUE16095 = 5147;
+  ENUM_VALUE16096 = 5148;
+  ENUM_VALUE16097 = 322;
+  ENUM_VALUE16098 = 323;
+  ENUM_VALUE16099 = 324;
+  ENUM_VALUE16100 = 325;
+  ENUM_VALUE16101 = 326;
+  ENUM_VALUE16102 = 327;
+  ENUM_VALUE16103 = 328;
+  ENUM_VALUE16104 = 21;
+  ENUM_VALUE16105 = 337;
+  ENUM_VALUE16106 = 22;
+  ENUM_VALUE16107 = 23;
+  ENUM_VALUE16108 = 24;
+  ENUM_VALUE16109 = 2;
+  ENUM_VALUE16110 = 33;
+  ENUM_VALUE16111 = 34;
+  ENUM_VALUE16112 = 545;
+  ENUM_VALUE16113 = 8721;
+  ENUM_VALUE16114 = 8723;
+  ENUM_VALUE16115 = 8724;
+  ENUM_VALUE16116 = 546;
+  ENUM_VALUE16117 = 8739;
+  ENUM_VALUE16118 = 8740;
+  ENUM_VALUE16119 = 547;
+  ENUM_VALUE16120 = 548;
+  ENUM_VALUE16121 = 549;
+  ENUM_VALUE16122 = 550;
+  ENUM_VALUE16123 = 551;
+  ENUM_VALUE16124 = 552;
+  ENUM_VALUE16125 = 553;
+  ENUM_VALUE16126 = 35;
+  ENUM_VALUE16127 = 36;
+  ENUM_VALUE16128 = 37;
+  ENUM_VALUE16129 = 593;
+  ENUM_VALUE16130 = 594;
+  ENUM_VALUE16131 = 595;
+  ENUM_VALUE16132 = 596;
+  ENUM_VALUE16133 = 597;
+  ENUM_VALUE16134 = 38;
+  ENUM_VALUE16135 = 609;
+  ENUM_VALUE16136 = 610;
+  ENUM_VALUE16137 = 617;
+  ENUM_VALUE16138 = 614;
+  ENUM_VALUE16139 = 615;
+  ENUM_VALUE16140 = 616;
+  ENUM_VALUE16141 = 618;
+  ENUM_VALUE16142 = 620;
+  ENUM_VALUE16143 = 9937;
+  ENUM_VALUE16144 = 9938;
+  ENUM_VALUE16145 = 9939;
+  ENUM_VALUE16146 = 9940;
+  ENUM_VALUE16147 = 9941;
+  ENUM_VALUE16148 = 39;
+  ENUM_VALUE16149 = 40;
+  ENUM_VALUE16150 = 41;
+  ENUM_VALUE16151 = 42;
+  ENUM_VALUE16152 = 43;
+  ENUM_VALUE16153 = 44;
+  ENUM_VALUE16154 = 45;
+  ENUM_VALUE16155 = 11793;
+  ENUM_VALUE16156 = 3;
+  ENUM_VALUE16157 = 49;
+  ENUM_VALUE16158 = 50;
+  ENUM_VALUE16159 = 51;
+  ENUM_VALUE16160 = 817;
+  ENUM_VALUE16161 = 818;
+  ENUM_VALUE16162 = 819;
+  ENUM_VALUE16163 = 52;
+  ENUM_VALUE16164 = 833;
+  ENUM_VALUE16165 = 53;
+  ENUM_VALUE16166 = 54;
+  ENUM_VALUE16167 = 4;
+  ENUM_VALUE16168 = 1041;
+  ENUM_VALUE16169 = 16657;
+  ENUM_VALUE16170 = 16658;
+  ENUM_VALUE16171 = 16659;
+  ENUM_VALUE16172 = 16660;
+  ENUM_VALUE16173 = 16661;
+  ENUM_VALUE16174 = 1042;
+  ENUM_VALUE16175 = 16673;
+  ENUM_VALUE16176 = 1043;
+  ENUM_VALUE16177 = 16689;
+  ENUM_VALUE16178 = 16690;
+  ENUM_VALUE16179 = 16691;
+  ENUM_VALUE16180 = 16692;
+  ENUM_VALUE16181 = 16693;
+  ENUM_VALUE16182 = 16694;
+  ENUM_VALUE16183 = 16695;
+  ENUM_VALUE16184 = 1044;
+  ENUM_VALUE16185 = 16705;
+  ENUM_VALUE16186 = 16706;
+  ENUM_VALUE16187 = 16707;
+  ENUM_VALUE16188 = 16708;
+  ENUM_VALUE16189 = 16709;
+  ENUM_VALUE16190 = 16710;
+  ENUM_VALUE16191 = 16711;
+  ENUM_VALUE16192 = 16712;
+  ENUM_VALUE16193 = 16713;
+  ENUM_VALUE16194 = 1046;
+  ENUM_VALUE16195 = 16737;
+  ENUM_VALUE16196 = 1047;
+  ENUM_VALUE16197 = 16753;
+  ENUM_VALUE16198 = 268049;
+  ENUM_VALUE16199 = 268050;
+  ENUM_VALUE16200 = 268051;
+  ENUM_VALUE16201 = 268052;
+  ENUM_VALUE16202 = 1048;
+  ENUM_VALUE16203 = 16769;
+  ENUM_VALUE16204 = 16770;
+  ENUM_VALUE16205 = 16771;
+  ENUM_VALUE16206 = 16772;
+  ENUM_VALUE16207 = 16773;
+  ENUM_VALUE16208 = 1049;
+  ENUM_VALUE16209 = 1056;
+  ENUM_VALUE16210 = 1058;
+  ENUM_VALUE16211 = 1059;
+  ENUM_VALUE16212 = 1060;
+  ENUM_VALUE16213 = 1061;
+  ENUM_VALUE16214 = 5;
+  ENUM_VALUE16215 = 6;
+  ENUM_VALUE16216 = 97;
+  ENUM_VALUE16217 = 98;
+  ENUM_VALUE16218 = 99;
+  ENUM_VALUE16219 = 100;
+  ENUM_VALUE16220 = 101;
+  ENUM_VALUE16221 = 102;
+  ENUM_VALUE16222 = 103;
+  ENUM_VALUE16223 = 104;
+  ENUM_VALUE16224 = 105;
+  ENUM_VALUE16225 = 106;
+  ENUM_VALUE16226 = 108;
+  ENUM_VALUE16227 = 1729;
+  ENUM_VALUE16228 = 1730;
+  ENUM_VALUE16229 = 1731;
+  ENUM_VALUE16230 = 7;
+  ENUM_VALUE16231 = 8;
+  ENUM_VALUE16232 = 9;
+  ENUM_VALUE16233 = 10;
+  ENUM_VALUE16234 = 161;
+  ENUM_VALUE16235 = 2577;
+  ENUM_VALUE16236 = 41233;
+  ENUM_VALUE16237 = 41234;
+  ENUM_VALUE16238 = 2578;
+  ENUM_VALUE16239 = 2579;
+  ENUM_VALUE16240 = 41265;
+  ENUM_VALUE16241 = 2580;
+  ENUM_VALUE16242 = 2581;
+  ENUM_VALUE16243 = 41297;
+  ENUM_VALUE16244 = 41298;
+  ENUM_VALUE16245 = 41299;
+  ENUM_VALUE16246 = 41300;
+  ENUM_VALUE16247 = 2582;
+  ENUM_VALUE16248 = 2583;
+  ENUM_VALUE16249 = 2584;
+  ENUM_VALUE16250 = 162;
+  ENUM_VALUE16251 = 2593;
+  ENUM_VALUE16252 = 41489;
+  ENUM_VALUE16253 = 663825;
+  ENUM_VALUE16254 = 663826;
+  ENUM_VALUE16255 = 41490;
+  ENUM_VALUE16256 = 41491;
+  ENUM_VALUE16257 = 41492;
+  ENUM_VALUE16258 = 663873;
+  ENUM_VALUE16259 = 2594;
+  ENUM_VALUE16260 = 41505;
+  ENUM_VALUE16261 = 41506;
+  ENUM_VALUE16262 = 41507;
+  ENUM_VALUE16263 = 2595;
+  ENUM_VALUE16264 = 41521;
+  ENUM_VALUE16265 = 41522;
+  ENUM_VALUE16266 = 41523;
+  ENUM_VALUE16267 = 41524;
+  ENUM_VALUE16268 = 41525;
+  ENUM_VALUE16269 = 664401;
+  ENUM_VALUE16270 = 664402;
+  ENUM_VALUE16271 = 41526;
+  ENUM_VALUE16272 = 41527;
+  ENUM_VALUE16273 = 2596;
+  ENUM_VALUE16274 = 2597;
+  ENUM_VALUE16275 = 2598;
+  ENUM_VALUE16276 = 41569;
+  ENUM_VALUE16277 = 41570;
+  ENUM_VALUE16278 = 41571;
+  ENUM_VALUE16279 = 41572;
+  ENUM_VALUE16280 = 41573;
+  ENUM_VALUE16281 = 665169;
+  ENUM_VALUE16282 = 665170;
+  ENUM_VALUE16283 = 665171;
+  ENUM_VALUE16284 = 665172;
+  ENUM_VALUE16285 = 2599;
+  ENUM_VALUE16286 = 2600;
+  ENUM_VALUE16287 = 2601;
+  ENUM_VALUE16288 = 2603;
+  ENUM_VALUE16289 = 2604;
+  ENUM_VALUE16290 = 163;
+  ENUM_VALUE16291 = 2608;
+  ENUM_VALUE16292 = 2609;
+  ENUM_VALUE16293 = 2610;
+  ENUM_VALUE16294 = 2611;
+  ENUM_VALUE16295 = 2612;
+  ENUM_VALUE16296 = 164;
+  ENUM_VALUE16297 = 2625;
+  ENUM_VALUE16298 = 2626;
+  ENUM_VALUE16299 = 42017;
+  ENUM_VALUE16300 = 42018;
+  ENUM_VALUE16301 = 42019;
+  ENUM_VALUE16302 = 2627;
+  ENUM_VALUE16303 = 2628;
+  ENUM_VALUE16304 = 165;
+  ENUM_VALUE16305 = 2641;
+  ENUM_VALUE16306 = 42257;
+  ENUM_VALUE16307 = 42258;
+  ENUM_VALUE16308 = 2642;
+  ENUM_VALUE16309 = 2643;
+  ENUM_VALUE16310 = 2644;
+  ENUM_VALUE16311 = 2646;
+  ENUM_VALUE16312 = 2647;
+  ENUM_VALUE16313 = 42353;
+  ENUM_VALUE16314 = 2648;
+  ENUM_VALUE16315 = 2649;
+  ENUM_VALUE16316 = 2650;
+  ENUM_VALUE16317 = 2651;
+  ENUM_VALUE16318 = 2652;
+  ENUM_VALUE16319 = 2653;
+  ENUM_VALUE16320 = 2654;
+  ENUM_VALUE16321 = 42481;
+  ENUM_VALUE16322 = 42482;
+  ENUM_VALUE16323 = 42483;
+  ENUM_VALUE16324 = 166;
+  ENUM_VALUE16325 = 2657;
+  ENUM_VALUE16326 = 2658;
+  ENUM_VALUE16327 = 42529;
+  ENUM_VALUE16328 = 2659;
+  ENUM_VALUE16329 = 2660;
+  ENUM_VALUE16330 = 2661;
+  ENUM_VALUE16331 = 2662;
+  ENUM_VALUE16332 = 2663;
+  ENUM_VALUE16333 = 42609;
+  ENUM_VALUE16334 = 2664;
+  ENUM_VALUE16335 = 2665;
+  ENUM_VALUE16336 = 42753;
+  ENUM_VALUE16337 = 42754;
+  ENUM_VALUE16338 = 42755;
+  ENUM_VALUE16339 = 11;
+  ENUM_VALUE16340 = 177;
+  ENUM_VALUE16341 = 2833;
+  ENUM_VALUE16342 = 179;
+  ENUM_VALUE16343 = 180;
+  ENUM_VALUE16344 = 2881;
+  ENUM_VALUE16345 = 182;
+  ENUM_VALUE16346 = 183;
+  ENUM_VALUE16347 = 12;
+  ENUM_VALUE16348 = 3089;
+  ENUM_VALUE16349 = 194;
+  ENUM_VALUE16350 = 195;
+  ENUM_VALUE16351 = 196;
+  ENUM_VALUE16352 = 198;
+  ENUM_VALUE16353 = 3169;
+  ENUM_VALUE16354 = 199;
+  ENUM_VALUE16355 = 200;
+  ENUM_VALUE16356 = 208;
+  ENUM_VALUE16357 = 3329;
+  ENUM_VALUE16358 = 3330;
+  ENUM_VALUE16359 = 3331;
+  ENUM_VALUE16360 = 209;
+  ENUM_VALUE16361 = 210;
+  ENUM_VALUE16362 = 211;
+  ENUM_VALUE16363 = 3377;
+  ENUM_VALUE16364 = 3378;
+  ENUM_VALUE16365 = 3379;
+  ENUM_VALUE16366 = 3380;
+  ENUM_VALUE16367 = 3381;
+  ENUM_VALUE16368 = 865809;
+  ENUM_VALUE16369 = 865810;
+  ENUM_VALUE16370 = 865811;
+  ENUM_VALUE16371 = 865812;
+  ENUM_VALUE16372 = 865813;
+  ENUM_VALUE16373 = 865814;
+  ENUM_VALUE16374 = 865815;
+  ENUM_VALUE16375 = 865816;
+  ENUM_VALUE16376 = 865817;
+  ENUM_VALUE16377 = 865818;
+  ENUM_VALUE16378 = 865819;
+  ENUM_VALUE16379 = 865820;
+  ENUM_VALUE16380 = 865821;
+  ENUM_VALUE16381 = 865822;
+  ENUM_VALUE16382 = 865823;
+  ENUM_VALUE16383 = 865824;
+  ENUM_VALUE16384 = 865825;
+  ENUM_VALUE16385 = 865826;
+  ENUM_VALUE16386 = 865827;
+  ENUM_VALUE16387 = 865828;
+  ENUM_VALUE16388 = 865829;
+  ENUM_VALUE16389 = 212;
+  ENUM_VALUE16390 = 3393;
+  ENUM_VALUE16391 = 3394;
+  ENUM_VALUE16392 = 3395;
+  ENUM_VALUE16393 = 213;
+  ENUM_VALUE16394 = 214;
+  ENUM_VALUE16395 = 215;
+  ENUM_VALUE16396 = 3441;
+  ENUM_VALUE16397 = 3442;
+  ENUM_VALUE16398 = 216;
+  ENUM_VALUE16399 = 217;
+  ENUM_VALUE16400 = 3473;
+  ENUM_VALUE16401 = 3474;
+  ENUM_VALUE16402 = 3475;
+  ENUM_VALUE16403 = 254;
+  ENUM_VALUE16404 = 255;
+}
+
+enum Enum16553 {
+  ENUM_VALUE16554 = 0;
+  ENUM_VALUE16555 = 1;
+  ENUM_VALUE16556 = 2;
+  ENUM_VALUE16557 = 3;
+  ENUM_VALUE16558 = 4;
+  ENUM_VALUE16559 = 5;
+  ENUM_VALUE16560 = 6;
+  ENUM_VALUE16561 = 7;
+  ENUM_VALUE16562 = 8;
+  ENUM_VALUE16563 = 9;
+}
+
+enum Enum16728 {
+  ENUM_VALUE16729 = 1;
+  ENUM_VALUE16730 = 2;
+  ENUM_VALUE16731 = 3;
+}
+
+enum Enum16732 {
+  ENUM_VALUE16733 = 1;
+  ENUM_VALUE16734 = 2;
+  ENUM_VALUE16735 = 3;
+  ENUM_VALUE16736 = 4;
+  ENUM_VALUE16737 = 5;
+}
+
+enum Enum16738 {
+  ENUM_VALUE16739 = 1;
+  ENUM_VALUE16740 = 2;
+  ENUM_VALUE16741 = 3;
+  ENUM_VALUE16742 = 4;
+  ENUM_VALUE16743 = 5;
+  ENUM_VALUE16744 = 6;
+  ENUM_VALUE16745 = 7;
+}
+
+enum Enum16698 {
+  ENUM_VALUE16699 = -1;
+  ENUM_VALUE16700 = 100;
+  ENUM_VALUE16701 = 2;
+  ENUM_VALUE16702 = 0;
+  ENUM_VALUE16703 = 1;
+  ENUM_VALUE16704 = 4;
+  ENUM_VALUE16705 = 11;
+  ENUM_VALUE16706 = 12;
+  ENUM_VALUE16707 = 3;
+  ENUM_VALUE16708 = 5;
+  ENUM_VALUE16709 = 6;
+  ENUM_VALUE16710 = 7;
+  ENUM_VALUE16711 = 8;
+  ENUM_VALUE16712 = 9;
+  ENUM_VALUE16713 = 10;
+  ENUM_VALUE16714 = 13;
+  ENUM_VALUE16715 = 14;
+  ENUM_VALUE16716 = 15;
+  ENUM_VALUE16717 = 16;
+  ENUM_VALUE16718 = 18;
+  ENUM_VALUE16719 = 17;
+  ENUM_VALUE16720 = 19;
+  ENUM_VALUE16721 = 20;
+}
+
+enum Enum16819 {
+  ENUM_VALUE16820 = 0;
+  ENUM_VALUE16821 = 1;
+  ENUM_VALUE16822 = 2;
+  ENUM_VALUE16823 = 3;
+  ENUM_VALUE16824 = 4;
+  ENUM_VALUE16825 = 5;
+}
+
+enum Enum16925 {
+  ENUM_VALUE16926 = 0;
+  ENUM_VALUE16927 = 1;
+  ENUM_VALUE16928 = 2;
+  ENUM_VALUE16929 = 3;
+  ENUM_VALUE16930 = 4;
+  ENUM_VALUE16931 = 5;
+  ENUM_VALUE16932 = 6;
+  ENUM_VALUE16933 = 7;
+  ENUM_VALUE16934 = 8;
+  ENUM_VALUE16935 = 9;
+  ENUM_VALUE16936 = 10;
+  ENUM_VALUE16937 = 11;
+  ENUM_VALUE16938 = 12;
+  ENUM_VALUE16939 = 13;
+}
+
+enum Enum22854 {
+  ENUM_VALUE22855 = 0;
+  ENUM_VALUE22856 = 1;
+}
+
+enum Enum24361 {
+  ENUM_VALUE24362 = 0;
+  ENUM_VALUE24363 = 1;
+  ENUM_VALUE24364 = 2;
+  ENUM_VALUE24365 = 3;
+}
+
+enum Enum16891 {
+  ENUM_VALUE16892 = 0;
+  ENUM_VALUE16893 = 1;
+  ENUM_VALUE16894 = 2;
+  ENUM_VALUE16895 = 3;
+  ENUM_VALUE16896 = 4;
+  ENUM_VALUE16897 = 5;
+  ENUM_VALUE16898 = 6;
+  ENUM_VALUE16899 = 7;
+  ENUM_VALUE16900 = 8;
+  ENUM_VALUE16901 = 9;
+  ENUM_VALUE16902 = 10;
+  ENUM_VALUE16903 = 11;
+  ENUM_VALUE16904 = 12;
+  ENUM_VALUE16905 = 13;
+  ENUM_VALUE16906 = 14;
+  ENUM_VALUE16907 = 15;
+  ENUM_VALUE16908 = 16;
+  ENUM_VALUE16909 = 17;
+  ENUM_VALUE16910 = 18;
+  ENUM_VALUE16911 = 19;
+  ENUM_VALUE16912 = 20;
+  ENUM_VALUE16913 = 21;
+  ENUM_VALUE16914 = 22;
+  ENUM_VALUE16915 = 23;
+  ENUM_VALUE16916 = 24;
+  ENUM_VALUE16917 = 25;
+  ENUM_VALUE16918 = 26;
+  ENUM_VALUE16919 = 27;
+  ENUM_VALUE16920 = 28;
+  ENUM_VALUE16921 = 29;
+  ENUM_VALUE16922 = 30;
+  ENUM_VALUE16923 = 31;
+}
+
+enum Enum27361 {
+  ENUM_VALUE27362 = 0;
+  ENUM_VALUE27363 = 1;
+  ENUM_VALUE27364 = 2;
+  ENUM_VALUE27365 = 3;
+  ENUM_VALUE27366 = 4;
+}
+
+enum Enum33960 {
+  ENUM_VALUE33961 = 0;
+  ENUM_VALUE33962 = 1;
+  ENUM_VALUE33963 = 2;
+  ENUM_VALUE33964 = 3;
+  ENUM_VALUE33965 = 4;
+  ENUM_VALUE33966 = 5;
+  ENUM_VALUE33967 = 6;
+}
+
+enum Enum34388 {
+  ENUM_VALUE34389 = 1;
+}
+
+enum Enum35477 {
+  ENUM_VALUE35478 = 4;
+  ENUM_VALUE35479 = 3;
+  ENUM_VALUE35480 = 2;
+  ENUM_VALUE35481 = 1;
+  ENUM_VALUE35482 = 0;
+}
+
+enum Enum35507 {
+  ENUM_VALUE35508 = 0;
+  ENUM_VALUE35509 = 1;
+  ENUM_VALUE35510 = 2;
+  ENUM_VALUE35511 = 3;
+  ENUM_VALUE35512 = 4;
+  ENUM_VALUE35513 = 5;
+  ENUM_VALUE35514 = 6;
+  ENUM_VALUE35515 = 7;
+  ENUM_VALUE35516 = 8;
+  ENUM_VALUE35517 = 9;
+}
+
+enum Enum36860 {
+  ENUM_VALUE36861 = 0;
+  ENUM_VALUE36862 = 1;
+  ENUM_VALUE36863 = 2;
+  ENUM_VALUE36864 = 3;
+  ENUM_VALUE36865 = 4;
+  ENUM_VALUE36866 = 5;
+  ENUM_VALUE36867 = 6;
+  ENUM_VALUE36868 = 7;
+}
+
+enum Enum36890 {
+  ENUM_VALUE36891 = 0;
+  ENUM_VALUE36892 = 1;
+}
+
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
new file mode 100644
index 0000000..2161393
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
@@ -0,0 +1,454 @@
+syntax = "proto2";
+
+import "datasets/google_message4/benchmark_message4_1.proto";
+import "datasets/google_message4/benchmark_message4_2.proto";
+import "datasets/google_message4/benchmark_message4_3.proto";
+package benchmarks.google_message4;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message GoogleMessage4 {
+  optional int32 field37503 = 1;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37504 = 2;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37505 = 3;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37506 = 4;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37507 = 5;
+  optional .benchmarks.google_message4.Message37489 field37508 = 6;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37509 = 7;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37510 = 8;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37511 = 9;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37512 = 10;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37513 = 11;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37514 = 12;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37515 = 13;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37516 = 14;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37517 = 15;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37518 = 16;
+}
+
+message Message37489 {
+  optional .benchmarks.google_message4.Message2517 field37534 = 3;
+  optional .benchmarks.google_message4.Message7330 field37535 = 4;
+  optional .benchmarks.google_message4.Message8815 field37536 = 6;
+  optional .benchmarks.google_message4.Message8817 field37537 = 7;
+  optional .benchmarks.google_message4.Message8835 field37538 = 8;
+  optional .benchmarks.google_message4.Message8848 field37539 = 9;
+  optional .benchmarks.google_message4.Message8856 field37540 = 11;
+  optional .benchmarks.google_message4.Message12717 field37541 = 15;
+  optional .benchmarks.google_message4.Message12748 field37542 = 20;
+  optional .benchmarks.google_message4.Message7319 field37543 = 22;
+  optional .benchmarks.google_message4.Message12908 field37544 = 24;
+  optional .benchmarks.google_message4.Message12910 field37545 = 25;
+  optional .benchmarks.google_message4.Message12960 field37546 = 30;
+  optional .benchmarks.google_message4.Message176 field37547 = 33;
+  optional .benchmarks.google_message4.Message13000 field37548 = 34;
+  optional .benchmarks.google_message4.Message13035 field37549 = 35;
+  optional .benchmarks.google_message4.Message37331 field37550 = 36;
+  optional .benchmarks.google_message4.Message37329 field37551 = 37;
+  optional .benchmarks.google_message4.Message37327 field37552 = 38;
+  optional .benchmarks.google_message4.Message37333 field37553 = 39;
+  optional .benchmarks.google_message4.Message37335 field37554 = 40;
+}
+
+message Message7319 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7321 = 1;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7322 = 7;
+}
+
+message Message12717 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12719 = 1;
+  optional string field12720 = 2;
+  optional uint32 field12721 = 3;
+  optional .benchmarks.google_message4.Message11976 field12722 = 4;
+  repeated .benchmarks.google_message4.Message11948 field12723 = 5;
+  optional .benchmarks.google_message4.Message11947 field12724 = 6;
+  optional .benchmarks.google_message4.Message12687 field12725 = 7;
+  repeated .benchmarks.google_message4.Message11948 field12726 = 8;
+  optional int64 field12727 = 9;
+}
+
+message Message37331 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37367 = 4;
+  required .benchmarks.google_message4.Message37326 field37368 = 1;
+  required int64 field37369 = 2;
+  required bytes field37370 = 3;
+}
+
+message Message8815 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8819 = 1;
+  repeated .benchmarks.google_message4.Message8768 field8820 = 2;
+  optional bool field8821 = 3;
+}
+
+message Message7330 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7332 = 1;
+  optional .benchmarks.google_message4.Message3069 field7333 = 2;
+  optional .benchmarks.google_message4.Message7320 field7334 = 3;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7335 = 4;
+  optional bool field7336 = 5;
+  optional int64 field7337 = 6;
+}
+
+message Message12960 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12962 = 1;
+  optional .benchmarks.google_message4.Message12948 field12963 = 2;
+}
+
+message Message176 {
+  required string field408 = 1;
+  optional int32 field409 = 4;
+  optional string field410 = 50;
+  optional int32 field411 = 2;
+  optional uint64 field412 = 47;
+  optional string field413 = 56;
+  optional int32 field414 = 24;
+  optional string field415 = 21;
+  optional bytes field416 = 3;
+  optional string field417 = 57;
+  optional int32 field418 = 51;
+  optional float field419 = 7;
+  optional bool field420 = 5;
+  optional bool field421 = 28;
+  optional int32 field422 = 6;
+  repeated int32 field423 = 40;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field424 = 41;
+  optional bool field425 = 25;
+  optional uint64 field426 = 26;
+  optional int32 field427 = 38;
+  optional bytes field428 = 15;
+  optional bytes field429 = 55;
+  optional bytes field430 = 16;
+  optional bytes field431 = 23;
+  optional bool field432 = 33;
+  optional bytes field433 = 31;
+  optional bytes field434 = 32;
+  optional int32 field435 = 36;
+  optional uint64 field436 = 17;
+  optional int32 field437 = 45;
+  optional uint64 field438 = 18;
+  optional string field439 = 46;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field440 = 64;
+  optional int32 field441 = 39;
+  optional uint64 field442 = 48;
+  optional bytes field443 = 19;
+  optional bytes field444 = 42;
+  optional bytes field445 = 43;
+  optional string field446 = 44;
+  optional string field447 = 49;
+  optional int64 field448 = 20;
+  optional bool field449 = 53;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field450 = 54;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field451 = 22;
+  optional .benchmarks.google_message4.UnusedEnum field452 = 27;
+  optional int32 field453 = 29;
+  optional int32 field454 = 30;
+  optional .benchmarks.google_message4.UnusedEnum field455 = 37;
+  optional .benchmarks.google_message4.UnusedEnum field456 = 34;
+  optional int32 field457 = 35;
+  repeated group Message178 = 101 {
+  }
+  optional bool field459 = 52;
+  optional uint64 field460 = 58;
+  optional uint64 field461 = 59;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field462 = 60;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field463 = 61;
+  optional .benchmarks.google_message4.UnusedEnum field464 = 62;
+  repeated string field465 = 63;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field466 = 65;
+}
+
+message Message8817 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8825 = 1;
+  repeated .benchmarks.google_message4.Message8768 field8826 = 2;
+  optional string field8827 = 3;
+}
+
+message Message8835 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8837 = 1;
+  repeated string field8838 = 2;
+  optional .benchmarks.google_message4.UnusedEnum field8839 = 3;
+}
+
+message Message37333 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37372 = 3;
+  required .benchmarks.google_message4.Message37326 field37373 = 1;
+  optional uint64 field37374 = 2;
+}
+
+message Message13000 {
+  optional int64 field13015 = 1;
+  repeated .benchmarks.google_message4.Message12979 field13016 = 2;
+}
+
+message Message37335 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37376 = 4;
+  required .benchmarks.google_message4.Message37326 field37377 = 1;
+  required .benchmarks.google_message4.Message37173 field37378 = 2;
+  optional uint64 field37379 = 3;
+}
+
+message Message8848 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8850 = 1;
+  optional string field8851 = 2;
+  optional bytes field8852 = 3;
+}
+
+message Message13035 {
+  optional int64 field13058 = 1;
+  repeated int64 field13059 = 2;
+}
+
+message Message8856 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8858 = 1;
+  optional string field8859 = 2;
+}
+
+message Message12908 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12912 = 1;
+  optional string field12913 = 2;
+  optional .benchmarks.google_message4.Message12799 field12914 = 3;
+  optional int64 field12915 = 4;
+  optional .benchmarks.google_message4.Message3804 field12916 = 5;
+  optional .benchmarks.google_message4.Message12870 field12917 = 6;
+}
+
+message Message12910 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12920 = 1;
+  optional .benchmarks.google_message4.Message12818 field12921 = 2;
+  repeated .benchmarks.google_message4.Message12903 field12922 = 3;
+}
+
+message Message37327 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37347 = 11;
+  required .benchmarks.google_message4.Message37326 field37348 = 1;
+  optional bool field37349 = 2;
+  optional bool field37350 = 3;
+  optional bool field37351 = 4;
+  optional bool field37352 = 5;
+  optional bool field37353 = 6;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37354 = 7;
+  optional uint64 field37355 = 8;
+  optional bool field37356 = 9;
+  optional bool field37357 = 10;
+}
+
+message Message37329 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37359 = 6;
+  required .benchmarks.google_message4.Message37326 field37360 = 1;
+  required int64 field37361 = 2;
+  required int64 field37362 = 3;
+  optional bool field37363 = 4;
+}
+
+message Message2517 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field2519 = 1;
+  optional .benchmarks.google_message4.Message2356 field2520 = 2;
+  optional .benchmarks.google_message4.Message0 field2521 = 3;
+  optional .benchmarks.google_message4.Message2463 field2522 = 4;
+  repeated .benchmarks.google_message4.Message971 field2523 = 5;
+}
+
+message Message12748 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12754 = 1;
+  optional string field12755 = 2;
+  optional string field12756 = 3;
+  optional .benchmarks.google_message4.Enum12735 field12757 = 4;
+}
+
+message Message12687 {
+  repeated .benchmarks.google_message4.Message12686 field12701 = 1;
+}
+
+message Message11948 {
+  optional string field11954 = 1;
+  repeated .benchmarks.google_message4.Message11949 field11955 = 2;
+  optional bool field11956 = 3;
+}
+
+message Message11976 {
+  repeated .benchmarks.google_message4.Message11975 field12002 = 1;
+}
+
+message Message7320 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7323 = 1;
+  optional .benchmarks.google_message4.Message7287 field7324 = 8;
+}
+
+message Message3069 {
+  optional .benchmarks.google_message4.Message3061 field3374 = 1;
+  optional bytes field3375 = 2;
+  repeated group Message3070 = 3 {
+    required .benchmarks.google_message4.Enum3071 field3378 = 4;
+    required bytes field3379 = 5;
+  }
+  extensions 10000 to 536870911;
+}
+
+message Message12948 {
+  repeated .benchmarks.google_message4.Message12949 field12958 = 1;
+}
+
+message Message8768 {
+  optional string field8782 = 1;
+  optional .benchmarks.google_message4.Message8572 field8783 = 2;
+  optional bool field8784 = 3;
+  repeated .benchmarks.google_message4.Message8774 field8785 = 4;
+  optional int64 field8786 = 5;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8787 = 6;
+  optional string field8788 = 7;
+}
+
+message Message12979 {
+  required bytes field12981 = 1;
+  repeated string field12982 = 2;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12983 = 3;
+  optional int64 field12984 = 4;
+  optional string field12985 = 5;
+  optional int32 field12986 = 6;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12987 = 7;
+}
+
+message Message37173 {
+  optional string field37252 = 1;
+  optional int64 field37253 = 2;
+  optional .benchmarks.google_message4.UnusedEnum field37254 = 4;
+  optional bool field37255 = 5;
+  optional bool field37256 = 6;
+  optional bool field37257 = 7;
+  optional string field37258 = 8;
+  optional string field37259 = 9;
+  optional uint32 field37260 = 10;
+  optional fixed32 field37261 = 11;
+  optional string field37262 = 12;
+  optional string field37263 = 13;
+  optional string field37264 = 14;
+  optional int32 field37265 = 15;
+  optional int64 field37266 = 16;
+  optional int64 field37267 = 17;
+  optional int32 field37268 = 18;
+  optional int32 field37269 = 19;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37270 = 20;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37271 = 21;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37272 = 22;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37273 = 23;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field37274 = 24;
+  optional string field37275 = 25;
+  optional bool field37276 = 26;
+}
+
+message Message12799 {
+  required string field12809 = 1;
+  repeated fixed64 field12810 = 2;
+  repeated .benchmarks.google_message4.Message12776 field12811 = 8;
+  repeated int32 field12812 = 4;
+  repeated .benchmarks.google_message4.Message12798 field12813 = 5;
+  required int32 field12814 = 3;
+  optional int32 field12815 = 6;
+  optional .benchmarks.google_message4.Message12797 field12816 = 7;
+}
+
+message Message12870 {
+  required int32 field12879 = 1;
+  optional int32 field12880 = 7;
+  required int32 field12881 = 2;
+  optional uint64 field12882 = 3;
+  optional string field12883 = 2001;
+  optional fixed64 field12884 = 4;
+  repeated fixed64 field12885 = 14;
+  optional int32 field12886 = 9;
+  optional int64 field12887 = 18;
+  repeated .benchmarks.google_message4.Message12870 field12888 = 8;
+  optional int32 field12889 = 5;
+  optional uint64 field12890 = 6;
+  optional int32 field12891 = 10;
+  optional int32 field12892 = 11;
+  optional double field12893 = 12;
+  optional .benchmarks.google_message4.Message12825 field12894 = 13;
+  optional double field12895 = 15;
+  optional string field12896 = 16;
+  optional .benchmarks.google_message4.Enum12871 field12897 = 17;
+  optional int32 field12898 = 19;
+}
+
+message Message3804 {
+  required int64 field3818 = 1;
+  required bool field3819 = 2;
+  repeated .benchmarks.google_message4.Enum3805 field3820 = 4;
+  optional int32 field3821 = 5;
+  optional bool field3822 = 6;
+  optional int64 field3823 = 7;
+  optional .benchmarks.google_message4.Enum3783 field3824 = 8;
+}
+
+message Message12903 {
+  optional string field12905 = 1;
+  optional .benchmarks.google_message4.Message8587 field12906 = 2;
+  repeated .benchmarks.google_message4.Message8590 field12907 = 3;
+}
+
+message Message37326 {
+  required string field37345 = 1;
+  optional string field37346 = 2;
+}
+
+message Message2356 {
+  optional .benchmarks.google_message4.Message1374 field2368 = 121;
+  optional uint64 field2369 = 1;
+  optional int32 field2370 = 2;
+  optional int32 field2371 = 17;
+  required string field2372 = 3;
+  optional int32 field2373 = 7;
+  optional bytes field2374 = 8;
+  optional string field2375 = 4;
+  optional string field2376 = 101;
+  optional int32 field2377 = 102;
+  optional int32 field2378 = 103;
+  optional int32 field2379 = 104;
+  optional int32 field2380 = 113;
+  optional int32 field2381 = 114;
+  optional int32 field2382 = 115;
+  optional int32 field2383 = 117;
+  optional int32 field2384 = 118;
+  optional int32 field2385 = 119;
+  optional int32 field2386 = 105;
+  optional bytes field2387 = 5;
+  optional group Message2357 = 6 {
+    optional int64 field2399 = 9;
+    optional int32 field2400 = 10;
+    optional int32 field2401 = 11;
+    optional int32 field2402 = 12;
+    optional int32 field2403 = 13;
+    optional int32 field2404 = 116;
+    optional int32 field2405 = 106;
+    required bytes field2406 = 14;
+    optional int32 field2407 = 45;
+    optional int32 field2408 = 112;
+    optional bool field2409 = 122;
+    optional bytes field2410 = 124;
+  }
+  optional string field2389 = 120;
+  optional group Message2358 = 107 {
+  }
+  repeated group Message2359 = 40 {
+  }
+  optional int32 field2392 = 50;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field2393 = 60;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field2394 = 70;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field2395 = 80;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field2396 = 90;
+  optional string field2397 = 100;
+  optional string field2398 = 123;
+}
+
+message Message0 {
+  option message_set_wire_format = true;
+  extensions 4 to 2147483646;
+}
+
+message Message971 {
+  optional string field972 = 1;
+  optional int32 field973 = 2;
+  optional bool field974 = 3;
+}
+
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
new file mode 100644
index 0000000..e769748
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
@@ -0,0 +1,474 @@
+syntax = "proto2";
+
+import "datasets/google_message4/benchmark_message4_2.proto";
+import "datasets/google_message4/benchmark_message4_3.proto";
+package benchmarks.google_message4;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message2463 {
+  repeated .benchmarks.google_message4.Message2462 field2498 = 1;
+}
+
+message Message12686 {
+  optional string field12699 = 1;
+  optional .benchmarks.google_message4.Message12685 field12700 = 2;
+}
+
+message Message11949 {
+}
+
+message Message11975 {
+  optional string field11992 = 1;
+  optional int32 field11993 = 2;
+  repeated .benchmarks.google_message4.Message10320 field11994 = 3;
+  optional .benchmarks.google_message4.Message11947 field11995 = 4;
+  optional .benchmarks.google_message4.Message11920 field11996 = 5;
+  optional bool field11997 = 6;
+  repeated string field11998 = 7;
+  optional float field11999 = 8;
+  repeated .benchmarks.google_message4.UnusedEnum field12000 = 9;
+  optional int32 field12001 = 11;
+}
+
+message Message7287 {
+  optional .benchmarks.google_message4.Message6133 field7311 = 1;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7312 = 8;
+  optional string field7313 = 3;
+  optional .benchmarks.google_message4.Message6643 field7314 = 4;
+  optional .benchmarks.google_message4.Enum7288 field7315 = 5;
+  optional bytes field7316 = 6;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7317 = 7;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7318 = 9;
+}
+
+message Message3061 {
+  optional string field3286 = 2;
+  optional int32 field3287 = 77;
+  optional string field3288 = 49;
+  required .benchmarks.google_message4.Message3046 field3289 = 3;
+  optional .benchmarks.google_message4.Message3046 field3290 = 58;
+  optional group Message3062 = 4 {
+    required int32 field3335 = 5;
+    optional int32 field3336 = 6;
+    optional int32 field3337 = 7;
+  }
+  optional .benchmarks.google_message4.Message3060 field3292 = 104;
+  optional int64 field3293 = 32;
+  optional int32 field3294 = 41;
+  optional group Message3063 = 13 {
+    required int32 field3338 = 14;
+    optional .benchmarks.google_message4.Enum2851 field3339 = 18;
+    optional int64 field3340 = 15;
+    optional int64 field3341 = 23;
+  }
+  optional .benchmarks.google_message4.Enum2834 field3296 = 94;
+  optional bool field3297 = 25;
+  optional bool field3298 = 50;
+  optional string field3299 = 89;
+  optional string field3300 = 91;
+  optional string field3301 = 105;
+  optional .benchmarks.google_message4.Message3050 field3302 = 53;
+  optional fixed64 field3303 = 51;
+  optional fixed64 field3304 = 106;
+  optional int32 field3305 = 60;
+  optional string field3306 = 44;
+  optional bytes field3307 = 81;
+  optional string field3308 = 70;
+  optional bytes field3309 = 45;
+  optional .benchmarks.google_message4.Enum2806 field3310 = 71;
+  optional int32 field3311 = 72;
+  optional bytes field3312 = 78;
+  optional int32 field3313 = 20;
+  repeated group Message3064 = 8 {
+    required .benchmarks.google_message4.Enum2602 field3342 = 9;
+    optional int32 field3343 = 92;
+    optional string field3344 = 10;
+    optional bytes field3345 = 11;
+    optional int32 field3346 = 12;
+    optional .benchmarks.google_message4.Message3060 field3347 = 98;
+    optional .benchmarks.google_message4.UnusedEmptyMessage field3348 = 82;
+    optional .benchmarks.google_message4.Message3050 field3349 = 80;
+    optional fixed64 field3350 = 52;
+    optional int32 field3351 = 33;
+    optional string field3352 = 42;
+    optional string field3353 = 69;
+    optional bytes field3354 = 43;
+    optional .benchmarks.google_message4.Enum2806 field3355 = 73;
+    optional int32 field3356 = 74;
+    optional int32 field3357 = 90;
+    optional bytes field3358 = 79;
+    optional int32 field3359 = 19;
+    optional .benchmarks.google_message4.Enum2834 field3360 = 95;
+  }
+  optional .benchmarks.google_message4.UnusedEmptyMessage field3315 = 39;
+  optional int32 field3316 = 76;
+  optional group Message3065 = 63 {
+  }
+  optional .benchmarks.google_message4.Enum2806 field3318 = 54;
+  optional int32 field3319 = 46;
+  repeated string field3320 = 24;
+  optional fixed32 field3321 = 38;
+  optional bytes field3322 = 99;
+  optional fixed64 field3323 = 1;
+  optional fixed64 field3324 = 97;
+  repeated .benchmarks.google_message4.Message3040 field3325 = 16;
+  repeated .benchmarks.google_message4.Message3041 field3326 = 61;
+  optional group Message3066 = 21 {
+    optional int32 field3366 = 22;
+    optional int32 field3367 = 55;
+    optional int32 field3368 = 88;
+    optional int32 field3369 = 56;
+    optional int32 field3370 = 75;
+    optional int32 field3371 = 57;
+    optional .benchmarks.google_message4.UnusedEmptyMessage field3372 = 85;
+    optional .benchmarks.google_message4.UnusedEmptyMessage field3373 = 96;
+  }
+  optional .benchmarks.google_message4.UnusedEmptyMessage field3328 = 47;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field3329 = 48;
+  optional fixed64 field3330 = 40;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field3331 = 86;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field3332 = 59;
+  optional int32 field3333 = 17;
+}
+
+message Message12949 {
+}
+
+message Message8572 {
+  optional bytes field8647 = 1;
+  optional bytes field8648 = 3;
+  optional .benchmarks.google_message4.Message3886 field8649 = 4;
+  optional .benchmarks.google_message4.Message3919 field8650 = 57;
+  optional bool field8651 = 5;
+  optional int32 field8652 = 6;
+  optional int32 field8653 = 49;
+  optional .benchmarks.google_message4.Message7905 field8654 = 7;
+  optional int32 field8655 = 10;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8656 = 11;
+  optional bool field8657 = 35;
+  optional bytes field8658 = 12;
+  optional string field8659 = 14;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8660 = 13;
+  optional bytes field8661 = 15;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8662 = 17;
+  optional int32 field8663 = 18;
+  optional int32 field8664 = 19;
+  optional bool field8665 = 20;
+  optional .benchmarks.google_message4.Enum3476 field8666 = 31;
+  optional bool field8667 = 36;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8668 = 39;
+  optional bytes field8669 = 22;
+  optional int32 field8670 = 24;
+  optional .benchmarks.google_message4.Message3052 field8671 = 25;
+  optional bytes field8672 = 26;
+  optional bytes field8673 = 28;
+  optional int32 field8674 = 29;
+  optional bytes field8675 = 30;
+  optional bytes field8676 = 32;
+  optional string field8677 = 33;
+  optional int32 field8678 = 34;
+  optional int32 field8679 = 37;
+  optional double field8680 = 38;
+  optional double field8681 = 42;
+  optional .benchmarks.google_message4.Message3922 field8682 = 40;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8683 = 43;
+  optional int64 field8684 = 44;
+  optional .benchmarks.google_message4.Message7929 field8685 = 45;
+  optional uint64 field8686 = 46;
+  optional uint32 field8687 = 48;
+  optional .benchmarks.google_message4.Message7843 field8688 = 47;
+  optional .benchmarks.google_message4.Message7864 field8689 = 50;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8690 = 52;
+  optional bool field8691 = 58;
+  optional bool field8692 = 54;
+  optional string field8693 = 55;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8694 = 41;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field8695 = 53;
+  optional .benchmarks.google_message4.Message8575 field8696 = 61;
+}
+
+message Message8774 {
+  optional string field8810 = 1;
+  optional string field8811 = 2;
+  optional string field8812 = 3;
+  optional string field8813 = 4;
+  optional string field8814 = 5;
+}
+
+message Message12776 {
+  optional string field12786 = 1;
+  optional fixed64 field12787 = 11;
+  optional int32 field12788 = 6;
+  optional int32 field12789 = 13;
+  optional int32 field12790 = 14;
+  optional int32 field12791 = 15;
+  optional int32 field12792 = 16;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12793 = 8;
+  optional .benchmarks.google_message4.Message12774 field12794 = 10;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field12795 = 12;
+  extensions 2 to 2;
+  extensions 3 to 3;
+  extensions 4 to 4;
+  extensions 5 to 5;
+  extensions 7 to 7;
+  extensions 9 to 9;
+}
+
+message Message12798 {
+  optional int32 field12805 = 1;
+  optional int32 field12806 = 2;
+  optional .benchmarks.google_message4.Message12774 field12807 = 6;
+  optional bool field12808 = 7;
+}
+
+message Message12797 {
+  optional .benchmarks.google_message4.Message12796 field12802 = 1;
+  repeated .benchmarks.google_message4.Message12796 field12803 = 2;
+  optional string field12804 = 3;
+}
+
+message Message12825 {
+  repeated .benchmarks.google_message4.Message12818 field12862 = 1;
+  optional int32 field12863 = 2;
+  optional .benchmarks.google_message4.Message12819 field12864 = 3;
+  optional .benchmarks.google_message4.Message12820 field12865 = 4;
+  optional int32 field12866 = 5;
+  repeated .benchmarks.google_message4.Message12821 field12867 = 6;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field12868 = 7;
+}
+
+message Message8590 {
+}
+
+message Message8587 {
+}
+
+message Message1374 {
+  required string field1375 = 1;
+  optional string field1376 = 2;
+}
+
+message Message2462 {
+  required bytes field2496 = 1;
+  required double field2497 = 2;
+}
+
+message Message12685 {
+  repeated string field12692 = 1;
+  repeated string field12693 = 2;
+  optional int64 field12694 = 3;
+  optional uint32 field12695 = 4;
+  repeated string field12696 = 5;
+  optional string field12697 = 6;
+  optional string field12698 = 7;
+}
+
+message Message10320 {
+  optional .benchmarks.google_message4.Enum10335 field10347 = 1;
+  repeated .benchmarks.google_message4.Message10319 field10348 = 2;
+  optional int32 field10349 = 3;
+  optional int32 field10350 = 4;
+  optional int32 field10351 = 5;
+  optional int32 field10352 = 6;
+  optional .benchmarks.google_message4.Enum10337 field10353 = 7;
+}
+
+message Message11947 {
+  optional uint32 field11951 = 1;
+  optional bool field11952 = 2;
+  optional int32 field11953 = 3;
+}
+
+message Message11920 {
+  optional .benchmarks.google_message4.Enum11901 field11945 = 1;
+  optional .benchmarks.google_message4.UnusedEnum field11946 = 2;
+}
+
+message Message6643 {
+  optional .benchmarks.google_message4.UnusedEmptyMessage field6683 = 3;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field6684 = 4;
+  optional double field6685 = 5;
+  optional double field6686 = 6;
+  optional int32 field6687 = 1;
+  optional int32 field6688 = 2;
+  optional double field6689 = 9;
+  optional bytes field6690 = 10;
+  optional int32 field6691 = 11;
+  optional bool field6692 = 12;
+  optional bool field6693 = 13;
+  optional .benchmarks.google_message4.Message6578 field6694 = 15;
+  optional .benchmarks.google_message4.UnusedEnum field6695 = 16;
+  optional int64 field6696 = 17;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field6697 = 22;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field6698 = 19;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field6699 = 20;
+  optional int32 field6700 = 21;
+}
+
+message Message6133 {
+  optional .benchmarks.google_message4.Message4016 field6173 = 12;
+  optional double field6174 = 16;
+  required string field6175 = 1;
+  required string field6176 = 2;
+  required string field6177 = 3;
+  optional string field6178 = 4;
+  optional string field6179 = 8;
+  repeated .benchmarks.google_message4.Message6109 field6180 = 5;
+  repeated .benchmarks.google_message4.Message5908 field6181 = 13;
+  repeated .benchmarks.google_message4.Message6107 field6182 = 7;
+  repeated .benchmarks.google_message4.Message6126 field6183 = 9;
+  repeated .benchmarks.google_message4.Message6129 field6184 = 15;
+  optional int32 field6185 = 10;
+  optional int32 field6186 = 11;
+  optional .benchmarks.google_message4.Message4016 field6187 = 17;
+  optional double field6188 = 14;
+  optional double field6189 = 18;
+  optional string field6190 = 19;
+  optional string field6191 = 20;
+  repeated .benchmarks.google_message4.Message5881 field6192 = 21;
+}
+
+message Message6109 {
+  optional string field6140 = 1;
+  required .benchmarks.google_message4.Enum6111 field6141 = 2;
+  optional int32 field6142 = 9;
+  optional string field6143 = 3;
+  repeated .benchmarks.google_message4.Message6110 field6144 = 4;
+  repeated int32 field6145 = 7;
+  repeated int32 field6146 = 8;
+  optional .benchmarks.google_message4.Message6133 field6147 = 10;
+  repeated int32 field6148 = 11;
+  optional string field6149 = 12;
+  optional string field6150 = 13;
+  optional bool field6151 = 14;
+  extensions 1000 to 536870911;
+}
+
+message Message3046 {
+  required .benchmarks.google_message4.Enum2593 field3222 = 1;
+  optional int32 field3223 = 4;
+}
+
+message Message3060 {
+  optional int64 field3283 = 1;
+  optional int64 field3284 = 2;
+  optional int64 field3285 = 3;
+}
+
+message Message3041 {
+  optional string field3214 = 1;
+  optional int32 field3215 = 2;
+}
+
+message Message3040 {
+  required fixed64 field3209 = 1;
+  repeated fixed64 field3210 = 4;
+  optional int32 field3211 = 5;
+  optional fixed64 field3212 = 2;
+  required string field3213 = 3;
+}
+
+message Message3050 {
+  optional bytes field3245 = 5;
+  optional int32 field3246 = 2;
+  optional bytes field3247 = 6;
+  optional int32 field3248 = 4;
+  optional fixed32 field3249 = 1;
+  optional fixed32 field3250 = 3;
+}
+
+message Message7905 {
+  optional int32 field7911 = 1;
+  optional bool field7912 = 2;
+  optional bytes field7913 = 3;
+  optional int32 field7914 = 4;
+  optional int32 field7915 = 5;
+  optional bytes field7916 = 6;
+  optional int32 field7917 = 7;
+}
+
+message Message3886 {
+  repeated group Message3887 = 1 {
+    required string field3932 = 2;
+    optional string field3933 = 9;
+    optional .benchmarks.google_message4.Message3850 field3934 = 3;
+    optional bytes field3935 = 8;
+  }
+}
+
+message Message7864 {
+  optional string field7866 = 1;
+  optional string field7867 = 2;
+  repeated .benchmarks.google_message4.Message7865 field7868 = 5;
+  repeated .benchmarks.google_message4.Message7865 field7869 = 6;
+  repeated .benchmarks.google_message4.Message7865 field7870 = 7;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field7871 = 8;
+}
+
+message Message3922 {
+  optional uint64 field4012 = 1;
+}
+
+message Message3052 {
+  repeated string field3254 = 1;
+  repeated string field3255 = 2;
+  repeated bytes field3256 = 3;
+  repeated string field3257 = 4;
+  optional bool field3258 = 5;
+  optional int32 field3259 = 6;
+  optional int32 field3260 = 7;
+  optional string field3261 = 8;
+  optional string field3262 = 9;
+}
+
+message Message8575 {
+}
+
+message Message7843 {
+  optional bool field7844 = 5;
+  optional int32 field7845 = 1;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7846 = 22;
+  repeated int32 field7847 = 3;
+  repeated string field7848 = 11;
+  optional .benchmarks.google_message4.UnusedEnum field7849 = 15;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7850 = 6;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7851 = 14;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7852 = 10;
+  optional .benchmarks.google_message4.Message7511 field7853 = 13;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7854 = 16;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7855 = 17;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7856 = 19;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field7857 = 18;
+  optional .benchmarks.google_message4.UnusedEnum field7858 = 20;
+  optional int32 field7859 = 2;
+}
+
+message Message3919 {
+  repeated .benchmarks.google_message4.Message3920 field4009 = 1;
+}
+
+message Message7929 {
+  optional int64 field7942 = 1;
+  optional int64 field7943 = 4;
+  optional int64 field7944 = 5;
+  optional int64 field7945 = 12;
+  optional int64 field7946 = 13;
+  optional int64 field7947 = 18;
+  optional int64 field7948 = 6;
+  optional int64 field7949 = 7;
+  repeated .benchmarks.google_message4.Message7919 field7950 = 8;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field7951 = 20;
+  repeated .benchmarks.google_message4.Message7920 field7952 = 14;
+  repeated .benchmarks.google_message4.Message7921 field7953 = 15;
+  repeated .benchmarks.google_message4.Message7928 field7954 = 17;
+  optional int64 field7955 = 19;
+  optional bool field7956 = 2;
+  optional int64 field7957 = 3;
+  optional int64 field7958 = 9;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field7959 = 10;
+  repeated bytes field7960 = 11;
+  optional int64 field7961 = 16;
+}
+
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
new file mode 100644
index 0000000..d5e9da5
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
@@ -0,0 +1,292 @@
+syntax = "proto2";
+
+import "datasets/google_message4/benchmark_message4_3.proto";
+package benchmarks.google_message4;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+message Message12774 {
+  optional uint32 field12777 = 1;
+  optional uint32 field12778 = 2;
+  optional uint32 field12779 = 3;
+  optional uint32 field12780 = 4;
+  optional uint32 field12781 = 5;
+  optional bool field12782 = 6;
+}
+
+message Message12796 {
+  repeated fixed64 field12800 = 1;
+  optional uint64 field12801 = 2;
+}
+
+message Message12821 {
+  optional int32 field12848 = 1;
+  optional int32 field12849 = 2;
+  optional int32 field12850 = 3;
+  optional int32 field12851 = 4;
+  optional int32 field12852 = 5;
+}
+
+message Message12820 {
+  optional int32 field12840 = 1;
+  optional int32 field12841 = 2;
+  optional int32 field12842 = 3;
+  optional int32 field12843 = 8;
+  optional int32 field12844 = 4;
+  optional int32 field12845 = 5;
+  optional int32 field12846 = 6;
+  optional int32 field12847 = 7;
+}
+
+message Message12819 {
+  optional double field12834 = 1;
+  optional double field12835 = 2;
+  optional double field12836 = 3;
+  optional double field12837 = 4;
+  optional double field12838 = 5;
+  optional double field12839 = 6;
+}
+
+message Message12818 {
+  optional uint64 field12829 = 1;
+  optional int32 field12830 = 2;
+  optional int32 field12831 = 3;
+  optional int32 field12832 = 5;
+  repeated .benchmarks.google_message4.Message12817 field12833 = 4;
+}
+
+message Message10319 {
+  optional .benchmarks.google_message4.Enum10325 field10340 = 1;
+  optional int32 field10341 = 4;
+  optional int32 field10342 = 5;
+  optional bytes field10343 = 3;
+  optional string field10344 = 2;
+  optional string field10345 = 6;
+  optional string field10346 = 7;
+}
+
+message Message6578 {
+  optional .benchmarks.google_message4.Enum6579 field6632 = 1;
+  optional .benchmarks.google_message4.Enum6588 field6633 = 2;
+}
+
+message Message6126 {
+  required string field6152 = 1;
+  repeated .benchmarks.google_message4.Message6127 field6153 = 9;
+  optional int32 field6154 = 14;
+  optional bytes field6155 = 10;
+  optional .benchmarks.google_message4.Message6024 field6156 = 12;
+  optional int32 field6157 = 4;
+  optional string field6158 = 5;
+  optional int32 field6159 = 6;
+  repeated int32 field6160 = 2;
+  repeated int32 field6161 = 3;
+  repeated .benchmarks.google_message4.Message6052 field6162 = 7;
+  repeated .benchmarks.google_message4.UnusedEmptyMessage field6163 = 11;
+  optional .benchmarks.google_message4.Enum6065 field6164 = 15;
+  repeated .benchmarks.google_message4.Message6127 field6165 = 8;
+  optional bool field6166 = 13;
+  optional bool field6167 = 16;
+  optional bool field6168 = 18;
+  repeated .benchmarks.google_message4.Message6054 field6169 = 17;
+  optional int32 field6170 = 19;
+}
+
+message Message5881 {
+  required double field5897 = 1;
+  optional string field5898 = 5;
+  optional .benchmarks.google_message4.Message5861 field5899 = 2;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field5900 = 3;
+  optional .benchmarks.google_message4.Message5867 field5901 = 4;
+  optional .benchmarks.google_message4.Message5880 field5902 = 6;
+}
+
+message Message6110 {
+}
+
+message Message6107 {
+  optional .benchmarks.google_message4.Message4016 field6134 = 1;
+  optional int32 field6135 = 2;
+  optional string field6136 = 3;
+  repeated int32 field6137 = 4;
+  optional int32 field6138 = 5;
+  repeated .benchmarks.google_message4.Message6108 field6139 = 6;
+}
+
+message Message6129 {
+  required .benchmarks.google_message4.Enum6130 field6171 = 1;
+  required string field6172 = 2;
+}
+
+message Message5908 {
+  optional string field5971 = 1;
+  optional int32 field5972 = 2;
+  optional int32 field5973 = 3;
+  optional .benchmarks.google_message4.Enum5909 field5974 = 45;
+  optional .benchmarks.google_message4.Enum5912 field5975 = 4;
+  optional fixed32 field5976 = 50;
+  optional fixed32 field5977 = 5;
+  optional fixed32 field5978 = 6;
+  optional string field5979 = 7;
+  optional .benchmarks.google_message4.Enum5915 field5980 = 8;
+  optional .benchmarks.google_message4.Message5903 field5981 = 9;
+  optional .benchmarks.google_message4.Message5903 field5982 = 10;
+  optional .benchmarks.google_message4.Enum5920 field5983 = 11;
+  optional .benchmarks.google_message4.Enum5923 field5984 = 40;
+  optional .benchmarks.google_message4.Message5903 field5985 = 41;
+  optional .benchmarks.google_message4.Message5903 field5986 = 42;
+  optional .benchmarks.google_message4.Enum5928 field5987 = 47;
+  optional bool field5988 = 48;
+  repeated fixed32 field5989 = 49;
+  optional string field5990 = 12;
+  optional .benchmarks.google_message4.Message5903 field5991 = 13;
+  optional .benchmarks.google_message4.Message5903 field5992 = 14;
+  optional .benchmarks.google_message4.Message5903 field5993 = 15;
+  optional .benchmarks.google_message4.Message5903 field5994 = 16;
+  optional .benchmarks.google_message4.Message5903 field5995 = 32;
+  optional .benchmarks.google_message4.Message5903 field5996 = 33;
+  optional .benchmarks.google_message4.Message5903 field5997 = 34;
+  optional .benchmarks.google_message4.Message5903 field5998 = 35;
+  optional .benchmarks.google_message4.Enum5931 field5999 = 17;
+  optional .benchmarks.google_message4.Enum5935 field6000 = 18;
+  optional .benchmarks.google_message4.Enum5939 field6001 = 36;
+  optional .benchmarks.google_message4.Enum5939 field6002 = 37;
+  repeated int32 field6003 = 19;
+  optional uint32 field6004 = 20;
+  optional uint32 field6005 = 21;
+  optional uint32 field6006 = 22;
+  optional uint32 field6007 = 23;
+  optional .benchmarks.google_message4.Enum5946 field6008 = 24;
+  optional .benchmarks.google_message4.Enum5946 field6009 = 25;
+  optional .benchmarks.google_message4.Enum5946 field6010 = 26;
+  optional .benchmarks.google_message4.Enum5946 field6011 = 27;
+  optional fixed32 field6012 = 28;
+  optional fixed32 field6013 = 29;
+  optional fixed32 field6014 = 30;
+  optional fixed32 field6015 = 31;
+  optional int32 field6016 = 38;
+  optional float field6017 = 39;
+  optional .benchmarks.google_message4.Enum5957 field6018 = 43;
+  optional .benchmarks.google_message4.Message5907 field6019 = 44;
+  optional .benchmarks.google_message4.Enum5962 field6020 = 46;
+}
+
+message Message3850 {
+  optional .benchmarks.google_message4.Enum3851 field3924 = 2;
+  optional bool field3925 = 12;
+  optional int32 field3926 = 4;
+  optional bool field3927 = 10;
+  optional bool field3928 = 13;
+  optional bool field3929 = 14;
+}
+
+message Message7865 {
+}
+
+message Message7511 {
+  optional bool field7523 = 1;
+  optional .benchmarks.google_message4.Enum7512 field7524 = 2;
+  optional int32 field7525 = 3;
+  optional int32 field7526 = 4;
+  optional bool field7527 = 5;
+  optional int32 field7528 = 6;
+  optional int32 field7529 = 7;
+}
+
+message Message3920 {
+}
+
+message Message7928 {
+  optional string field7940 = 1;
+  optional int64 field7941 = 2;
+}
+
+message Message7921 {
+  optional int32 field7936 = 1;
+  optional int64 field7937 = 2;
+  optional float field7938 = 3;
+  optional .benchmarks.google_message4.Enum7922 field7939 = 4;
+}
+
+message Message7920 {
+  optional int64 field7934 = 1;
+  optional int64 field7935 = 2;
+}
+
+message Message7919 {
+  optional fixed64 field7931 = 1;
+  optional int64 field7932 = 2;
+  optional bytes field7933 = 3;
+}
+
+message Message12817 {
+  optional int32 field12826 = 1;
+  optional int32 field12827 = 2;
+  optional int32 field12828 = 3;
+}
+
+message Message6054 {
+  required string field6089 = 1;
+  optional string field6090 = 2;
+}
+
+message Message6127 {
+}
+
+message Message6052 {
+  required string field6084 = 1;
+  required bytes field6085 = 2;
+}
+
+message Message6024 {
+  optional .benchmarks.google_message4.Enum6025 field6048 = 1;
+  optional string field6049 = 2;
+  optional .benchmarks.google_message4.UnusedEmptyMessage field6050 = 3;
+}
+
+message Message5861 {
+  required .benchmarks.google_message4.Enum5862 field5882 = 1;
+  required string field5883 = 2;
+  optional bool field5884 = 3;
+  optional string field5885 = 4;
+}
+
+message Message5880 {
+  optional string field5896 = 1;
+}
+
+message Message5867 {
+  optional .benchmarks.google_message4.Enum5868 field5890 = 1;
+  optional string field5891 = 2;
+  optional .benchmarks.google_message4.Enum5873 field5892 = 3;
+  optional int32 field5893 = 4;
+  optional .benchmarks.google_message4.UnusedEnum field5894 = 5;
+  optional bool field5895 = 6;
+}
+
+message Message4016 {
+  required int32 field4017 = 1;
+  required int32 field4018 = 2;
+  required int32 field4019 = 3;
+  required int32 field4020 = 4;
+}
+
+message Message6108 {
+}
+
+message Message5907 {
+  optional .benchmarks.google_message4.Message5903 field5967 = 1;
+  optional .benchmarks.google_message4.Message5903 field5968 = 2;
+  optional .benchmarks.google_message4.Message5903 field5969 = 3;
+  optional .benchmarks.google_message4.Message5903 field5970 = 4;
+}
+
+message UnusedEmptyMessage {
+}
+
+message Message5903 {
+  required int32 field5965 = 1;
+  optional .benchmarks.google_message4.Enum5904 field5966 = 2;
+}
+
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
new file mode 100644
index 0000000..544fad2
--- /dev/null
+++ b/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
@@ -0,0 +1,751 @@
+syntax = "proto2";
+
+package benchmarks.google_message4;
+
+option cc_enable_arenas = true;
+option java_package = "com.google.protobuf.benchmarks";
+
+enum UnusedEnum {
+  UNUSED_ENUM_VALUE1 = 0;
+  UNUSED_ENUM_VALUE2 = 1;
+}
+
+enum Enum2593 {
+  ENUM_VALUE2594 = 0;
+  ENUM_VALUE2595 = 1;
+  ENUM_VALUE2596 = 2;
+  ENUM_VALUE2597 = 3;
+  ENUM_VALUE2598 = 4;
+  ENUM_VALUE2599 = 5;
+  ENUM_VALUE2600 = 6;
+  ENUM_VALUE2601 = 7;
+}
+
+enum Enum2834 {
+  ENUM_VALUE2835 = 0;
+  ENUM_VALUE2836 = 1;
+  ENUM_VALUE2837 = 2;
+}
+
+enum Enum2806 {
+  ENUM_VALUE2807 = 0;
+  ENUM_VALUE2808 = 1;
+  ENUM_VALUE2809 = 2;
+  ENUM_VALUE2810 = 3;
+  ENUM_VALUE2811 = 4;
+  ENUM_VALUE2812 = 5;
+  ENUM_VALUE2813 = 6;
+  ENUM_VALUE2814 = 7;
+  ENUM_VALUE2815 = 8;
+  ENUM_VALUE2816 = 9;
+  ENUM_VALUE2817 = 10;
+  ENUM_VALUE2818 = 11;
+  ENUM_VALUE2819 = 12;
+  ENUM_VALUE2820 = 13;
+  ENUM_VALUE2821 = 14;
+}
+
+enum Enum2851 {
+  option allow_alias = true;
+  ENUM_VALUE2852 = 0;
+  ENUM_VALUE2853 = 0;
+  ENUM_VALUE2854 = 1;
+  ENUM_VALUE2855 = 2;
+  ENUM_VALUE2856 = 3;
+  ENUM_VALUE2857 = 4;
+  ENUM_VALUE2858 = 5;
+  ENUM_VALUE2859 = 6;
+  ENUM_VALUE2860 = 7;
+  ENUM_VALUE2861 = 8;
+  ENUM_VALUE2862 = 9;
+  ENUM_VALUE2863 = 10;
+  ENUM_VALUE2864 = 11;
+  ENUM_VALUE2865 = 12;
+  ENUM_VALUE2866 = 13;
+  ENUM_VALUE2867 = 14;
+  ENUM_VALUE2868 = 15;
+  ENUM_VALUE2869 = 16;
+  ENUM_VALUE2870 = 17;
+  ENUM_VALUE2871 = 18;
+  ENUM_VALUE2872 = 19;
+  ENUM_VALUE2873 = 20;
+  ENUM_VALUE2874 = 21;
+  ENUM_VALUE2875 = 22;
+  ENUM_VALUE2876 = 23;
+  ENUM_VALUE2877 = 24;
+  ENUM_VALUE2878 = 25;
+  ENUM_VALUE2879 = 26;
+  ENUM_VALUE2880 = 27;
+  ENUM_VALUE2881 = 28;
+  ENUM_VALUE2882 = 29;
+  ENUM_VALUE2883 = 30;
+  ENUM_VALUE2884 = 31;
+  ENUM_VALUE2885 = 32;
+  ENUM_VALUE2886 = 33;
+  ENUM_VALUE2887 = 34;
+  ENUM_VALUE2888 = 35;
+  ENUM_VALUE2889 = 36;
+  ENUM_VALUE2890 = 37;
+  ENUM_VALUE2891 = 38;
+  ENUM_VALUE2892 = 39;
+  ENUM_VALUE2893 = 40;
+  ENUM_VALUE2894 = 41;
+  ENUM_VALUE2895 = 42;
+  ENUM_VALUE2896 = 43;
+  ENUM_VALUE2897 = 44;
+  ENUM_VALUE2898 = 45;
+  ENUM_VALUE2899 = 46;
+  ENUM_VALUE2900 = 47;
+  ENUM_VALUE2901 = 48;
+  ENUM_VALUE2902 = 49;
+  ENUM_VALUE2903 = 50;
+  ENUM_VALUE2904 = 51;
+  ENUM_VALUE2905 = 52;
+  ENUM_VALUE2906 = 53;
+  ENUM_VALUE2907 = 54;
+  ENUM_VALUE2908 = 55;
+  ENUM_VALUE2909 = 56;
+  ENUM_VALUE2910 = 57;
+  ENUM_VALUE2911 = 58;
+  ENUM_VALUE2912 = 59;
+  ENUM_VALUE2913 = 60;
+  ENUM_VALUE2914 = 61;
+  ENUM_VALUE2915 = 62;
+  ENUM_VALUE2916 = 63;
+  ENUM_VALUE2917 = 64;
+  ENUM_VALUE2918 = 65;
+  ENUM_VALUE2919 = 66;
+  ENUM_VALUE2920 = 67;
+  ENUM_VALUE2921 = 68;
+  ENUM_VALUE2922 = 69;
+  ENUM_VALUE2923 = 70;
+  ENUM_VALUE2924 = 71;
+  ENUM_VALUE2925 = 72;
+  ENUM_VALUE2926 = 73;
+  ENUM_VALUE2927 = 74;
+  ENUM_VALUE2928 = 75;
+  ENUM_VALUE2929 = 76;
+  ENUM_VALUE2930 = 77;
+  ENUM_VALUE2931 = 78;
+  ENUM_VALUE2932 = 79;
+  ENUM_VALUE2933 = 80;
+  ENUM_VALUE2934 = 81;
+  ENUM_VALUE2935 = 82;
+  ENUM_VALUE2936 = 83;
+  ENUM_VALUE2937 = 84;
+  ENUM_VALUE2938 = 85;
+  ENUM_VALUE2939 = 86;
+  ENUM_VALUE2940 = 87;
+  ENUM_VALUE2941 = 88;
+  ENUM_VALUE2942 = 89;
+  ENUM_VALUE2943 = 90;
+  ENUM_VALUE2944 = 91;
+  ENUM_VALUE2945 = 92;
+  ENUM_VALUE2946 = 93;
+  ENUM_VALUE2947 = 94;
+  ENUM_VALUE2948 = 95;
+  ENUM_VALUE2949 = 96;
+  ENUM_VALUE2950 = 97;
+  ENUM_VALUE2951 = 98;
+  ENUM_VALUE2952 = 99;
+  ENUM_VALUE2953 = 100;
+  ENUM_VALUE2954 = 101;
+  ENUM_VALUE2955 = 102;
+  ENUM_VALUE2956 = 103;
+  ENUM_VALUE2957 = 104;
+  ENUM_VALUE2958 = 105;
+  ENUM_VALUE2959 = 106;
+  ENUM_VALUE2960 = 107;
+  ENUM_VALUE2961 = 108;
+  ENUM_VALUE2962 = 109;
+  ENUM_VALUE2963 = 110;
+  ENUM_VALUE2964 = 111;
+  ENUM_VALUE2965 = 112;
+  ENUM_VALUE2966 = 113;
+  ENUM_VALUE2967 = 114;
+  ENUM_VALUE2968 = 115;
+  ENUM_VALUE2969 = 116;
+  ENUM_VALUE2970 = 117;
+  ENUM_VALUE2971 = 118;
+  ENUM_VALUE2972 = 119;
+}
+
+enum Enum2602 {
+  ENUM_VALUE2603 = 0;
+  ENUM_VALUE2604 = 1;
+  ENUM_VALUE2605 = 2;
+  ENUM_VALUE2606 = 3;
+  ENUM_VALUE2607 = 4;
+  ENUM_VALUE2608 = 5;
+  ENUM_VALUE2609 = 6;
+  ENUM_VALUE2610 = 7;
+  ENUM_VALUE2611 = 8;
+  ENUM_VALUE2612 = 9;
+  ENUM_VALUE2613 = 10;
+  ENUM_VALUE2614 = 11;
+}
+
+enum Enum3071 {
+  ENUM_VALUE3072 = 1;
+  ENUM_VALUE3073 = 2;
+  ENUM_VALUE3074 = 3;
+  ENUM_VALUE3075 = 4;
+  ENUM_VALUE3076 = 5;
+  ENUM_VALUE3077 = 6;
+  ENUM_VALUE3078 = 7;
+  ENUM_VALUE3079 = 8;
+  ENUM_VALUE3080 = 9;
+  ENUM_VALUE3081 = 10;
+  ENUM_VALUE3082 = 11;
+  ENUM_VALUE3083 = 12;
+  ENUM_VALUE3084 = 13;
+  ENUM_VALUE3085 = 14;
+  ENUM_VALUE3086 = 15;
+  ENUM_VALUE3087 = 16;
+  ENUM_VALUE3088 = 17;
+  ENUM_VALUE3089 = 18;
+  ENUM_VALUE3090 = 19;
+  ENUM_VALUE3091 = 20;
+  ENUM_VALUE3092 = 21;
+  ENUM_VALUE3093 = 22;
+  ENUM_VALUE3094 = 23;
+  ENUM_VALUE3095 = 24;
+  ENUM_VALUE3096 = 25;
+  ENUM_VALUE3097 = 26;
+  ENUM_VALUE3098 = 27;
+  ENUM_VALUE3099 = 28;
+}
+
+enum Enum3805 {
+  ENUM_VALUE3806 = 0;
+  ENUM_VALUE3807 = 1;
+  ENUM_VALUE3808 = 2;
+  ENUM_VALUE3809 = 3;
+  ENUM_VALUE3810 = 4;
+  ENUM_VALUE3811 = 5;
+  ENUM_VALUE3812 = 6;
+  ENUM_VALUE3813 = 7;
+  ENUM_VALUE3814 = 8;
+  ENUM_VALUE3815 = 9;
+  ENUM_VALUE3816 = 11;
+  ENUM_VALUE3817 = 10;
+}
+
+enum Enum3783 {
+  ENUM_VALUE3784 = 0;
+  ENUM_VALUE3785 = 1;
+  ENUM_VALUE3786 = 2;
+  ENUM_VALUE3787 = 3;
+  ENUM_VALUE3788 = 4;
+  ENUM_VALUE3789 = 5;
+  ENUM_VALUE3790 = 6;
+  ENUM_VALUE3791 = 7;
+  ENUM_VALUE3792 = 8;
+  ENUM_VALUE3793 = 9;
+  ENUM_VALUE3794 = 10;
+  ENUM_VALUE3795 = 11;
+  ENUM_VALUE3796 = 12;
+  ENUM_VALUE3797 = 13;
+  ENUM_VALUE3798 = 14;
+  ENUM_VALUE3799 = 15;
+  ENUM_VALUE3800 = 16;
+  ENUM_VALUE3801 = 20;
+  ENUM_VALUE3802 = 21;
+  ENUM_VALUE3803 = 50;
+}
+
+enum Enum3851 {
+  ENUM_VALUE3852 = 0;
+  ENUM_VALUE3853 = 1;
+  ENUM_VALUE3854 = 2;
+  ENUM_VALUE3855 = 3;
+  ENUM_VALUE3856 = 4;
+  ENUM_VALUE3857 = 5;
+  ENUM_VALUE3858 = 6;
+  ENUM_VALUE3859 = 7;
+  ENUM_VALUE3860 = 8;
+  ENUM_VALUE3861 = 9;
+  ENUM_VALUE3862 = 10;
+  ENUM_VALUE3863 = 11;
+  ENUM_VALUE3864 = 12;
+  ENUM_VALUE3865 = 13;
+  ENUM_VALUE3866 = 14;
+  ENUM_VALUE3867 = 15;
+  ENUM_VALUE3868 = 16;
+  ENUM_VALUE3869 = 17;
+}
+
+enum Enum5862 {
+  ENUM_VALUE5863 = 1;
+  ENUM_VALUE5864 = 2;
+  ENUM_VALUE5865 = 3;
+}
+
+enum Enum5868 {
+  ENUM_VALUE5869 = 0;
+  ENUM_VALUE5870 = 1;
+  ENUM_VALUE5871 = 2;
+  ENUM_VALUE5872 = 3;
+}
+
+enum Enum5873 {
+  ENUM_VALUE5874 = 0;
+  ENUM_VALUE5875 = 1;
+  ENUM_VALUE5876 = 2;
+}
+
+enum Enum5904 {
+  ENUM_VALUE5905 = 0;
+  ENUM_VALUE5906 = 1;
+}
+
+enum Enum5909 {
+  ENUM_VALUE5910 = 0;
+  ENUM_VALUE5911 = 1;
+}
+
+enum Enum5912 {
+  ENUM_VALUE5913 = 0;
+  ENUM_VALUE5914 = 1;
+}
+
+enum Enum5915 {
+  ENUM_VALUE5916 = 0;
+  ENUM_VALUE5917 = 1;
+  ENUM_VALUE5918 = 2;
+  ENUM_VALUE5919 = 3;
+}
+
+enum Enum5920 {
+  ENUM_VALUE5921 = 0;
+  ENUM_VALUE5922 = 1;
+}
+
+enum Enum5923 {
+  ENUM_VALUE5924 = 0;
+  ENUM_VALUE5925 = 1;
+  ENUM_VALUE5926 = 2;
+  ENUM_VALUE5927 = 3;
+}
+
+enum Enum5928 {
+  ENUM_VALUE5929 = 0;
+  ENUM_VALUE5930 = 1;
+}
+
+enum Enum5931 {
+  ENUM_VALUE5932 = 0;
+  ENUM_VALUE5933 = 1;
+  ENUM_VALUE5934 = 2;
+}
+
+enum Enum5935 {
+  ENUM_VALUE5936 = 0;
+  ENUM_VALUE5937 = 1;
+  ENUM_VALUE5938 = 2;
+}
+
+enum Enum5939 {
+  ENUM_VALUE5940 = 0;
+  ENUM_VALUE5941 = 1;
+  ENUM_VALUE5942 = 2;
+  ENUM_VALUE5943 = 3;
+  ENUM_VALUE5944 = 4;
+  ENUM_VALUE5945 = 5;
+}
+
+enum Enum5946 {
+  ENUM_VALUE5947 = 0;
+  ENUM_VALUE5948 = 1;
+  ENUM_VALUE5949 = 2;
+  ENUM_VALUE5950 = 3;
+  ENUM_VALUE5951 = 4;
+  ENUM_VALUE5952 = 5;
+  ENUM_VALUE5953 = 6;
+  ENUM_VALUE5954 = 7;
+  ENUM_VALUE5955 = 8;
+  ENUM_VALUE5956 = 9;
+}
+
+enum Enum5957 {
+  ENUM_VALUE5958 = 0;
+  ENUM_VALUE5959 = 1;
+  ENUM_VALUE5960 = 2;
+  ENUM_VALUE5961 = 3;
+}
+
+enum Enum5962 {
+  ENUM_VALUE5963 = 0;
+  ENUM_VALUE5964 = 1;
+}
+
+enum Enum6025 {
+  ENUM_VALUE6026 = 0;
+  ENUM_VALUE6027 = 1;
+  ENUM_VALUE6028 = 2;
+  ENUM_VALUE6029 = 3;
+  ENUM_VALUE6030 = 4;
+  ENUM_VALUE6031 = 5;
+  ENUM_VALUE6032 = 6;
+  ENUM_VALUE6033 = 7;
+  ENUM_VALUE6034 = 8;
+  ENUM_VALUE6035 = 9;
+  ENUM_VALUE6036 = 10;
+  ENUM_VALUE6037 = 11;
+  ENUM_VALUE6038 = 12;
+  ENUM_VALUE6039 = 13;
+  ENUM_VALUE6040 = 14;
+  ENUM_VALUE6041 = 15;
+  ENUM_VALUE6042 = 16;
+  ENUM_VALUE6043 = 17;
+  ENUM_VALUE6044 = 18;
+  ENUM_VALUE6045 = 19;
+  ENUM_VALUE6046 = 20;
+  ENUM_VALUE6047 = 21;
+}
+
+enum Enum6111 {
+  ENUM_VALUE6112 = 1;
+  ENUM_VALUE6113 = 2;
+  ENUM_VALUE6114 = 3;
+  ENUM_VALUE6115 = 4;
+  ENUM_VALUE6116 = 5;
+  ENUM_VALUE6117 = 6;
+  ENUM_VALUE6118 = 7;
+  ENUM_VALUE6119 = 8;
+  ENUM_VALUE6120 = 9;
+  ENUM_VALUE6121 = 10;
+  ENUM_VALUE6122 = 11;
+  ENUM_VALUE6123 = 12;
+  ENUM_VALUE6124 = 13;
+  ENUM_VALUE6125 = 14;
+}
+
+enum Enum6065 {
+  ENUM_VALUE6066 = 0;
+  ENUM_VALUE6067 = 1;
+  ENUM_VALUE6068 = 2;
+  ENUM_VALUE6069 = 3;
+  ENUM_VALUE6070 = 4;
+  ENUM_VALUE6071 = 5;
+  ENUM_VALUE6072 = 6;
+  ENUM_VALUE6073 = 7;
+  ENUM_VALUE6074 = 8;
+  ENUM_VALUE6075 = 9;
+  ENUM_VALUE6076 = 10;
+  ENUM_VALUE6077 = 11;
+  ENUM_VALUE6078 = 12;
+  ENUM_VALUE6079 = 13;
+  ENUM_VALUE6080 = 14;
+}
+
+enum Enum6130 {
+  ENUM_VALUE6131 = 0;
+  ENUM_VALUE6132 = 1;
+}
+
+enum Enum6579 {
+  ENUM_VALUE6580 = 0;
+  ENUM_VALUE6581 = 2;
+  ENUM_VALUE6582 = 3;
+  ENUM_VALUE6583 = 5;
+  ENUM_VALUE6584 = 10;
+  ENUM_VALUE6585 = 15;
+  ENUM_VALUE6586 = 25;
+  ENUM_VALUE6587 = 30;
+}
+
+enum Enum6588 {
+  ENUM_VALUE6589 = 0;
+  ENUM_VALUE6590 = 1;
+  ENUM_VALUE6591 = 2;
+  ENUM_VALUE6592 = 3;
+  ENUM_VALUE6593 = 4;
+  ENUM_VALUE6594 = 5;
+  ENUM_VALUE6595 = 6;
+  ENUM_VALUE6596 = 7;
+  ENUM_VALUE6597 = 8;
+  ENUM_VALUE6598 = 9;
+  ENUM_VALUE6599 = 10;
+  ENUM_VALUE6600 = 11;
+  ENUM_VALUE6601 = 12;
+  ENUM_VALUE6602 = 13;
+  ENUM_VALUE6603 = 14;
+  ENUM_VALUE6604 = 15;
+  ENUM_VALUE6605 = 16;
+  ENUM_VALUE6606 = 17;
+  ENUM_VALUE6607 = 19;
+  ENUM_VALUE6608 = 20;
+  ENUM_VALUE6609 = 21;
+  ENUM_VALUE6610 = 22;
+  ENUM_VALUE6611 = 23;
+  ENUM_VALUE6612 = 24;
+  ENUM_VALUE6613 = 25;
+  ENUM_VALUE6614 = 26;
+  ENUM_VALUE6615 = 27;
+  ENUM_VALUE6616 = 28;
+  ENUM_VALUE6617 = 29;
+  ENUM_VALUE6618 = 30;
+  ENUM_VALUE6619 = 31;
+  ENUM_VALUE6620 = 32;
+  ENUM_VALUE6621 = 33;
+  ENUM_VALUE6622 = 34;
+}
+
+enum Enum7288 {
+  ENUM_VALUE7289 = 0;
+  ENUM_VALUE7290 = 1;
+  ENUM_VALUE7291 = 2;
+  ENUM_VALUE7292 = 3;
+}
+
+enum Enum7512 {
+  ENUM_VALUE7513 = 0;
+  ENUM_VALUE7514 = 1;
+  ENUM_VALUE7515 = 2;
+  ENUM_VALUE7516 = 3;
+  ENUM_VALUE7517 = 4;
+  ENUM_VALUE7518 = 5;
+  ENUM_VALUE7519 = 6;
+  ENUM_VALUE7520 = 7;
+}
+
+enum Enum7922 {
+  ENUM_VALUE7923 = 1;
+  ENUM_VALUE7924 = 2;
+  ENUM_VALUE7925 = 3;
+  ENUM_VALUE7926 = 4;
+  ENUM_VALUE7927 = 5;
+}
+
+enum Enum3476 {
+  ENUM_VALUE3477 = 0;
+  ENUM_VALUE3478 = 1;
+  ENUM_VALUE3479 = 2;
+  ENUM_VALUE3480 = 3;
+  ENUM_VALUE3481 = 4;
+  ENUM_VALUE3482 = 5;
+  ENUM_VALUE3483 = 6;
+  ENUM_VALUE3484 = 7;
+  ENUM_VALUE3485 = 8;
+  ENUM_VALUE3486 = 9;
+  ENUM_VALUE3487 = 10;
+  ENUM_VALUE3488 = 11;
+  ENUM_VALUE3489 = 12;
+  ENUM_VALUE3490 = 13;
+  ENUM_VALUE3491 = 14;
+  ENUM_VALUE3492 = 15;
+  ENUM_VALUE3493 = 16;
+  ENUM_VALUE3494 = 17;
+  ENUM_VALUE3495 = 18;
+  ENUM_VALUE3496 = 19;
+  ENUM_VALUE3497 = 20;
+  ENUM_VALUE3498 = 21;
+  ENUM_VALUE3499 = 22;
+  ENUM_VALUE3500 = 23;
+  ENUM_VALUE3501 = 24;
+  ENUM_VALUE3502 = 25;
+  ENUM_VALUE3503 = 26;
+  ENUM_VALUE3504 = 27;
+  ENUM_VALUE3505 = 28;
+  ENUM_VALUE3506 = 29;
+  ENUM_VALUE3507 = 30;
+  ENUM_VALUE3508 = 31;
+  ENUM_VALUE3509 = 32;
+  ENUM_VALUE3510 = 33;
+  ENUM_VALUE3511 = 34;
+  ENUM_VALUE3512 = 35;
+  ENUM_VALUE3513 = 36;
+  ENUM_VALUE3514 = 37;
+  ENUM_VALUE3515 = 38;
+  ENUM_VALUE3516 = 39;
+  ENUM_VALUE3517 = 40;
+  ENUM_VALUE3518 = 41;
+  ENUM_VALUE3519 = 42;
+  ENUM_VALUE3520 = 43;
+  ENUM_VALUE3521 = 44;
+  ENUM_VALUE3522 = 45;
+  ENUM_VALUE3523 = 46;
+  ENUM_VALUE3524 = 47;
+  ENUM_VALUE3525 = 48;
+  ENUM_VALUE3526 = 49;
+  ENUM_VALUE3527 = 50;
+  ENUM_VALUE3528 = 51;
+  ENUM_VALUE3529 = 52;
+  ENUM_VALUE3530 = 53;
+  ENUM_VALUE3531 = 54;
+  ENUM_VALUE3532 = 55;
+  ENUM_VALUE3533 = 56;
+  ENUM_VALUE3534 = 57;
+  ENUM_VALUE3535 = 58;
+  ENUM_VALUE3536 = 59;
+  ENUM_VALUE3537 = 60;
+  ENUM_VALUE3538 = 61;
+  ENUM_VALUE3539 = 62;
+  ENUM_VALUE3540 = 63;
+  ENUM_VALUE3541 = 64;
+  ENUM_VALUE3542 = 65;
+  ENUM_VALUE3543 = 66;
+  ENUM_VALUE3544 = 67;
+  ENUM_VALUE3545 = 68;
+  ENUM_VALUE3546 = 69;
+  ENUM_VALUE3547 = 70;
+  ENUM_VALUE3548 = 71;
+  ENUM_VALUE3549 = 72;
+  ENUM_VALUE3550 = 73;
+  ENUM_VALUE3551 = 74;
+  ENUM_VALUE3552 = 75;
+  ENUM_VALUE3553 = 76;
+  ENUM_VALUE3554 = 77;
+  ENUM_VALUE3555 = 78;
+  ENUM_VALUE3556 = 79;
+  ENUM_VALUE3557 = 80;
+  ENUM_VALUE3558 = 81;
+  ENUM_VALUE3559 = 82;
+  ENUM_VALUE3560 = 83;
+  ENUM_VALUE3561 = 84;
+  ENUM_VALUE3562 = 85;
+  ENUM_VALUE3563 = 86;
+  ENUM_VALUE3564 = 87;
+  ENUM_VALUE3565 = 88;
+  ENUM_VALUE3566 = 89;
+  ENUM_VALUE3567 = 90;
+  ENUM_VALUE3568 = 91;
+  ENUM_VALUE3569 = 92;
+  ENUM_VALUE3570 = 93;
+  ENUM_VALUE3571 = 94;
+  ENUM_VALUE3572 = 95;
+  ENUM_VALUE3573 = 96;
+  ENUM_VALUE3574 = 97;
+  ENUM_VALUE3575 = 98;
+  ENUM_VALUE3576 = 99;
+  ENUM_VALUE3577 = 100;
+  ENUM_VALUE3578 = 101;
+  ENUM_VALUE3579 = 102;
+  ENUM_VALUE3580 = 103;
+  ENUM_VALUE3581 = 104;
+  ENUM_VALUE3582 = 105;
+  ENUM_VALUE3583 = 106;
+  ENUM_VALUE3584 = 107;
+  ENUM_VALUE3585 = 108;
+  ENUM_VALUE3586 = 109;
+  ENUM_VALUE3587 = 110;
+  ENUM_VALUE3588 = 111;
+  ENUM_VALUE3589 = 112;
+  ENUM_VALUE3590 = 113;
+  ENUM_VALUE3591 = 114;
+  ENUM_VALUE3592 = 115;
+  ENUM_VALUE3593 = 116;
+  ENUM_VALUE3594 = 117;
+  ENUM_VALUE3595 = 118;
+  ENUM_VALUE3596 = 119;
+  ENUM_VALUE3597 = 120;
+  ENUM_VALUE3598 = 121;
+  ENUM_VALUE3599 = 122;
+  ENUM_VALUE3600 = 123;
+  ENUM_VALUE3601 = 124;
+  ENUM_VALUE3602 = 125;
+  ENUM_VALUE3603 = 126;
+  ENUM_VALUE3604 = 127;
+  ENUM_VALUE3605 = 128;
+  ENUM_VALUE3606 = 129;
+  ENUM_VALUE3607 = 130;
+  ENUM_VALUE3608 = 131;
+  ENUM_VALUE3609 = 132;
+  ENUM_VALUE3610 = 133;
+  ENUM_VALUE3611 = 134;
+  ENUM_VALUE3612 = 135;
+  ENUM_VALUE3613 = 136;
+  ENUM_VALUE3614 = 137;
+  ENUM_VALUE3615 = 138;
+  ENUM_VALUE3616 = 139;
+  ENUM_VALUE3617 = 140;
+  ENUM_VALUE3618 = 141;
+  ENUM_VALUE3619 = 142;
+  ENUM_VALUE3620 = 143;
+  ENUM_VALUE3621 = 144;
+  ENUM_VALUE3622 = 145;
+  ENUM_VALUE3623 = 146;
+  ENUM_VALUE3624 = 147;
+  ENUM_VALUE3625 = 148;
+  ENUM_VALUE3626 = 149;
+  ENUM_VALUE3627 = 150;
+  ENUM_VALUE3628 = 151;
+  ENUM_VALUE3629 = 152;
+  ENUM_VALUE3630 = 153;
+  ENUM_VALUE3631 = 154;
+  ENUM_VALUE3632 = 155;
+  ENUM_VALUE3633 = 156;
+  ENUM_VALUE3634 = 157;
+  ENUM_VALUE3635 = 158;
+  ENUM_VALUE3636 = 159;
+  ENUM_VALUE3637 = 160;
+  ENUM_VALUE3638 = 161;
+  ENUM_VALUE3639 = 162;
+  ENUM_VALUE3640 = 163;
+  ENUM_VALUE3641 = 164;
+  ENUM_VALUE3642 = 165;
+  ENUM_VALUE3643 = 166;
+  ENUM_VALUE3644 = 167;
+  ENUM_VALUE3645 = 168;
+  ENUM_VALUE3646 = 169;
+  ENUM_VALUE3647 = 170;
+  ENUM_VALUE3648 = 171;
+  ENUM_VALUE3649 = 172;
+  ENUM_VALUE3650 = 173;
+  ENUM_VALUE3651 = 174;
+  ENUM_VALUE3652 = 175;
+  ENUM_VALUE3653 = 176;
+  ENUM_VALUE3654 = 177;
+  ENUM_VALUE3655 = 178;
+  ENUM_VALUE3656 = 179;
+  ENUM_VALUE3657 = 180;
+  ENUM_VALUE3658 = 181;
+  ENUM_VALUE3659 = 182;
+  ENUM_VALUE3660 = 183;
+}
+
+enum Enum10325 {
+  ENUM_VALUE10326 = 0;
+  ENUM_VALUE10327 = 1;
+  ENUM_VALUE10328 = 2;
+  ENUM_VALUE10329 = 3;
+  ENUM_VALUE10330 = 4;
+  ENUM_VALUE10331 = 5;
+  ENUM_VALUE10332 = 6;
+  ENUM_VALUE10333 = 7;
+  ENUM_VALUE10334 = 8;
+}
+
+enum Enum10335 {
+  ENUM_VALUE10336 = 0;
+}
+
+enum Enum10337 {
+  ENUM_VALUE10338 = 0;
+  ENUM_VALUE10339 = 1;
+}
+
+enum Enum11901 {
+  ENUM_VALUE11902 = 0;
+  ENUM_VALUE11903 = 1;
+  ENUM_VALUE11904 = 2;
+  ENUM_VALUE11905 = 3;
+}
+
+enum Enum12735 {
+  ENUM_VALUE12736 = 0;
+  ENUM_VALUE12737 = 1;
+  ENUM_VALUE12738 = 2;
+  ENUM_VALUE12739 = 3;
+}
+
+enum Enum12871 {
+  ENUM_VALUE12872 = 1;
+  ENUM_VALUE12873 = 2;
+  ENUM_VALUE12874 = 3;
+  ENUM_VALUE12875 = 4;
+  ENUM_VALUE12876 = 5;
+  ENUM_VALUE12877 = 6;
+}
+
diff --git a/benchmarks/resources/protobuf/benchmarks.proto b/benchmarks/resources/protobuf/benchmarks.proto
new file mode 100644
index 0000000..51c0b54
--- /dev/null
+++ b/benchmarks/resources/protobuf/benchmarks.proto
@@ -0,0 +1,63 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package benchmarks;
+option java_package = "com.google.protobuf.benchmarks";
+
+message BenchmarkDataset {
+  // Name of the benchmark dataset.  This should be unique across all datasets.
+  // Should only contain word characters: [a-zA-Z0-9_]
+  string name = 1;
+
+  // Fully-qualified name of the protobuf message for this dataset.
+  // It will be one of the messages defined benchmark_messages_proto2.proto
+  // or benchmark_messages_proto3.proto.
+  //
+  // Implementations that do not support reflection can implement this with
+  // an explicit "if/else" chain that lists every known message defined
+  // in those files.
+  string message_name = 2;
+
+  // The payload(s) for this dataset.  They should be parsed or serialized
+  // in sequence, in a loop, ie.
+  //
+  //  while (!benchmarkDone) {  // Benchmark runner decides when to exit.
+  //    for (i = 0; i < benchmark.payload.length; i++) {
+  //      parse(benchmark.payload[i])
+  //    }
+  //  }
+  //
+  // This is intended to let datasets include a variety of data to provide
+  // potentially more realistic results than just parsing the same message
+  // over and over.  A single message parsed repeatedly could yield unusually
+  // good branch prediction performance.
+  repeated bytes payload = 3;
+}
diff --git a/benchmarks/resources/protobuf/google_size.proto b/benchmarks/resources/protobuf/google_size.proto
new file mode 100644
index 0000000..d2d319f
--- /dev/null
+++ b/benchmarks/resources/protobuf/google_size.proto
@@ -0,0 +1,138 @@
+syntax = "proto2";
+
+package benchmarks;
+
+option java_outer_classname = "GoogleSize";
+option optimize_for = CODE_SIZE;
+
+message SizeMessage1 {
+  required string field1 = 1;
+  optional string field9 = 9;
+  optional string field18 = 18;
+  optional bool field80 = 80 [default=false];
+  optional bool field81 = 81 [default=true];
+  required int32 field2 = 2;
+  required int32 field3 = 3;
+  optional int32 field280 = 280;
+  optional int32 field6 = 6 [default=0];
+  optional int64 field22 = 22;
+  optional string field4 = 4;
+  repeated fixed64 field5 = 5;
+  optional bool field59 = 59 [default=false];
+  optional string field7 = 7;
+  optional int32 field16 = 16;
+  optional int32 field130 = 130 [default=0];
+  optional bool field12 = 12 [default=true];
+  optional bool field17 = 17 [default=true];
+  optional bool field13 = 13 [default=true];
+  optional bool field14 = 14 [default=true];
+  optional int32 field104 = 104 [default=0];
+  optional int32 field100 = 100 [default=0];
+  optional int32 field101 = 101 [default=0];
+  optional string field102 = 102;
+  optional string field103 = 103;
+  optional int32 field29 = 29 [default=0];
+  optional bool field30 = 30 [default=false];
+  optional int32 field60 = 60 [default=-1];
+  optional int32 field271 = 271 [default=-1];
+  optional int32 field272 = 272 [default=-1];
+  optional int32 field150 = 150;
+  optional int32 field23 = 23 [default=0];
+  optional bool field24 = 24 [default=false];
+  optional int32 field25 = 25 [default=0];
+  optional SizeMessage1SubMessage field15 = 15;
+  optional bool field78 = 78;
+  optional int32 field67 = 67 [default=0];
+  optional int32 field68 = 68;
+  optional int32 field128 = 128 [default=0];
+  optional string field129 = 129 [default="xxxxxxxxxxxxxxxxxxxxx"];
+  optional int32 field131 = 131 [default=0];
+}
+
+message SizeMessage1SubMessage {
+  optional int32 field1 = 1 [default=0];
+  optional int32 field2 = 2 [default=0];
+  optional int32 field3 = 3 [default=0];
+  optional string field15 = 15;
+  optional bool field12 = 12 [default=true];
+  optional int64 field13 = 13;
+  optional int64 field14 = 14;
+  optional int32 field16 = 16;
+  optional int32 field19 = 19 [default=2];
+  optional bool field20  = 20 [default=true];
+  optional bool field28 = 28 [default=true];
+  optional fixed64 field21 = 21;
+  optional int32 field22 = 22;
+  optional bool field23 = 23 [ default=false ];
+  optional bool field206 = 206 [default=false];
+  optional fixed32 field203 = 203;
+  optional int32 field204 = 204;
+  optional string field205 = 205;
+  optional uint64 field207 = 207;
+  optional uint64 field300 = 300;
+}
+
+message SizeMessage2 {
+  optional string field1 = 1;
+  optional int64 field3 = 3;
+  optional int64 field4 = 4;
+  optional int64 field30 = 30;
+  optional bool field75  = 75 [default=false];
+  optional string field6 = 6;
+  optional bytes field2 = 2;
+  optional int32 field21 = 21 [default=0];
+  optional int32 field71 = 71;
+  optional float field25 = 25;
+  optional int32 field109 = 109 [default=0];
+  optional int32 field210 = 210 [default=0];
+  optional int32 field211 = 211 [default=0];
+  optional int32 field212 = 212 [default=0];
+  optional int32 field213 = 213 [default=0];
+  optional int32 field216 = 216 [default=0];
+  optional int32 field217 = 217 [default=0];
+  optional int32 field218 = 218 [default=0];
+  optional int32 field220 = 220 [default=0];
+  optional int32 field221 = 221 [default=0];
+  optional float field222 = 222 [default=0.0];
+  optional int32 field63 = 63;
+
+  repeated group Group1 = 10 {
+    required float field11 = 11;
+    optional float field26 = 26;
+    optional string field12 = 12;
+    optional string field13 = 13;
+    repeated string field14 = 14;
+    required uint64 field15 = 15;
+    optional int32 field5 = 5;
+    optional string field27 = 27;
+    optional int32 field28 = 28;
+    optional string field29 = 29;
+    optional string field16 = 16;
+    repeated string field22 = 22;
+    repeated int32 field73 = 73;
+    optional int32 field20 = 20 [default=0];
+    optional string field24 = 24;
+    optional SizeMessage2GroupedMessage field31 = 31;
+  }
+  repeated string field128 = 128;
+  optional int64 field131 = 131;
+  repeated string field127 = 127;
+  optional int32 field129 = 129;
+  repeated int64 field130 = 130;
+  optional bool field205 = 205 [default=false];
+  optional bool field206 = 206 [default=false];
+}
+
+message SizeMessage2GroupedMessage {
+  optional float field1 = 1;
+  optional float field2 = 2;
+  optional float field3 = 3 [default=0.0];
+  optional bool field4 = 4;
+  optional bool field5 = 5;
+  optional bool field6 = 6 [default=true];
+  optional bool field7 = 7 [default=false];
+  optional float field8 = 8;
+  optional bool field9 = 9;
+  optional float field10 = 10;
+  optional int64 field11 = 11;
+}
diff --git a/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java b/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
new file mode 100644
index 0000000..c766d74
--- /dev/null
+++ b/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
@@ -0,0 +1,214 @@
+
+package com.google.protobuf;
+
+import com.google.caliper.BeforeExperiment;
+import com.google.caliper.AfterExperiment;
+import com.google.caliper.Benchmark;
+import com.google.caliper.Param;
+import com.google.caliper.api.VmOptions;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.Message;
+import com.google.protobuf.benchmarks.Benchmarks.BenchmarkDataset;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+
+// Caliper set CICompilerCount to 1 for making sure compilation doesn't run in parallel with itself,
+// This makes TieredCompilation not working. We just disable TieredCompilation by default. In master 
+// branch this has been disabled by default in caliper: 
+// https://github.com/google/caliper/blob/master/caliper-runner/src/main/java/com/google/caliper/runner/target/Jvm.java#L38:14
+// But this haven't been added into most recent release.
+@VmOptions("-XX:-TieredCompilation")
+public class ProtoCaliperBenchmark {
+  public enum BenchmarkMessageType {
+    GOOGLE_MESSAGE1_PROTO3 {
+      @Override ExtensionRegistry getExtensionRegistry() { return ExtensionRegistry.newInstance(); }
+      @Override
+      Message getDefaultInstance() {
+        return com.google.protobuf.benchmarks.BenchmarkMessage1Proto3.GoogleMessage1
+            .getDefaultInstance();
+      }
+    },
+    GOOGLE_MESSAGE1_PROTO2 {
+      @Override ExtensionRegistry getExtensionRegistry() { return ExtensionRegistry.newInstance(); }
+      @Override
+      Message getDefaultInstance() {
+        return com.google.protobuf.benchmarks.BenchmarkMessage1Proto2.GoogleMessage1
+            .getDefaultInstance();
+      }
+    },
+    GOOGLE_MESSAGE2 {
+      @Override ExtensionRegistry getExtensionRegistry() { return ExtensionRegistry.newInstance(); }
+      @Override
+      Message getDefaultInstance() {
+        return com.google.protobuf.benchmarks.BenchmarkMessage2.GoogleMessage2.getDefaultInstance();
+      }
+    },
+    GOOGLE_MESSAGE3 {
+      @Override
+      ExtensionRegistry getExtensionRegistry() {
+        ExtensionRegistry extensions = ExtensionRegistry.newInstance();
+        com.google.protobuf.benchmarks.BenchmarkMessage38.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage37.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage36.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage35.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage34.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage33.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage32.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage31.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage3.registerAllExtensions(extensions);
+        return extensions;
+      }
+      @Override
+      Message getDefaultInstance() {
+        return com.google.protobuf.benchmarks.BenchmarkMessage3.GoogleMessage3.getDefaultInstance();
+      }
+    },
+    GOOGLE_MESSAGE4 {
+      @Override
+      ExtensionRegistry getExtensionRegistry() {
+        ExtensionRegistry extensions = ExtensionRegistry.newInstance();
+        com.google.protobuf.benchmarks.BenchmarkMessage43.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage42.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage41.registerAllExtensions(extensions);
+        com.google.protobuf.benchmarks.BenchmarkMessage4.registerAllExtensions(extensions);
+        return extensions;
+      }
+      @Override
+      Message getDefaultInstance() {
+        return com.google.protobuf.benchmarks.BenchmarkMessage4.GoogleMessage4.getDefaultInstance();
+      }
+    };
+    
+    abstract ExtensionRegistry getExtensionRegistry();
+    abstract Message getDefaultInstance();
+  }
+
+  private BenchmarkMessageType benchmarkMessageType;
+  @Param("")
+  private String dataFile;
+  
+  private byte[] inputData;
+  private BenchmarkDataset benchmarkDataset;
+  private Message defaultMessage;
+  private ExtensionRegistry extensions;
+  private List<byte[]> inputDataList;
+  private List<ByteArrayInputStream> inputStreamList;
+  private List<ByteString> inputStringList;
+  private List<Message> sampleMessageList;
+
+  private BenchmarkMessageType getMessageType() throws IOException {
+    if (benchmarkDataset.getMessageName().equals("benchmarks.proto3.GoogleMessage1")) {
+      return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO3;
+    } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage1")) {
+      return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO2;
+    } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage2")) {
+      return BenchmarkMessageType.GOOGLE_MESSAGE2;
+    } else if (benchmarkDataset.getMessageName().
+        equals("benchmarks.google_message3.GoogleMessage3")) {
+      return BenchmarkMessageType.GOOGLE_MESSAGE3;
+    } else if (benchmarkDataset.getMessageName().
+        equals("benchmarks.google_message4.GoogleMessage4")) {
+      return BenchmarkMessageType.GOOGLE_MESSAGE4;
+    } else {
+      throw new IllegalStateException("Invalid DataFile! There's no testing message named "
+          + benchmarkDataset.getMessageName());
+    }
+  }
+  
+  @BeforeExperiment
+  void setUp() throws IOException {
+    if (!dataFile.equals("")) {
+      RandomAccessFile file = new RandomAccessFile(new File(dataFile), "r");
+      inputData = new byte[(int) file.length()];
+      file.readFully(inputData);
+      benchmarkDataset = BenchmarkDataset.parseFrom(inputData);
+      benchmarkMessageType = getMessageType();
+    } else {
+      inputData = new byte[0];
+      benchmarkDataset = BenchmarkDataset.parseFrom(inputData);
+      benchmarkMessageType = BenchmarkMessageType.GOOGLE_MESSAGE2;
+    }
+    defaultMessage = benchmarkMessageType.getDefaultInstance();
+    extensions = benchmarkMessageType.getExtensionRegistry();
+    inputDataList = new ArrayList<byte[]>();
+    inputStreamList = new ArrayList<ByteArrayInputStream>();
+    inputStringList = new ArrayList<ByteString>();
+    sampleMessageList = new ArrayList<Message>();
+    
+    for (int i = 0; i < benchmarkDataset.getPayloadCount(); i++) {
+      byte[] singleInputData = benchmarkDataset.getPayload(i).toByteArray();
+      inputDataList.add(benchmarkDataset.getPayload(i).toByteArray());
+      inputStreamList.add(new ByteArrayInputStream(
+          benchmarkDataset.getPayload(i).toByteArray()));
+      inputStringList.add(benchmarkDataset.getPayload(i));
+      sampleMessageList.add(
+          defaultMessage.newBuilderForType().mergeFrom(singleInputData, extensions).build());
+    }
+  }
+  
+  
+  @Benchmark
+  void serializeToByteArray(int reps) throws IOException {
+    if (sampleMessageList.size() == 0) {
+      return;
+    }
+    for (int i = 0; i < reps; i++) {
+      for (int j = 0; j < sampleMessageList.size(); j++) {
+        sampleMessageList.get(j).toByteArray();  
+      }
+    }
+  }
+  
+  @Benchmark
+  void serializeToMemoryStream(int reps) throws IOException {
+    if (sampleMessageList.size() == 0) {
+      return;
+    }
+    for (int i = 0; i < reps; i++) {
+      for (int j = 0; j < sampleMessageList.size(); j++) {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        sampleMessageList.get(j).writeTo(output); 
+      }
+    }
+  }
+  
+  @Benchmark
+  void deserializeFromByteArray(int reps) throws IOException {
+    if (inputDataList.size() == 0) {
+      return;
+    }
+    for (int i = 0; i < reps; i++) {
+      for (int j = 0; j < inputDataList.size(); j++) {
+        benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
+          inputDataList.get(j), extensions);
+      }
+    }
+  }
+  
+  @Benchmark
+  void deserializeFromMemoryStream(int reps) throws IOException {
+    if (inputStreamList.size() == 0) {
+      return;
+    }
+    for (int i = 0; i < reps; i++) {
+      for (int j = 0; j < inputStreamList.size(); j++) {
+        benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
+            inputStreamList.get(j), extensions);
+        inputStreamList.get(j).reset();
+      }
+    }
+  }
+}
+
+

From 5a3b3279dc9278eee367bc2bfe2baded685b3446 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 4 Jul 2018 00:53:20 -0500
Subject: [PATCH 502/525] Pulled in benchmarking code (adapted from Google
 Protobuf repo).

---
 {benchmarks => performance/benchmarks}/.gitignore   |   0
 {benchmarks => performance/benchmarks}/LICENSE      |   0
 {benchmarks => performance/benchmarks}/README.md    |   0
 .../benchmarks}/bin/compile-protobufs               |   0
 .../benchmarks}/bin/java-benchmark                  |   0
 {benchmarks => performance/benchmarks}/project.clj  |   0
 .../benchmarks}/resources/datasets/bigdata/Makefile |   0
 .../proto2/benchmark_message1_proto2.proto          |   0
 .../proto2/dataset.google_message1_proto2.pb        | Bin
 .../proto3/benchmark_message1_proto3.proto          |   0
 .../proto3/dataset.google_message1_proto3.pb        | Bin
 .../google_message2/benchmark_message2.proto        |   0
 .../google_message2/dataset.google_message2.pb      | Bin
 .../google_message3/benchmark_message3.proto        |   0
 .../google_message3/benchmark_message3_1.proto      |   0
 .../google_message3/benchmark_message3_2.proto      |   0
 .../google_message3/benchmark_message3_3.proto      |   0
 .../google_message3/benchmark_message3_4.proto      |   0
 .../google_message3/benchmark_message3_5.proto      |   0
 .../google_message3/benchmark_message3_6.proto      |   0
 .../google_message3/benchmark_message3_7.proto      |   0
 .../google_message3/benchmark_message3_8.proto      |   0
 .../google_message4/benchmark_message4.proto        |   0
 .../google_message4/benchmark_message4_1.proto      |   0
 .../google_message4/benchmark_message4_2.proto      |   0
 .../google_message4/benchmark_message4_3.proto      |   0
 .../benchmarks}/resources/protobuf/benchmarks.proto |   0
 .../resources/protobuf/google_size.proto            |   0
 .../com/google/protobuf/ProtoCaliperBenchmark.java  |   0
 29 files changed, 0 insertions(+), 0 deletions(-)
 rename {benchmarks => performance/benchmarks}/.gitignore (100%)
 rename {benchmarks => performance/benchmarks}/LICENSE (100%)
 rename {benchmarks => performance/benchmarks}/README.md (100%)
 rename {benchmarks => performance/benchmarks}/bin/compile-protobufs (100%)
 rename {benchmarks => performance/benchmarks}/bin/java-benchmark (100%)
 rename {benchmarks => performance/benchmarks}/project.clj (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/bigdata/Makefile (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message2/benchmark_message2.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message2/dataset.google_message2.pb (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_1.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_2.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_3.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_4.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_5.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_6.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_7.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message3/benchmark_message3_8.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message4/benchmark_message4.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message4/benchmark_message4_1.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message4/benchmark_message4_2.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/datasets/google_message4/benchmark_message4_3.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/protobuf/benchmarks.proto (100%)
 rename {benchmarks => performance/benchmarks}/resources/protobuf/google_size.proto (100%)
 rename {benchmarks => performance/benchmarks}/src/java/com/google/protobuf/ProtoCaliperBenchmark.java (100%)

diff --git a/benchmarks/.gitignore b/performance/benchmarks/.gitignore
similarity index 100%
rename from benchmarks/.gitignore
rename to performance/benchmarks/.gitignore
diff --git a/benchmarks/LICENSE b/performance/benchmarks/LICENSE
similarity index 100%
rename from benchmarks/LICENSE
rename to performance/benchmarks/LICENSE
diff --git a/benchmarks/README.md b/performance/benchmarks/README.md
similarity index 100%
rename from benchmarks/README.md
rename to performance/benchmarks/README.md
diff --git a/benchmarks/bin/compile-protobufs b/performance/benchmarks/bin/compile-protobufs
similarity index 100%
rename from benchmarks/bin/compile-protobufs
rename to performance/benchmarks/bin/compile-protobufs
diff --git a/benchmarks/bin/java-benchmark b/performance/benchmarks/bin/java-benchmark
similarity index 100%
rename from benchmarks/bin/java-benchmark
rename to performance/benchmarks/bin/java-benchmark
diff --git a/benchmarks/project.clj b/performance/benchmarks/project.clj
similarity index 100%
rename from benchmarks/project.clj
rename to performance/benchmarks/project.clj
diff --git a/benchmarks/resources/datasets/bigdata/Makefile b/performance/benchmarks/resources/datasets/bigdata/Makefile
similarity index 100%
rename from benchmarks/resources/datasets/bigdata/Makefile
rename to performance/benchmarks/resources/datasets/bigdata/Makefile
diff --git a/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto b/performance/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
rename to performance/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
diff --git a/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb b/performance/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
similarity index 100%
rename from benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
rename to performance/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
diff --git a/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto b/performance/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
rename to performance/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
diff --git a/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb b/performance/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
similarity index 100%
rename from benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
rename to performance/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
diff --git a/benchmarks/resources/datasets/google_message2/benchmark_message2.proto b/performance/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message2/benchmark_message2.proto
rename to performance/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
diff --git a/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb b/performance/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
similarity index 100%
rename from benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
rename to performance/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
diff --git a/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto b/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
rename to performance/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4.proto b/performance/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message4/benchmark_message4.proto
rename to performance/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto b/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
rename to performance/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto b/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
rename to performance/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
diff --git a/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto b/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
similarity index 100%
rename from benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
rename to performance/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
diff --git a/benchmarks/resources/protobuf/benchmarks.proto b/performance/benchmarks/resources/protobuf/benchmarks.proto
similarity index 100%
rename from benchmarks/resources/protobuf/benchmarks.proto
rename to performance/benchmarks/resources/protobuf/benchmarks.proto
diff --git a/benchmarks/resources/protobuf/google_size.proto b/performance/benchmarks/resources/protobuf/google_size.proto
similarity index 100%
rename from benchmarks/resources/protobuf/google_size.proto
rename to performance/benchmarks/resources/protobuf/google_size.proto
diff --git a/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java b/performance/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
similarity index 100%
rename from benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
rename to performance/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java

From 0b448f075641ae0ca3bf0872016b81ac669fe41d Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 4 Jul 2018 01:58:30 -0500
Subject: [PATCH 503/525] Updates from using latest Google release.

---
 resources/protobuf/examples/person.proto |  2 ++
 resources/protobuf/examples/photo.proto  |  1 +
 resources/protobuf/extensions.proto      |  2 ++
 resources/protobuf/testing/codec.proto   |  2 ++
 resources/protobuf/testing/core.proto    |  2 ++
 resources/protobuf/testing/maps.proto    |  2 ++
 src/java/protobuf/Extensions.java        | 14 ++++++++++----
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/resources/protobuf/examples/person.proto b/resources/protobuf/examples/person.proto
index 4557483..ab6c59f 100644
--- a/resources/protobuf/examples/person.proto
+++ b/resources/protobuf/examples/person.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package protobuf.examples.person;
 
 option java_outer_classname = "Example";
diff --git a/resources/protobuf/examples/photo.proto b/resources/protobuf/examples/photo.proto
index 095add6..974f406 100644
--- a/resources/protobuf/examples/photo.proto
+++ b/resources/protobuf/examples/photo.proto
@@ -1,4 +1,5 @@
 syntax = "proto2";
+
 package protobuf.examples.photo;
 
 import "protobuf/extensions.proto";
diff --git a/resources/protobuf/extensions.proto b/resources/protobuf/extensions.proto
index 05603ca..447d361 100644
--- a/resources/protobuf/extensions.proto
+++ b/resources/protobuf/extensions.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 import "google/protobuf/descriptor.proto";
 
 option java_package = "protobuf";
diff --git a/resources/protobuf/testing/codec.proto b/resources/protobuf/testing/codec.proto
index 014dc3e..85c39f8 100644
--- a/resources/protobuf/testing/codec.proto
+++ b/resources/protobuf/testing/codec.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package protobuf.testing.codec;
 
 import "protobuf/extensions.proto";
diff --git a/resources/protobuf/testing/core.proto b/resources/protobuf/testing/core.proto
index 1a44b72..59b35c1 100644
--- a/resources/protobuf/testing/core.proto
+++ b/resources/protobuf/testing/core.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package protobuf.testing.core;
 
 import "protobuf/extensions.proto";
diff --git a/resources/protobuf/testing/maps.proto b/resources/protobuf/testing/maps.proto
index a0aa7f0..6606b96 100644
--- a/resources/protobuf/testing/maps.proto
+++ b/resources/protobuf/testing/maps.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package protobuf.testing.maps;
 
 import "protobuf/extensions.proto";
diff --git a/src/java/protobuf/Extensions.java b/src/java/protobuf/Extensions.java
index fbb8f74..4931bc6 100644
--- a/src/java/protobuf/Extensions.java
+++ b/src/java/protobuf/Extensions.java
@@ -6,7 +6,7 @@
 public final class Extensions {
   private Extensions() {}
   public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
+      com.google.protobuf.ExtensionRegistryLite registry) {
     registry.add(protobuf.Extensions.set);
     registry.add(protobuf.Extensions.map);
     registry.add(protobuf.Extensions.mapBy);
@@ -23,6 +23,12 @@ public static void registerAllExtensions(
     registry.add(protobuf.Extensions.nullDouble);
     registry.add(protobuf.Extensions.nullEnum);
   }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
   public static final int SET_FIELD_NUMBER = 52001;
   /**
    * <code>extend .google.protobuf.FieldOptions { ... }</code>
@@ -193,7 +199,7 @@ public static void registerAllExtensions(
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -206,7 +212,7 @@ public static void registerAllExtensions(
       "ions\030\244\226\003 \001(\010:3\n\nsuccession\022\035.google.prot" +
       "obuf.FieldOptions\030\245\226\003 \001(\010:4\n\013map_deleted" +
       "\022\035.google.protobuf.FieldOptions\030\246\226\003 \001(\t:" +
-      "3\n\nmap_exists\022\035.google.protobuf.FieldOpt",
+      "3\n\nmap_exists\022\035.google.protobuf.FieldOpt" +
       "ions\030\247\226\003 \001(\t:-\n\004meta\022\035.google.protobuf.F" +
       "ieldOptions\030\252\226\003 \001(\t:1\n\010nullable\022\035.google" +
       ".protobuf.FieldOptions\030\264\226\003 \001(\010:4\n\013null_s" +
@@ -216,7 +222,7 @@ public static void registerAllExtensions(
       "otobuf.FieldOptions\030\267\226\003 \001(\022:3\n\nnull_floa" +
       "t\022\035.google.protobuf.FieldOptions\030\270\226\003 \001(\002" +
       ":4\n\013null_double\022\035.google.protobuf.FieldO" +
-      "ptions\030\271\226\003 \001(\001:2\n\tnull_enum\022\035.google.pro",
+      "ptions\030\271\226\003 \001(\001:2\n\tnull_enum\022\035.google.pro" +
       "tobuf.FieldOptions\030\272\226\003 \001(\rB\026\n\010protobufB\n" +
       "Extensions"
     };

From 6745724bd1199cc3267e6d6298834acd5b950172 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 4 Jul 2018 01:59:12 -0500
Subject: [PATCH 504/525] Added feature note.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e1592be..74163e9 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
-| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java (see the branch [release/1.2.x](https://github.com/clojusc/protobuf/tree/release/1.2.x))
+| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java (see the branch [release/1.2.x](https://github.com/clojusc/protobuf/tree/release/1.2.x)), added benchmarking
 | 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
 | 3.5.1-v0.3          | Bumped to latest release of protobuf-java, re-added tests, Travis CI support

From 5fcb209a5df11f621b26b928cb6727f1e230e7a6 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 4 Jul 2018 02:10:05 -0500
Subject: [PATCH 505/525] Shuffled benchmarks around.

---
 .../benchmarks => benchmarks}/.gitignore      |   0
 .../benchmarks => benchmarks}/LICENSE         |   0
 benchmarks/README.md                          |  30 +++++++++
 .../bin/compile-protobufs                     |   0
 .../bin/java-benchmark                        |   0
 .../benchmarks => benchmarks}/project.clj     |   0
 .../resources/datasets/bigdata/Makefile       |   0
 .../proto2/benchmark_message1_proto2.proto    |   0
 .../proto2/dataset.google_message1_proto2.pb  | Bin
 .../proto3/benchmark_message1_proto3.proto    |   0
 .../proto3/dataset.google_message1_proto3.pb  | Bin
 .../google_message2/benchmark_message2.proto  |   0
 .../dataset.google_message2.pb                | Bin
 .../google_message3/benchmark_message3.proto  |   0
 .../benchmark_message3_1.proto                |   0
 .../benchmark_message3_2.proto                |   0
 .../benchmark_message3_3.proto                |   0
 .../benchmark_message3_4.proto                |   0
 .../benchmark_message3_5.proto                |   0
 .../benchmark_message3_6.proto                |   0
 .../benchmark_message3_7.proto                |   0
 .../benchmark_message3_8.proto                |   0
 .../google_message4/benchmark_message4.proto  |   0
 .../benchmark_message4_1.proto                |   0
 .../benchmark_message4_2.proto                |   0
 .../benchmark_message4_3.proto                |   0
 .../resources/protobuf/benchmarks.proto       |   0
 .../resources/protobuf/google_size.proto      |   0
 .../protobuf/ProtoCaliperBenchmark.java       |   0
 performance/benchmarks/README.md              |  57 ------------------
 30 files changed, 30 insertions(+), 57 deletions(-)
 rename {performance/benchmarks => benchmarks}/.gitignore (100%)
 rename {performance/benchmarks => benchmarks}/LICENSE (100%)
 create mode 100644 benchmarks/README.md
 rename {performance/benchmarks => benchmarks}/bin/compile-protobufs (100%)
 rename {performance/benchmarks => benchmarks}/bin/java-benchmark (100%)
 rename {performance/benchmarks => benchmarks}/project.clj (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/bigdata/Makefile (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message2/benchmark_message2.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message2/dataset.google_message2.pb (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_1.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_2.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_3.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_4.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_5.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_6.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_7.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message3/benchmark_message3_8.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message4/benchmark_message4.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message4/benchmark_message4_1.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message4/benchmark_message4_2.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/datasets/google_message4/benchmark_message4_3.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/protobuf/benchmarks.proto (100%)
 rename {performance/benchmarks => benchmarks}/resources/protobuf/google_size.proto (100%)
 rename {performance/benchmarks => benchmarks}/src/java/com/google/protobuf/ProtoCaliperBenchmark.java (100%)
 delete mode 100644 performance/benchmarks/README.md

diff --git a/performance/benchmarks/.gitignore b/benchmarks/.gitignore
similarity index 100%
rename from performance/benchmarks/.gitignore
rename to benchmarks/.gitignore
diff --git a/performance/benchmarks/LICENSE b/benchmarks/LICENSE
similarity index 100%
rename from performance/benchmarks/LICENSE
rename to benchmarks/LICENSE
diff --git a/benchmarks/README.md b/benchmarks/README.md
new file mode 100644
index 0000000..15e084f
--- /dev/null
+++ b/benchmarks/README.md
@@ -0,0 +1,30 @@
+
+# Protocol Buffers Benchmarks
+
+This directory contains benchmarking schemas and data sets that is
+used to test a variety of performance scenarios against protobuf-java.
+protobuf language runtime. This is specifically used to identify any
+performance regressions.
+
+If you are looking for performance numbers of officially support languages, see 
+[here](https://github.com/google/protobuf/blob/master/docs/performance.md)
+
+To run the tests:
+
+```
+$ lein bench
+```
+
+This will download additional big testing data which is not included in the
+directory initially.
+
+
+## Benchmark datasets
+
+Each data set is in the format of benchmarks.proto:
+
+1. name is the benchmark dataset's name.
+2. message_name is the benchmark's message type full name (including package and message name)
+3. payload is the list of raw data.
+
+The schema for the datasets is described in `benchmarks.proto`.
diff --git a/performance/benchmarks/bin/compile-protobufs b/benchmarks/bin/compile-protobufs
similarity index 100%
rename from performance/benchmarks/bin/compile-protobufs
rename to benchmarks/bin/compile-protobufs
diff --git a/performance/benchmarks/bin/java-benchmark b/benchmarks/bin/java-benchmark
similarity index 100%
rename from performance/benchmarks/bin/java-benchmark
rename to benchmarks/bin/java-benchmark
diff --git a/performance/benchmarks/project.clj b/benchmarks/project.clj
similarity index 100%
rename from performance/benchmarks/project.clj
rename to benchmarks/project.clj
diff --git a/performance/benchmarks/resources/datasets/bigdata/Makefile b/benchmarks/resources/datasets/bigdata/Makefile
similarity index 100%
rename from performance/benchmarks/resources/datasets/bigdata/Makefile
rename to benchmarks/resources/datasets/bigdata/Makefile
diff --git a/performance/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto b/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
rename to benchmarks/resources/datasets/google_message1/proto2/benchmark_message1_proto2.proto
diff --git a/performance/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb b/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
rename to benchmarks/resources/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
diff --git a/performance/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto b/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
rename to benchmarks/resources/datasets/google_message1/proto3/benchmark_message1_proto3.proto
diff --git a/performance/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb b/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
rename to benchmarks/resources/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
diff --git a/performance/benchmarks/resources/datasets/google_message2/benchmark_message2.proto b/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message2/benchmark_message2.proto
rename to benchmarks/resources/datasets/google_message2/benchmark_message2.proto
diff --git a/performance/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb b/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
rename to benchmarks/resources/datasets/google_message2/dataset.google_message2.pb
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_1.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_2.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_3.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_4.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_5.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_6.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_7.proto
diff --git a/performance/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto b/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
rename to benchmarks/resources/datasets/google_message3/benchmark_message3_8.proto
diff --git a/performance/benchmarks/resources/datasets/google_message4/benchmark_message4.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message4/benchmark_message4.proto
rename to benchmarks/resources/datasets/google_message4/benchmark_message4.proto
diff --git a/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
rename to benchmarks/resources/datasets/google_message4/benchmark_message4_1.proto
diff --git a/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
rename to benchmarks/resources/datasets/google_message4/benchmark_message4_2.proto
diff --git a/performance/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto b/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
similarity index 100%
rename from performance/benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
rename to benchmarks/resources/datasets/google_message4/benchmark_message4_3.proto
diff --git a/performance/benchmarks/resources/protobuf/benchmarks.proto b/benchmarks/resources/protobuf/benchmarks.proto
similarity index 100%
rename from performance/benchmarks/resources/protobuf/benchmarks.proto
rename to benchmarks/resources/protobuf/benchmarks.proto
diff --git a/performance/benchmarks/resources/protobuf/google_size.proto b/benchmarks/resources/protobuf/google_size.proto
similarity index 100%
rename from performance/benchmarks/resources/protobuf/google_size.proto
rename to benchmarks/resources/protobuf/google_size.proto
diff --git a/performance/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java b/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
similarity index 100%
rename from performance/benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
rename to benchmarks/src/java/com/google/protobuf/ProtoCaliperBenchmark.java
diff --git a/performance/benchmarks/README.md b/performance/benchmarks/README.md
deleted file mode 100644
index 543bf08..0000000
--- a/performance/benchmarks/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# Protocol Buffers Benchmarks
-
-This directory contains benchmarking schemas and data sets that you
-can use to test a variety of performance scenarios against your
-protobuf language runtime. If you are looking for performance 
-numbers of officially support languages, see [here](
-https://github.com/google/protobuf/blob/master/docs/performance.md)
-
-### Java
-We're using maven to build the java benchmarks, which is the same as to build
-the Java protobuf. There're no other tools need to install. We're using
-[google/caliper](https://github.com/google/caliper) as benchmark tool, which
-can be automaticly included by maven.
-
-### Big data
-
-There's some optional big testing data which is not included in the directory
-initially, you need to run the following command to download the testing data:
-
-```
-$ ./download_data.sh
-```
-
-After doing this the big data file will automaticly generated in the
-benchmark directory.
-
-## Run instructions
-
-To run all the benchmark dataset:
-
-```
-$ make java
-```
-
-```
-$ make java-benchmark
-$ ./java-benchmark $(specific generated dataset file name) [$(caliper options)]
-```
-
-## Benchmark datasets
-
-Each data set is in the format of benchmarks.proto:
-
-1. name is the benchmark dataset's name.
-2. message_name is the benchmark's message type full name (including package and message name)
-3. payload is the list of raw data.
-
-The schema for the datasets is described in `benchmarks.proto`.
-
-Benchmark likely want to run several benchmarks against each data set (parse,
-serialize, possibly JSON, possibly using different APIs, etc).
-
-We would like to add more data sets.  In general we will favor data sets
-that make the overall suite diverse without being too large or having
-too many similar tests.  Ideally everyone can run through the entire
-suite without the test run getting too long.

From ef39de82e41f27b5a1b10bc01c88fbd5ef11c1a1 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Wed, 4 Jul 2018 02:54:29 -0500
Subject: [PATCH 506/525] Reworked scripts/targets/etc.

---
 benchmarks/Makefile    | 20 ++++++++++++++++++++
 benchmarks/project.clj | 24 ++++++++++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 benchmarks/Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
new file mode 100644
index 0000000..37b46dc
--- /dev/null
+++ b/benchmarks/Makefile
@@ -0,0 +1,20 @@
+compile-protobufs:
+	./bin/compile-protobufs
+
+compile: compile-protobufs
+	lein uberjar
+
+java-benchmark:
+	./bin/java-benchmark
+
+bench: compile java-benchmark
+
+bench-big: resources/datasets/bigdata bench
+
+resources/datasets/bigdata:
+	$(MAKE) -C $@
+
+clean:
+	-rm -rv resources/datasets/bigdata/*.pb resources/datasets/bigdata/*.tar.gz
+
+.PHONY: resources/datasets/bigdata
diff --git a/benchmarks/project.clj b/benchmarks/project.clj
index 54cdd68..16b2c9f 100644
--- a/benchmarks/project.clj
+++ b/benchmarks/project.clj
@@ -8,7 +8,6 @@
     [lein-ancient "0.6.15"]
     [lein-shell "0.5.0"]]
   :java-source-paths ["src/java"]
-  :main com.google.protocolbuffers.ProtoBench
   :profiles {
     :ubercompile {
       :aot :all}}
@@ -19,9 +18,8 @@
       "+ubercompile"
       "compile"]
     ;; Protobuf compilation tasks
-    "protoc-benchmarks" [
-      "shell"
-      "bin/compile-protobufs"]
+    "protoc-compile" [
+      "shell" "make" "compile-protobufs"]
     ;; Deps
     "check-deps" [
       "ancient"
@@ -29,11 +27,21 @@
       ":all"]
     ;; Benchmarking
     "java-benchmark" [
-      "shell"
-      "bin/java-benchmark"]
+      "shell" "make" "java-benchmark"]
     "bench" [
       "do"
         ["clean"]
-        ["protoc-benchmarks"]
+        ["protoc-compile"]
         ["uberjar"]
-        ["java-benchmark"]]})
+        ["java-benchmark"]]
+    "get-big" [
+      "shell" "make" "resources/datasets/bigdata"]
+    "bench-big" [
+      "do"
+        ["clean"]
+        ["get-big"]
+        ["protoc-compile"]
+        ["uberjar"]
+        ["java-benchmark"]]
+    "clean-big" [
+      "shell" "make" "clean"]})

From db8ea32bc351cb31fb51417615b00667bb52ce35 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 09:20:51 -0500
Subject: [PATCH 507/525] Allow instances to be created from byte arrays.

---
 src/clj/protobuf/impl/flatland/core.clj | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index d320640..d3807d0 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -20,19 +20,30 @@
                  clojure.lang.Seqable
                  java.lang.Iterable]
     :init init
-    :constructors {[java.lang.Class
-                    clojure.lang.APersistentMap]
-                   []}
+    :constructors {[java.lang.Class clojure.lang.APersistentMap] []
+                   [java.lang.Class "[B"] []}
     :methods [^:static [schema [Object] Object]]
     :state contents
     :main false))
 
+(defn- get-instance
+  [wrapper data]
+  (if (= (Class/forName "[B") (type data))
+    (protobuf/parse wrapper data)
+    (protobuf/create wrapper data)))
+
+(defn- wrap-all
+  [protobuf-class java-wrapper instance]
+  {:instance instance
+   :java-wrapper java-wrapper
+   :protobuf-class protobuf-class})
+
 (defn -init
   [protobuf-class data]
   (let [wrapper (protobuf/mapdef protobuf-class)]
-    [[] {:instance (protobuf/create wrapper data)
-         :java-wrapper wrapper
-         :protobuf-class protobuf-class}]))
+    [[] (wrap-all protobuf-class
+                  wrapper
+                  (get-instance wrapper data))]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;   clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

From 9d26f47864dce87f133ce6c0b7632816dad854d8 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 10:26:49 -0500
Subject: [PATCH 508/525] Updated testing tasks.

---
 project.clj | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 0087b67..e7037b2 100644
--- a/project.clj
+++ b/project.clj
@@ -29,6 +29,7 @@
       :plugins [
         [jonase/eastwood "0.2.6"]
         [lein-ancient "0.6.15"]
+        [lein-ltest "0.3.0"]
         [lein-shell "0.5.0"]]
       :java-source-paths [
         "target/examples"
@@ -53,6 +54,7 @@
     :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
     :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
     :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+    :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
     :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
     ;; Dev tasks
@@ -117,15 +119,31 @@
       "+test"
       "eastwood"
       "{:namespaces [:source-paths] :source-paths [\"src/clj\"]}"]
-    "test-all" [
+    "ltest" [
+      "with-profile"
+      "+test"
+      "ltest"]
+    "test-old-clojure" [
       "with-profile"
-      "+1.5:+1.6:+1.7:+1.9:+default"
+      "+test,+1.5:+test,+1.6:+test,+1.7"
       "test"]
+    "test-new-clojure" [
+      "with-profile"
+      "+test,+1.8:+test,+1.9"
+      "ltest"]
+    "test-all" [
+      "do"
+      ["clean"]
+      ["protoc-all"]
+      ["test-old-clojure"]
+      ["clean"]
+      ["protoc-all"]
+      ["test-new-clojure"]]
     "clean-test" [
       "do"
       ["clean"]
       ["protoc-all"]
-      ["test"]]
+      ["ltest"]]
     "clean-test-all" [
       "do"
       ["clean"]

From cc4204ba88a28d461107ef565f7dcdd04f5bfc92 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 12:24:20 -0500
Subject: [PATCH 509/525] Improved support for creating protobufs from input
 streams.

---
 src/clj/protobuf/impl/flatland/core.clj   | 13 +++++++++----
 src/clj/protobuf/impl/flatland/mapdef.clj |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index d3807d0..24c5115 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -11,6 +11,9 @@
     [protobuf.common :as common]
     [protobuf.impl.flatland.map :as protobuf-map]
     [protobuf.impl.flatland.mapdef :as protobuf])
+  (:import
+    (com.google.protobuf.CodedInputStream)
+    (java.io.InputStream))
   (:gen-class
     :name protobuf.impl.flatland.core.FlatlandProtoBuf
     :implements [clojure.lang.Associative
@@ -21,16 +24,18 @@
                  java.lang.Iterable]
     :init init
     :constructors {[java.lang.Class clojure.lang.APersistentMap] []
-                   [java.lang.Class "[B"] []}
+                   [java.lang.Class "[B"] []
+                   [java.lang.Class com.google.protobuf.CodedInputStream] []
+                   [java.lang.Class java.io.InputStream] []}
     :methods [^:static [schema [Object] Object]]
     :state contents
     :main false))
 
 (defn- get-instance
   [wrapper data]
-  (if (= (Class/forName "[B") (type data))
-    (protobuf/parse wrapper data)
-    (protobuf/create wrapper data)))
+  (if (map? data)
+    (protobuf/create wrapper data)
+    (protobuf/parse wrapper data)))
 
 (defn- wrap-all
   [protobuf-class java-wrapper instance]
diff --git a/src/clj/protobuf/impl/flatland/mapdef.clj b/src/clj/protobuf/impl/flatland/mapdef.clj
index 68492ca..eb06432 100644
--- a/src/clj/protobuf/impl/flatland/mapdef.clj
+++ b/src/clj/protobuf/impl/flatland/mapdef.clj
@@ -76,6 +76,10 @@
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
       (PersistentProtocolBufferMap/parseFrom map-def in))))
 
+(defmethod parse CodedInputStream
+  [^PersistentProtocolBufferMap$Def map-def ^CodedInputStream stream]
+  (PersistentProtocolBufferMap/parseFrom map-def stream))
+
 (defn ^"[B" ->bytes
   "Return the byte representation of the given protobuf."
   [^PersistentProtocolBufferMap$Def map-def m]

From fef1540f83e763093f2de517503a3857044839b2 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 12:26:04 -0500
Subject: [PATCH 510/525] Updated deps.

---
 project.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index e7037b2..62edb73 100644
--- a/project.clj
+++ b/project.clj
@@ -9,7 +9,7 @@
   :dependencies [
     [com.google.protobuf/protobuf-java "3.6.0"]
     [gloss "0.2.6"]
-    [org.clojure/clojure "1.8.0"]
+    [org.clojure/clojure "1.9.0"]
     [org.flatland/io "0.3.0"]]
   :source-paths ["src/clj"]
   :java-source-paths ["src/java"]
@@ -27,7 +27,7 @@
                        "\u001B[35m]\u001B[33m λ\u001B[m=> ")}}
     :test {
       :plugins [
-        [jonase/eastwood "0.2.6"]
+        [jonase/eastwood "0.2.8"]
         [lein-ancient "0.6.15"]
         [lein-ltest "0.3.0"]
         [lein-shell "0.5.0"]]

From 4dac4664a2535004585d4af1508fe94f8f5393f0 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 12:27:32 -0500
Subject: [PATCH 511/525] Updated version notes.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74163e9..71df6d2 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ previous reference documentation, visit the
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
-| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java (see the branch [release/1.2.x](https://github.com/clojusc/protobuf/tree/release/1.2.x)), added benchmarking
+| 3.6.0-v1.2-SNAPSHOT | Bumped to latest release of protobuf-java (see the branch [release/1.2.x](https://github.com/clojusc/protobuf/tree/release/1.2.x)), added byte and stream support in constructors, added benchmarking
 | 3.5.1-v1.1          | Added docs, more func renames, new abstraction layer, improved DevEx of API, and fix for enums as Clojure keywords
 | 3.5.1-v1.0          | Droped extra deps, renamed functions
 | 3.5.1-v0.3          | Bumped to latest release of protobuf-java, re-added tests, Travis CI support

From d269f98b6713735c65c7404ba97e73a17f60e040 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 15:10:45 -0500
Subject: [PATCH 512/525] Updated docs.

---
 resources/docs/1000-basic-usage.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
index 4520ac7..18fc581 100644
--- a/resources/docs/1000-basic-usage.md
+++ b/resources/docs/1000-basic-usage.md
@@ -80,3 +80,15 @@ Additionally, converting between protobuf bytes and Clojure data is trivial:
 [protobuf.dev] λ=> (protobuf/bytes-> p b)
 {:id 108, :name "Alice", :email "alice@example.com"}
 ```
+
+## Streams and Bytes
+
+In addition to creating a protobuf instance from a Clojure map, Clojure
+protobuf also supports passing the following to the `create` function:
+
+* A Java byte array (i.e., of type `[B`)
+* A `java.io.InputStream`
+* A `com.google.protobuf.CodedInputStream`
+
+Just as with the creating one with a map, a protobuf class is expected as
+the first parameter.

From 8aeb1e2f833c00fcccf8926223282be1cd5f3232 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 15:56:47 -0500
Subject: [PATCH 513/525] Parameterized implementation type.

---
 src/clj/protobuf/core.clj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 06da21d..80b55c5 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -43,5 +43,7 @@
   ([protobuf-class]
     (create protobuf-class {}))
   ([protobuf-class data]
-    (case (get-impl)
+    (create (get-impl) protobuf-class data))
+  ([impl-key protobuf-class data]
+    (case impl-key
       :flatland (new FlatlandProtoBuf protobuf-class data))))

From d1ee1406ebb74e0b70a6003a55998d47ad431289 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 15:57:03 -0500
Subject: [PATCH 514/525] Added unit tests for new constrcutors.

---
 test/protobuf/core_test.clj | 48 ++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d9d1cad..d1e2a5a 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -3,13 +3,43 @@
     [clojure.test :refer :all]
     [protobuf.core :as protobuf])
   (:import
-    (protobuf.examples.tutorial AddressBookProtos$AddressBook)))
+    (com.google.protobuf CodedInputStream)
+    (java.io ByteArrayInputStream)
+    (protobuf.examples.tutorial AddressBookProtos$Person$PhoneNumber)))
 
-(deftest ->schema
-  (let [AddressBook (protobuf/create AddressBookProtos$AddressBook)
-        schema (protobuf/->schema AddressBook)]
-    (is (= :home
-           (get-in (protobuf/->schema AddressBook)
-                   [:fields :people :values
-                    :fields :phones :values
-                    :fields :type :default])))))
+(deftest create-flatland
+  (let [data {:number "555-1212" :type :home}
+        sample-phone-number (protobuf/create :flatland
+                             AddressBookProtos$Person$PhoneNumber
+                             data)]
+    (testing "map-based constructor ..."
+      (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
+             (type sample-phone-number)))
+      (is (= data
+             (into {} sample-phone-number))))
+    (testing "bytes-based constructor ..."
+      (let [from-bytes (protobuf/create :flatland
+                        AddressBookProtos$Person$PhoneNumber
+                        (protobuf/->bytes sample-phone-number))]
+        (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
+               (type from-bytes)))
+        (is (= data
+               (into {} from-bytes)))))
+    (testing "Google CodedInputStream-based constructor ..."
+      (let [from-stream (protobuf/create :flatland
+                         AddressBookProtos$Person$PhoneNumber
+                         (CodedInputStream/newInstance
+                         (protobuf/->bytes sample-phone-number)))]
+        (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
+               (type from-stream)))
+        (is (= data
+               (into {} from-stream)))))
+    (testing "Java InputStream-based constructor ..."
+      (let [from-stream (protobuf/create :flatland
+                         AddressBookProtos$Person$PhoneNumber
+                         (new ByteArrayInputStream
+                              (protobuf/->bytes sample-phone-number)))]
+        (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
+               (type from-stream)))
+        (is (= data
+               (into {} from-stream)))))))

From ad086135ac4872d5ada31a45c4b6954ea4f3dc13 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 15:57:42 -0500
Subject: [PATCH 515/525] Updated test alias.

---
 project.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.clj b/project.clj
index 62edb73..b512fcc 100644
--- a/project.clj
+++ b/project.clj
@@ -122,7 +122,8 @@
     "ltest" [
       "with-profile"
       "+test"
-      "ltest"]
+      "do"
+      ["clean"] ["protoc-all"] ["ltest"]]
     "test-old-clojure" [
       "with-profile"
       "+test,+1.5:+test,+1.6:+test,+1.7"

From 11fbb4e6ac9bb947ab6d2b02c51d295d122e2b3c Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 15:59:45 -0500
Subject: [PATCH 516/525] Updated travis ci config.

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afb0c93..7580c29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: clojure
 sudo: false
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y protobuf-compiler libprotoc-dev
+addons:
+  apt:
+    packages:
+      - protobuf-compiler
+      - libprotoc-dev
 script: lein build-test
 jdk:
   - oraclejdk8

From bfa86f52ce6178d9246f99ca29230455600b5689 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 16:35:10 -0500
Subject: [PATCH 517/525] Fixed typo.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71df6d2..593cb03 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Now you can use the protocol buffer in Clojure:
                              :email "alice@example.com"}))
 ```
 
-Makes some changes to the data and serialize to bytes:
+Make some changes to the data and serialize to bytes:
 
 ```clj
 (def b (-> alice

From 1b2a04aa34a05d4b87d8711b016fbffddfaa8a4f Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 17:17:51 -0500
Subject: [PATCH 518/525] Regen'd docs.

---
 docs/current/1000-basic-usage.html            | 10 ++++-
 docs/current/javadoc/allclasses-frame.html    |  4 +-
 docs/current/javadoc/allclasses-noframe.html  |  4 +-
 docs/current/javadoc/constant-values.html     |  4 +-
 docs/current/javadoc/deprecated-list.html     |  4 +-
 docs/current/javadoc/help-doc.html            |  4 +-
 docs/current/javadoc/index-all.html           |  8 +++-
 docs/current/javadoc/index.html               |  2 +-
 docs/current/javadoc/overview-tree.html       |  4 +-
 docs/current/javadoc/protobuf/Extensions.html | 19 ++++++++--
 ...tProtocolBufferMap.Def.NamingStrategy.html |  4 +-
 .../PersistentProtocolBufferMap.Def.html      |  4 +-
 .../protobuf/PersistentProtocolBufferMap.html |  4 +-
 .../javadoc/protobuf/package-frame.html       |  4 +-
 .../javadoc/protobuf/package-summary.html     |  4 +-
 .../javadoc/protobuf/package-tree.html        |  4 +-
 docs/current/javadoc/serialized-form.html     |  4 +-
 docs/current/marginalia.html                  | 37 ++++++++++++++-----
 docs/current/protobuf.core.html               |  2 +-
 19 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/docs/current/1000-basic-usage.html b/docs/current/1000-basic-usage.html
index 1365d64..908a561 100644
--- a/docs/current/1000-basic-usage.html
+++ b/docs/current/1000-basic-usage.html
@@ -51,4 +51,12 @@ <h2><a href="#using-the-clojure-api" name="using-the-clojure-api"></a>Using the
 #object["[B" 0x7e3a40eb "[B@7e3a40eb"]
 [protobuf.dev] λ=&gt; (protobuf/bytes-&gt; p b)
 {:id 108, :name "Alice", :email "alice@example.com"}
-</code></pre></div></div></div></body></html>
\ No newline at end of file
+</code></pre>
+<h2><a href="#streams-and-bytes" name="streams-and-bytes"></a>Streams and Bytes</h2>
+<p>In addition to creating a protobuf instance from a Clojure map, Clojure protobuf also supports passing the following to the <code>create</code> function:</p>
+<ul>
+  <li>A Java byte array (i.e., of type <code>[B</code>)</li>
+  <li>A <code>java.io.InputStream</code></li>
+  <li>A <code>com.google.protobuf.CodedInputStream</code></li>
+</ul>
+<p>Just as with the creating one with a map, a protobuf class is expected as the first parameter.</p></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/current/javadoc/allclasses-frame.html b/docs/current/javadoc/allclasses-frame.html
index 66c88a7..61bd747 100644
--- a/docs/current/javadoc/allclasses-frame.html
+++ b/docs/current/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/allclasses-noframe.html b/docs/current/javadoc/allclasses-noframe.html
index a336d9a..a705195 100644
--- a/docs/current/javadoc/allclasses-noframe.html
+++ b/docs/current/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>All Classes (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/constant-values.html b/docs/current/javadoc/constant-values.html
index 573d73a..d1a12cf 100644
--- a/docs/current/javadoc/constant-values.html
+++ b/docs/current/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Constant Field Values (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/deprecated-list.html b/docs/current/javadoc/deprecated-list.html
index 4877393..7261ed3 100644
--- a/docs/current/javadoc/deprecated-list.html
+++ b/docs/current/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Deprecated List (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/help-doc.html b/docs/current/javadoc/help-doc.html
index 3f24741..d9bd212 100644
--- a/docs/current/javadoc/help-doc.html
+++ b/docs/current/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>API Help (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/index-all.html b/docs/current/javadoc/index-all.html
index 4ede4af..64b9b60 100644
--- a/docs/current/javadoc/index-all.html
+++ b/docs/current/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Index (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -480,8 +480,12 @@ <h2 class="title">P</h2>
 </a>
 <h2 class="title">R</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistryLite-">registerAllExtensions(com.google.protobuf.ExtensionRegistryLite)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistryLite-">registerAllExtensions(com.google.protobuf.ExtensionRegistryLite)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions(com.google.protobuf.ExtensionRegistry)</a></span> - Static method in class protobuf.<a href="protobuf/Extensions.html" title="class in protobuf">Extensions</a></dt>
 <dd>&nbsp;</dd>
 </dl>
diff --git a/docs/current/javadoc/index.html b/docs/current/javadoc/index.html
index b855921..94f55f0 100644
--- a/docs/current/javadoc/index.html
+++ b/docs/current/javadoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Clojure Protocol Buffer Library</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
diff --git a/docs/current/javadoc/overview-tree.html b/docs/current/javadoc/overview-tree.html
index 0eca789..866a8ea 100644
--- a/docs/current/javadoc/overview-tree.html
+++ b/docs/current/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/Extensions.html b/docs/current/javadoc/protobuf/Extensions.html
index a4b6923..504a327 100644
--- a/docs/current/javadoc/protobuf/Extensions.html
+++ b/docs/current/javadoc/protobuf/Extensions.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Extensions (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9};
+var methods = {"i0":9,"i1":9,"i2":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -300,6 +300,10 @@ <h3>Method Summary</h3>
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistry-">registerAllExtensions</a></span>(com.google.protobuf.ExtensionRegistry&nbsp;registry)</code>&nbsp;</td>
 </tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../protobuf/Extensions.html#registerAllExtensions-com.google.protobuf.ExtensionRegistryLite-">registerAllExtensions</a></span>(com.google.protobuf.ExtensionRegistryLite&nbsp;registry)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -675,6 +679,15 @@ <h4>nullEnum</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="registerAllExtensions-com.google.protobuf.ExtensionRegistryLite-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerAllExtensions</h4>
+<pre>public static&nbsp;void&nbsp;registerAllExtensions(com.google.protobuf.ExtensionRegistryLite&nbsp;registry)</pre>
+</li>
+</ul>
 <a name="registerAllExtensions-com.google.protobuf.ExtensionRegistry-">
 <!--   -->
 </a>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
index 33c21e4..0209386 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.NamingStrategy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def.NamingStrategy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
index 95653e6..5348fff 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.Def.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>PersistentProtocolBufferMap.Def (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
index 1b0e881..ae2df5c 100644
--- a/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
+++ b/docs/current/javadoc/protobuf/PersistentProtocolBufferMap.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>PersistentProtocolBufferMap (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-frame.html b/docs/current/javadoc/protobuf/package-frame.html
index 7c93d67..e3eaa3b 100644
--- a/docs/current/javadoc/protobuf/package-frame.html
+++ b/docs/current/javadoc/protobuf/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-summary.html b/docs/current/javadoc/protobuf/package-summary.html
index 8cf40be..05eeed1 100644
--- a/docs/current/javadoc/protobuf/package-summary.html
+++ b/docs/current/javadoc/protobuf/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>protobuf (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/protobuf/package-tree.html b/docs/current/javadoc/protobuf/package-tree.html
index 73a982c..7f8c1f4 100644
--- a/docs/current/javadoc/protobuf/package-tree.html
+++ b/docs/current/javadoc/protobuf/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>protobuf Class Hierarchy (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/current/javadoc/serialized-form.html b/docs/current/javadoc/serialized-form.html
index 28e4fa5..9106407 100644
--- a/docs/current/javadoc/serialized-form.html
+++ b/docs/current/javadoc/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_171) on Wed Jul 04 01:48:12 CDT 2018 -->
+<!-- Generated by javadoc (1.8.0_171) on Thu Jul 12 17:16:21 CDT 2018 -->
 <title>Serialized Form (Clojure Protocol Buffer Library)</title>
-<meta name="date" content="2018-07-04">
+<meta name="date" content="2018-07-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/current/marginalia.html b/docs/current/marginalia.html
index 2d3f980..64b5553 100644
--- a/docs/current/marginalia.html
+++ b/docs/current/marginalia.html
@@ -2866,7 +2866,7 @@
   };
 })(SyntaxHighlighter);
 </script><title>Clojure Protocol Buffer Library -- Marginalia</title></head><body><table><tr><td class="docs"><div class="header"><h1 class="project-name"><a href="https://github.com/clojusc/protobuf">Clojure Protocol Buffer Library</a></h1><h2 class="project-version">3.6.0-v1.2-SNAPSHOT</h2><br /><p>A Clojure interface to Google's protocol buffers</p>
-</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.6.0</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.8.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
+</div><div class="dependencies"><h3>dependencies</h3><table><tr><td class="dep-name">com.google.protobuf/protobuf-java</td><td class="dotted"><hr /></td><td class="dep-version">3.6.0</td></tr><tr><td class="dep-name">gloss</td><td class="dotted"><hr /></td><td class="dep-version">0.2.6</td></tr><tr><td class="dep-name">org.clojure/clojure</td><td class="dotted"><hr /></td><td class="dep-version">1.9.0</td></tr><tr><td class="dep-name">org.flatland/io</td><td class="dotted"><hr /></td><td class="dep-version">0.3.0</td></tr></table></div></td><td class="codes" style="text-align: center; vertical-align: middle;color: #666;padding-right:20px"><br /><br /><br />(this space intentionally left almost blank)</td></tr><tr><td class="docs"><div class="toc"><a name="toc"><h3>namespaces</h3></a><ul><li><a href="#protobuf.util">protobuf.util</a></li><li><a href="#protobuf.impl.flatland.schema">protobuf.impl.flatland.schema</a></li><li><a href="#protobuf.impl.flatland.codec">protobuf.impl.flatland.codec</a></li><li><a href="#protobuf.impl.flatland.core">protobuf.impl.flatland.core</a></li><li><a href="#protobuf.impl.flatland.map">protobuf.impl.flatland.map</a></li><li><a href="#protobuf.impl.flatland.mapdef">protobuf.impl.flatland.mapdef</a></li><li><a href="#protobuf.core">protobuf.core</a></li><li><a href="#protobuf.common">protobuf.common</a></li></ul></div></td><td class="codes">&nbsp;</td></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.util" name="protobuf.util"><h1 class="project-name">protobuf.util</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.util
   (:import
     (clojure.lang IDeref
@@ -3201,6 +3201,9 @@
     [protobuf.common :as common]
     [protobuf.impl.flatland.map :as protobuf-map]
     [protobuf.impl.flatland.mapdef :as protobuf])
+  (:import
+    (com.google.protobuf.CodedInputStream)
+    (java.io.InputStream))
   (:gen-class
     :name protobuf.impl.flatland.core.FlatlandProtoBuf
     :implements [clojure.lang.Associative
@@ -3210,18 +3213,29 @@
                  clojure.lang.Seqable
                  java.lang.Iterable]
     :init init
-    :constructors {[java.lang.Class
-                    clojure.lang.APersistentMap]
-                   []}
+    :constructors {[java.lang.Class clojure.lang.APersistentMap] []
+                   [java.lang.Class &quot;[B&quot;] []
+                   [java.lang.Class com.google.protobuf.CodedInputStream] []
+                   [java.lang.Class java.io.InputStream] []}
     :methods [^:static [schema [Object] Object]]
     :state contents
     :main false))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn- get-instance
+  [wrapper data]
+  (if (map? data)
+    (protobuf/create wrapper data)
+    (protobuf/parse wrapper data)))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defn- wrap-all
+  [protobuf-class java-wrapper instance]
+  {:instance instance
+   :java-wrapper java-wrapper
+   :protobuf-class protobuf-class})</pre></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(defn -init
   [protobuf-class data]
   (let [wrapper (protobuf/mapdef protobuf-class)]
-    [[] {:instance (protobuf/create wrapper data)
-         :java-wrapper wrapper
-         :protobuf-class protobuf-class}]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
+    [[] (wrap-all protobuf-class
+                  wrapper
+                  (get-instance wrapper data))]))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.Associative   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
 </td><td class="codes"></td></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(def -containsKey (:containsKey common/associative-behaviour))
 (def -entryAt (:entryAt common/associative-behaviour))</pre></td></tr><tr><td class="docs"><p>  clojure.lang.ILookup   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
@@ -3352,7 +3366,10 @@
   [^PersistentProtocolBufferMap$Def map-def stream]
   (when stream
     (let [^CodedInputStream in (CodedInputStream/newInstance stream)]
-      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
+      (PersistentProtocolBufferMap/parseFrom map-def in))))</pre></td></tr><tr><td class="docs">
+</td><td class="codes"><pre class="brush: clojure">(defmethod parse CodedInputStream
+  [^PersistentProtocolBufferMap$Def map-def ^CodedInputStream stream]
+  (PersistentProtocolBufferMap/parseFrom map-def stream))</pre></td></tr><tr><td class="docs"><p>Return the byte representation of the given protobuf.</p>
 </td><td class="codes"><pre class="brush: clojure">(defn ^&quot;[B&quot; -&gt;bytes
   [^PersistentProtocolBufferMap$Def map-def m]
   (protobuf-map/-&gt;bytes (PersistentProtocolBufferMap/construct map-def m)))</pre></td></tr><tr><td class="docs"><p>Lazily read a sequence of length-delimited protobufs of the specified map-def
@@ -3415,7 +3432,9 @@
   ([protobuf-class]
     (create protobuf-class {}))
   ([protobuf-class data]
-    (case (get-impl)
+    (create (get-impl) protobuf-class data))
+  ([impl-key protobuf-class data]
+    (case impl-key
       :flatland (new FlatlandProtoBuf protobuf-class data))))</pre></td></tr><tr><td class="spacer docs">&nbsp;</td><td class="codes" /></tr><tr><td class="docs"><div class="docs-header"><a class="anchor" href="#protobuf.common" name="protobuf.common"><h1 class="project-name">protobuf.common</h1><a class="toc-link" href="#toc">toc</a></a></div></td><td class="codes" /></tr><tr><td class="docs">
 </td><td class="codes"><pre class="brush: clojure">(ns protobuf.common)</pre></td></tr><tr><td class="docs"><p>  Utility Functions   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;</p>
 </td><td class="codes"></td></tr><tr><td class="docs">
diff --git a/docs/current/protobuf.core.html b/docs/current/protobuf.core.html
index 3a9ea55..b51bf03 100644
--- a/docs/current/protobuf.core.html
+++ b/docs/current/protobuf.core.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html PUBLIC ""
     "">
-<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
+<html><head><meta charset="UTF-8" /><title>protobuf.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="highlight/atom-one-dark.css" /><script type="text/javascript" src="highlight/highlight.pack.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a> with the <a href="https://github.com/clojang/codox-theme">Clojang UI</a> theme</h2><h1><a href="index.html"><span class="project-title"><span class="project-name">protobuf</span> <span class="project-version">3.6.0-v1.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="1000-basic-usage.html"><div class="inner"><span>Basic Usage</span></div></a></li><li class="depth-1 "><a href="1050-tutorial.html"><div class="inner"><span>Tutorial: Protocol Buffer Basics</span></div></a></li><li class="depth-1 "><a href="1100-extensions.html"><div class="inner"><span>Extensions</span></div></a></li><li class="depth-1 "><a href="9800-marginalia.html"><div class="inner"><span>Marginalia</span></div></a></li><li class="depth-1 "><a href="9900-javadoc.html"><div class="inner"><span>javadoc</span></div></a></li><li class="depth-1 "><a href="9999-other-versions.html"><div class="inner"><span>Other Versions</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>protobuf</span></div></div></li><li class="depth-2 branch"><a href="protobuf.common.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>common</span></div></a></li><li class="depth-2 branch current"><a href="protobuf.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>impl</span></div></div></li><li class="depth-3"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>flatland</span></div></div></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.codec.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>codec</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.map.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>map</span></div></a></li><li class="depth-4 branch"><a href="protobuf.impl.flatland.mapdef.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>mapdef</span></div></a></li><li class="depth-4"><a href="protobuf.impl.flatland.schema.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>schema</span></div></a></li><li class="depth-2"><a href="protobuf.util.html"><div class="inner"><span class="tree" style="top: -207px;"><span class="top" style="height: 216px;"></span><span class="bottom"></span></span><span>util</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="protobuf.core.html#var-create"><div class="inner"><span>create</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-default-impl-name"><div class="inner"><span>default-impl-name</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-get-impl"><div class="inner"><span>get-impl</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-ProtoBufAPI"><div class="inner"><span>ProtoBufAPI</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Ebytes"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;bytes</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var--.3Eschema"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>-&gt;schema</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-bytes-.3E"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>bytes-&gt;</span></div></a></li><li class="depth-2 branch"><a href="protobuf.core.html#var-read"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>read</span></div></a></li><li class="depth-2"><a href="protobuf.core.html#var-write"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>write</span></div></a></li><li class="depth-1"><a href="protobuf.core.html#var-schema"><div class="inner"><span>schema</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">protobuf.core</h1><div class="doc"><div class="markdown"><p>This is the public API for working with protocol buffers.</p></div></div><div class="public anchor" id="var-create"><h3>create</h3><div class="usage"><code>(create protobuf-class)</code><code>(create protobuf-class data)</code><code>(create impl-key protobuf-class data)</code></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-default-impl-name"><h3>default-impl-name</h3><div class="usage"></div><div class="doc"><div class="markdown"><p>Documentation forthcoming</p></div></div></div><div class="public anchor" id="var-get-impl"><h3>get-impl</h3><div class="usage"><code>(get-impl)</code></div><div class="doc"><div class="markdown"><p>Get the currently configured protobuf implementation. If not defined, used the hard-coded default value (see <code>default-impl-name</code>).</p>
 <p>Note that the protobuf backend implementation is configured using JVM system properties (i.e., the <code>-D</code> option). Projects that use <code>lein</code> may set this with <code>:jvm-opts</code> (e.g, <code>:jvm-opts ["-Dprotobuf.impl=flatland"]</code>).</p></div></div></div><div class="public anchor" id="var-ProtoBufAPI"><h3>ProtoBufAPI</h3><h4 class="type">protocol</h4><div class="usage"></div><div class="doc"><div class="markdown"></div></div><div class="members"><h4>members</h4><div class="inner"><div class="public anchor" id="var--.3Ebytes"><h3>-&gt;bytes</h3><div class="usage"><code>(-&gt;bytes this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var--.3Eschema"><h3>-&gt;schema</h3><div class="usage"><code>(-&gt;schema this)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-bytes-.3E"><h3>bytes-&gt;</h3><div class="usage"><code>(bytes-&gt; this bytes)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-read"><h3>read</h3><div class="usage"><code>(read this in)</code></div><div class="doc"><div class="markdown"></div></div></div><div class="public anchor" id="var-write"><h3>write</h3><div class="usage"><code>(write this out)</code></div><div class="doc"><div class="markdown"></div></div></div></div></div></div><div class="public anchor" id="var-schema"><h3>schema</h3><div class="usage"><code>(schema protobuf-class)</code></div><div class="doc"><div class="markdown"><p>This function is designed to be called against compiled Java protocol buffer classes. To get the schema of a Clojure protobuf instance, you’ll want to use the <code>-&gt;schema</code> method.</p></div></div></div></div></body></html>
\ No newline at end of file

From e8df45c2e24e746de1a40d54f4d2c0422c03e457 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 18:27:20 -0500
Subject: [PATCH 519/525] Fixed typo.

---
 resources/docs/1000-basic-usage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/docs/1000-basic-usage.md b/resources/docs/1000-basic-usage.md
index 18fc581..ed0a17f 100644
--- a/resources/docs/1000-basic-usage.md
+++ b/resources/docs/1000-basic-usage.md
@@ -90,5 +90,5 @@ protobuf also supports passing the following to the `create` function:
 * A `java.io.InputStream`
 * A `com.google.protobuf.CodedInputStream`
 
-Just as with the creating one with a map, a protobuf class is expected as
+Just as with creating one with a map, a protobuf class is expected as
 the first parameter.

From 9371ea22d39458a32aaf44117d9ee4984aecbca7 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 18:27:38 -0500
Subject: [PATCH 520/525] Deprecated unused function.

---
 src/clj/protobuf/impl/flatland/codec.clj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/clj/protobuf/impl/flatland/codec.clj b/src/clj/protobuf/impl/flatland/codec.clj
index 18d9241..c910da9 100644
--- a/src/clj/protobuf/impl/flatland/codec.clj
+++ b/src/clj/protobuf/impl/flatland/codec.clj
@@ -72,7 +72,9 @@
   decode #'gloss-io/decode)
 
 ;; XXX what is this used for? Delete, if not used; add docstring if it is
-(defn codec-schema
+(defn ^{:doc "Unused function."
+        :deprecated "3.6.0-v1.2"}
+  codec-schema
   [proto]
   (util/dissoc-fields (protobuf/mapdef->schema proto)
                       len-key

From 5255f98ce58fcd79c4f5f30be4a3c8930ac353dd Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 23:22:22 -0500
Subject: [PATCH 521/525] Added proto3 examples.

---
 resources/protobuf/examples/photo3.proto    | 41 +++++++++++++++++++++
 resources/protobuf/examples/tutorial3.proto | 35 ++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 resources/protobuf/examples/photo3.proto
 create mode 100644 resources/protobuf/examples/tutorial3.proto

diff --git a/resources/protobuf/examples/photo3.proto b/resources/protobuf/examples/photo3.proto
new file mode 100644
index 0000000..d95d28f
--- /dev/null
+++ b/resources/protobuf/examples/photo3.proto
@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+package protobuf.examples.photo3;
+
+import "protobuf/extensions.proto";
+
+option java_outer_classname = "Example3";
+
+message Photo {
+  int32  id     = 1;
+  string path   = 2;
+  repeated Label  labels = 3 [(set)    = true];
+  repeated Attr   attrs  = 4 [(map)    = true];
+  repeated Tag    tags   = 5 [(map_by) = "person_id"];
+  bytes  image  = 6;
+  Type   type   = 7;
+
+  enum Type {
+    JPEG = 0;
+    PNG = 1;
+    GIF = 2;
+  }
+
+  message Label {
+    string item   = 1;
+    bool   exists = 2;
+  }
+
+  message Attr {
+    string key = 1;
+    string val = 2;
+  }
+
+  message Tag {
+    int32 person_id = 1;
+    int32 x_coord   = 2 [(meta) = "{:max 100.0 :min -100.0}"];
+    int32 y_coord   = 3;
+    int32 width     = 4;
+    int32 height    = 5;
+  }
+}
diff --git a/resources/protobuf/examples/tutorial3.proto b/resources/protobuf/examples/tutorial3.proto
new file mode 100644
index 0000000..dc9f489
--- /dev/null
+++ b/resources/protobuf/examples/tutorial3.proto
@@ -0,0 +1,35 @@
+syntax = "proto3";
+
+package tutorial3;
+
+import "google/protobuf/timestamp.proto";
+
+option java_package = "protobuf.examples.tutorial3";
+option java_outer_classname = "AddressBookProtos";
+
+option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
+
+message Person {
+  string name = 1;
+  int32 id = 2;  // Unique ID number for this person.
+  string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    string number = 1;
+    PhoneType type = 2;
+  }
+
+  repeated PhoneNumber phones = 4;
+
+  google.protobuf.Timestamp last_updated = 5;
+}
+
+message AddressBook {
+  repeated Person people = 1;
+}

From fd51a4863c1736400737e5a67f3ee53d52b4e83e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Fri, 13 Jul 2018 01:33:26 -0500
Subject: [PATCH 522/525] Added support for checking message syntax.

---
 src/clj/protobuf/common.clj                   |  5 ++++
 src/clj/protobuf/core.clj                     | 11 ++++++++
 src/clj/protobuf/impl/flatland/core.clj       |  5 +++-
 src/clj/protobuf/impl/flatland/mapdef.clj     |  6 ++++-
 src/clj/protobuf/syntax.clj                   | 22 +++++++++++++++
 .../protobuf/PersistentProtocolBufferMap.java | 26 +++++++++++++-----
 test/protobuf/core_test.clj                   | 27 ++++++++++++++-----
 test/protobuf/syntax_test.clj                 | 20 ++++++++++++++
 8 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 src/clj/protobuf/syntax.clj
 create mode 100644 test/protobuf/syntax_test.clj

diff --git a/src/clj/protobuf/common.clj b/src/clj/protobuf/common.clj
index 689e934..d19efd8 100644
--- a/src/clj/protobuf/common.clj
+++ b/src/clj/protobuf/common.clj
@@ -20,6 +20,11 @@
 ;;;   Behaviours   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(def common-behaviour
+  {:get-class get-class
+   :get-instance get-instance
+   :get-wrapper get-wrapper})
+
 (def associative-behaviour
   {:containsKey (fn [this data] (.containsKey (get-instance this) data))
    :entryAt (fn [this data] (.entryAt (get-instance this) data))})
diff --git a/src/clj/protobuf/core.clj b/src/clj/protobuf/core.clj
index 80b55c5..4348da9 100644
--- a/src/clj/protobuf/core.clj
+++ b/src/clj/protobuf/core.clj
@@ -1,18 +1,29 @@
 (ns protobuf.core
   "This is the public API for working with protocol buffers."
   (:require
+    [protobuf.common :as common]
     [protobuf.impl.flatland.core :as flatland])
   (:import
     (protobuf.impl.flatland.core FlatlandProtoBuf))
   (:refer-clojure :exclude [map? read]))
 
+(defprotocol ProtoBufCommonAPI
+  (get-class [this])
+  (get-instance [this])
+  (get-wrapper [this]))
+
 (defprotocol ProtoBufAPI
   (->bytes [this])
   (->schema [this])
   (bytes-> [this bytes])
+  (syntax [this])
   (read [this in])
   (write [this out]))
 
+(extend FlatlandProtoBuf
+        ProtoBufCommonAPI
+        common/common-behaviour)
+
 (extend FlatlandProtoBuf
         ProtoBufAPI
         flatland/behaviour)
diff --git a/src/clj/protobuf/impl/flatland/core.clj b/src/clj/protobuf/impl/flatland/core.clj
index 24c5115..60dee20 100644
--- a/src/clj/protobuf/impl/flatland/core.clj
+++ b/src/clj/protobuf/impl/flatland/core.clj
@@ -10,7 +10,8 @@
   (:require
     [protobuf.common :as common]
     [protobuf.impl.flatland.map :as protobuf-map]
-    [protobuf.impl.flatland.mapdef :as protobuf])
+    [protobuf.impl.flatland.mapdef :as protobuf]
+    [protobuf.syntax :as syntax])
   (:import
     (com.google.protobuf.CodedInputStream)
     (java.io.InputStream))
@@ -128,6 +129,8 @@
              (new protobuf.impl.flatland.core.FlatlandProtoBuf
                (common/get-class this)
                (protobuf/parse (common/get-wrapper this) bytes)))
+   :syntax (fn [this]
+             (syntax/format (.getSyntax (.file (common/get-wrapper this)))))
    :read (fn [this in]
           (new protobuf.impl.flatland.core.FlatlandProtoBuf
             (common/get-class this)
diff --git a/src/clj/protobuf/impl/flatland/mapdef.clj b/src/clj/protobuf/impl/flatland/mapdef.clj
index eb06432..d77bf5a 100644
--- a/src/clj/protobuf/impl/flatland/mapdef.clj
+++ b/src/clj/protobuf/impl/flatland/mapdef.clj
@@ -37,7 +37,7 @@
              (if (instance? Descriptors$Descriptor map-def)
                map-def
                (Reflector/invokeStaticMethod ^Class map-def "getDescriptor" (to-array nil)))]
-         (PersistentProtocolBufferMap$Def/create descriptor naming-strategy size-limit)))))
+         (PersistentProtocolBufferMap$Def/create descriptor (.getFile descriptor) naming-strategy size-limit)))))
 
 (defn create
   "Construct a protobuf of the given map-def."
@@ -106,6 +106,10 @@
        (.writeDelimitedTo p out))
      (.flush out))))
 
+(defn syntax
+  [^PersistentProtocolBufferMap$Def map-def]
+  (.getSyntax (.file map-def)))
+
 (extend-protocol util/Combiner
   PersistentProtocolBufferMap
   (combine-onto [^PersistentProtocolBufferMap this other]
diff --git a/src/clj/protobuf/syntax.clj b/src/clj/protobuf/syntax.clj
new file mode 100644
index 0000000..3120015
--- /dev/null
+++ b/src/clj/protobuf/syntax.clj
@@ -0,0 +1,22 @@
+(ns protobuf.syntax
+  (:require
+    [clojure.string :as string]
+    [protobuf.common :as common])
+  (:import
+    (clojure.lang Keyword)
+    (com.google.protobuf Descriptors$FileDescriptor
+                         Descriptors$FileDescriptor$Syntax)))
+
+(defn lookup
+  [^Keyword syntax]
+  (-> syntax
+      name
+      string/upper-case
+      Descriptors$FileDescriptor$Syntax/valueOf))
+
+(defn format
+  [^Descriptors$FileDescriptor$Syntax syntax]
+  (-> syntax
+      str
+      string/lower-case
+      keyword))
diff --git a/src/java/protobuf/PersistentProtocolBufferMap.java b/src/java/protobuf/PersistentProtocolBufferMap.java
index eef2669..39c7cad 100644
--- a/src/java/protobuf/PersistentProtocolBufferMap.java
+++ b/src/java/protobuf/PersistentProtocolBufferMap.java
@@ -158,6 +158,7 @@ public String toString() {
     };
 
     public final Descriptors.Descriptor type;
+    public final Descriptors.FileDescriptor file;
     public final NamingStrategy namingStrategy;
     public final int sizeLimit;
 
@@ -167,10 +168,13 @@ public String toString() {
 
     private static final class DefOptions {
       public final Descriptors.Descriptor type;
+      public final Descriptors.FileDescriptor file;
       public final NamingStrategy strat;
       public final int sizeLimit;
-      public DefOptions(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
+      public DefOptions(Descriptors.Descriptor type, Descriptors.FileDescriptor file,
+      	                NamingStrategy strat, int sizeLimit) {
         this.type = type;
+        this.file = file;
         this.strat = strat;
         this.sizeLimit = sizeLimit;
       }
@@ -179,29 +183,35 @@ public boolean equals(Object other) {
         if (this.getClass() != other.getClass())
           return false;
         DefOptions od = (DefOptions)other;
-        return type.equals(od.type) && strat.equals(od.strat) && sizeLimit == od.sizeLimit;
+        return type.equals(od.type) &&
+               file.equals(od.file) &&
+               strat.equals(od.strat) &&
+               sizeLimit == od.sizeLimit;
       }
 
       public int hashCode() {
-        return type.hashCode() + strat.hashCode() + sizeLimit;
+        return type.hashCode() + file.hashCode() + strat.hashCode() + sizeLimit;
       }
     }
 
     static ConcurrentHashMap<DefOptions, Def> defCache = new ConcurrentHashMap<DefOptions, Def>();
 
-    public static Def create(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
-      DefOptions opts = new DefOptions(type, strat, sizeLimit);
+    public static Def create(Descriptors.Descriptor type, Descriptors.FileDescriptor file,
+    	                     NamingStrategy strat, int sizeLimit) {
+      DefOptions opts = new DefOptions(type, file, strat, sizeLimit);
 
       Def def = defCache.get(type);
       if (def == null) {
-        def = new Def(type, strat, sizeLimit);
+        def = new Def(type, file, strat, sizeLimit);
         defCache.putIfAbsent(opts, def);
       }
       return def;
     }
 
-    protected Def(Descriptors.Descriptor type, NamingStrategy strat, int sizeLimit) {
+    protected Def(Descriptors.Descriptor type, Descriptors.FileDescriptor file,
+    	          NamingStrategy strat, int sizeLimit) {
       this.type = type;
+      this.file = file;
       this.key_to_field = new ConcurrentHashMap<Object, Object>();
       this.namingStrategy = strat;
       this.sizeLimit = sizeLimit;
@@ -533,6 +543,7 @@ protected Object fromProtoValue(Descriptors.FieldDescriptor field, Object value,
           }
         case MESSAGE:
           Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
+          	                                                    field.getFile(),
                                                                 this.def.namingStrategy,
                                                                 this.def.sizeLimit);
           DynamicMessage message = (DynamicMessage)value;
@@ -594,6 +605,7 @@ protected Object toProtoValue(Descriptors.FieldDescriptor field, Object value) {
           protobuf = (PersistentProtocolBufferMap)value;
         } else {
           Def fieldDef = PersistentProtocolBufferMap.Def.create(field.getMessageType(),
+                                                                field.getFile(),
                                                                 this.def.namingStrategy,
                                                                 this.def.sizeLimit);
           protobuf = PersistentProtocolBufferMap.construct(fieldDef, value);
diff --git a/test/protobuf/core_test.clj b/test/protobuf/core_test.clj
index d1e2a5a..662533b 100644
--- a/test/protobuf/core_test.clj
+++ b/test/protobuf/core_test.clj
@@ -5,17 +5,19 @@
   (:import
     (com.google.protobuf CodedInputStream)
     (java.io ByteArrayInputStream)
+    (protobuf.examples.photo3 Example3$Photo)
     (protobuf.examples.tutorial AddressBookProtos$Person$PhoneNumber)))
 
+(def sample-data {:number "555-1212" :type :home})
+
 (deftest create-flatland
-  (let [data {:number "555-1212" :type :home}
-        sample-phone-number (protobuf/create :flatland
+  (let [sample-phone-number (protobuf/create :flatland
                              AddressBookProtos$Person$PhoneNumber
-                             data)]
+                             sample-data)]
     (testing "map-based constructor ..."
       (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
              (type sample-phone-number)))
-      (is (= data
+      (is (= sample-data
              (into {} sample-phone-number))))
     (testing "bytes-based constructor ..."
       (let [from-bytes (protobuf/create :flatland
@@ -23,7 +25,7 @@
                         (protobuf/->bytes sample-phone-number))]
         (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
                (type from-bytes)))
-        (is (= data
+        (is (= sample-data
                (into {} from-bytes)))))
     (testing "Google CodedInputStream-based constructor ..."
       (let [from-stream (protobuf/create :flatland
@@ -32,7 +34,7 @@
                          (protobuf/->bytes sample-phone-number)))]
         (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
                (type from-stream)))
-        (is (= data
+        (is (= sample-data
                (into {} from-stream)))))
     (testing "Java InputStream-based constructor ..."
       (let [from-stream (protobuf/create :flatland
@@ -41,5 +43,16 @@
                               (protobuf/->bytes sample-phone-number)))]
         (is (= protobuf.impl.flatland.core.FlatlandProtoBuf
                (type from-stream)))
-        (is (= data
+        (is (= sample-data
                (into {} from-stream)))))))
+
+(deftest syntax
+  (is (= :proto2
+         (protobuf/syntax
+          (protobuf/create :flatland
+           AddressBookProtos$Person$PhoneNumber
+           sample-data))))
+  (is (= :proto3
+         (protobuf/syntax
+          (protobuf/create :flatland
+           Example3$Photo {})))))
diff --git a/test/protobuf/syntax_test.clj b/test/protobuf/syntax_test.clj
new file mode 100644
index 0000000..1ac0c1d
--- /dev/null
+++ b/test/protobuf/syntax_test.clj
@@ -0,0 +1,20 @@
+(ns protobuf.syntax-test
+  (:require
+    [clojure.test :refer :all]
+    [protobuf.syntax :as syntax])
+  (:import
+    (com.google.protobuf Descriptors$FileDescriptor$Syntax)))
+
+(deftest lookup
+  (let [result (syntax/lookup :proto2)]
+    (is (= com.google.protobuf.Descriptors$FileDescriptor$Syntax
+           (type result)))
+    (is (= "PROTO2" (str result))))
+  (let [result (syntax/lookup :proto3)]
+    (is (= com.google.protobuf.Descriptors$FileDescriptor$Syntax
+           (type result)))
+    (is (= "PROTO3" (str result))))
+  (let [result (syntax/lookup :unknown)]
+    (is (= com.google.protobuf.Descriptors$FileDescriptor$Syntax
+           (type result)))
+    (is (= "UNKNOWN" (str result)))))

From 904e878024d08c3c141f5ada1131c4ed8291250e Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Thu, 12 Jul 2018 23:22:22 -0500
Subject: [PATCH 523/525] Added proto3 example.


From 7b0fb5d71372b2d15ebc17d15b54a2200fc43385 Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Fri, 13 Jul 2018 01:49:06 -0500
Subject: [PATCH 524/525] Adding support for proto3 to Travis.

---
 .travis.yml | 14 +++++++++-----
 project.clj | 12 ++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7580c29..9b341c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
 language: clojure
 sudo: false
-addons:
-  apt:
-    packages:
-      - protobuf-compiler
-      - libprotoc-dev
+before_install:
+  - export PATH=$HOME/protobuf/bin:$PATH
+  - export C_INCLUDE_PATH=$C_INCLUDE_PATH:$HOME/protobuf/include
+  - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$HOME/protobuf/include
+install:
+  - mkdir -p $HOME/protobuf && pushd $HOME/protobuf &&
+    curl -LO 'https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip' &&
+    unzip protoc-3.6.0-linux-x86_64.zip &&
+    popd
 script: lein build-test
 jdk:
   - oraclejdk8
diff --git a/project.clj b/project.clj
index b512fcc..cc53c8f 100644
--- a/project.clj
+++ b/project.clj
@@ -51,9 +51,9 @@
         :themes [:clojang]
         :doc-paths ["resources/docs"]
         :output-path "docs/current"}}
-    :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
-    :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
-    :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+    ; :1.5 {:dependencies [[org.clojure/clojure "1.5.0"]]}
+    ; :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+    ; :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
     :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
     :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}}
   :aliases {
@@ -126,7 +126,7 @@
       ["clean"] ["protoc-all"] ["ltest"]]
     "test-old-clojure" [
       "with-profile"
-      "+test,+1.5:+test,+1.6:+test,+1.7"
+      "+test,+1.7"
       "test"]
     "test-new-clojure" [
       "with-profile"
@@ -136,7 +136,7 @@
       "do"
       ["clean"]
       ["protoc-all"]
-      ["test-old-clojure"]
+      ; ["test-old-clojure"]
       ["clean"]
       ["protoc-all"]
       ["test-new-clojure"]]
@@ -156,5 +156,5 @@
       ["ubercompile"]
       ["clean"]
       ["protoc-all"]
-      ["test-all"]
+      ["test-new-clojure"]
       ["lint"]]})

From a8f90be8e9979e79aeb9633911212885d979780b Mon Sep 17 00:00:00 2001
From: Duncan McGreggor <oubiwann@gmail.com>
Date: Fri, 13 Jul 2018 11:02:02 -0500
Subject: [PATCH 525/525] Updated README, including adding a donation section.

---
 README.md | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 593cb03..fe42b9c 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,24 @@
 
 [![][logo]][logo-large]
 
+**Contents**
+
+* About
+* Getting Started
+* Usage
+* Documentation
+* Release Notes
+* Donating
+
+## Aboout
+
 This project provides a Clojure interface to Google's
 [protocol buffers](http://code.google.com/p/protobuf). Protocol buffers can be
 used to communicate with other languages over the network, and they are WAY
 faster to serialize and deserialize than standard Clojure objects.
 
 
-## Getting started
+## Getting Started
 
 Add the dependency to your `project.clj`:
 
@@ -117,10 +128,7 @@ previous reference documentation, visit the
 * Documentation for the two Java classes (see the "javadoc" link there)
 
 
-## Versions
-
-(AKA "mini" ChangeLog)
-
+## Release Notes
 
 | Version             | Notes
 |---------------------|------------------------------------------------------
@@ -137,6 +145,18 @@ given the version "3.4.0-2-SNAPSHOT", tracking the Protocol Buffer release of
 3.4.0. We created a branch and tag for that release with no changes other than
 the org/artifact id.
 
+
+## Donating
+
+At the [request of a user][donation-request], a donation account for project
+development has been set up on Liberapay here:
+
+* [https://liberapay.com/clojusc-protobuf/donate](https://liberapay.com/clojusc-protobuf/donate)
+
+You can learn more about Liberapay on its [Wikipedia entry][libera-wiki] or on the
+service's ["About" page][libera-about].
+
+
 <!-- Named page links below: /-->
 
 [travis]: https://travis-ci.org/clojusc/protobuf
@@ -151,3 +171,6 @@ the org/artifact id.
 [clojars]: https://clojars.org/clojusc/protobuf
 [clojars-badge]: https://img.shields.io/clojars/v/clojusc/protobuf.svg
 [docs]: https://clojusc.github.io/protobuf
+[donation-request]: https://github.com/clojusc/protobuf/issues/29
+[libera-wiki]: https://en.wikipedia.org/wiki/Liberapay
+[libera-about]: https://liberapay.com/about/