Add maki2 icon pack

gradle.properties

@@ -24,6 +24,7 @@ hawconsVersion        = 1.0
 ioniconsVersion       = 2.0.1
 icomoonVersion        = 0.0
 makiVersion           = 0.5.0
+maki2Version          = 2.0.2
 materialVersion       = 2.2.0
 materialdesignVersion = 1.4.57
 metrizeiconsVersion   = 0.0

settings.gradle

@@ -12,6 +12,7 @@ include 'subprojects/ikonli-hawconsstroke-pack'
 include 'subprojects/ikonli-icomoon-pack'
 include 'subprojects/ikonli-ionicons-pack'
 include 'subprojects/ikonli-maki-pack'
+include 'subprojects/ikonli-maki2-pack'
 include 'subprojects/ikonli-material-pack'
 include 'subprojects/ikonli-materialdesign-pack'
 include 'subprojects/ikonli-metrizeicons-pack'

subprojects/guide/guide.gradle

@@ -29,6 +29,7 @@ ext.childProjects = [
     ':ikonli-icomoon-pack',
     ':ikonli-ionicons-pack',
     ':ikonli-maki-pack',
+    ':ikonli-maki2-pack',
     ':ikonli-material-pack',
     ':ikonli-materialdesign-pack',
     ':ikonli-metrizeicons-pack',
@@ -203,6 +204,7 @@ asciidoctor {
               createIconGenerationTask(packName: 'icomoon',        iconClassName: 'org.kordamp.ikonli.icomoon.Icomoon',               iconName: 'icm',     shortNameSize: 4),
               createIconGenerationTask(packName: 'ionicons',       iconClassName: 'org.kordamp.ikonli.ionicons.Ionicons',             iconName: 'ion',     shortNameSize: 4),
               createIconGenerationTask(packName: 'maki',           iconClassName: 'org.kordamp.ikonli.maki.Maki',                     shortNameSize: 5),
+              createIconGenerationTask(packName: 'maki2',          iconClassName: 'org.kordamp.ikonli.maki2.Maki2',                   shortNameSize: 6),
               createIconGenerationTask(packName: 'material',       iconClassName: 'org.kordamp.ikonli.material.Material',             iconName: 'gmi',     shortNameSize: 4),
               createIconGenerationTask(packName: 'materialdesign', iconClassName: 'org.kordamp.ikonli.materialdesign.MaterialDesign', iconName: 'mdi',     shortNameSize: 4),
               createIconGenerationTask(packName: 'metrizeicons',   iconClassName: 'org.kordamp.ikonli.metrizeicons.MetrizeIcons',     iconName: 'met',     shortNameSize: 4),
@@ -242,6 +244,7 @@ asciidoctor {
         hawconsVersion         : project.hawconsVersion,
         ioniconsVersion        : project.ioniconsVersion,
         makiVersion            : project.makiVersion,
+        maki2Version           : project.maki2Version,
         materialVersion        : project.materialVersion,
         materialdesignVersion  : project.materialdesignVersion,
         metrizeiconsVersion    : project.metrizeiconsVersion,
@@ -267,6 +270,7 @@ asciidoctor {
         from project(':ikonli-icomoon-pack').file("src/main/resources/META-INF/resources/icomoon/${icomoonVersion}")
         from project(':ikonli-ionicons-pack').file("src/main/resources/META-INF/resources/ionicons/${ioniconsVersion}")
         from project(':ikonli-maki-pack').file("src/main/resources/META-INF/resources/maki/${makiVersion}")
+        from project(':ikonli-maki2-pack').file("src/main/resources/META-INF/resources/maki2/${maki2Version}")
         from project(':ikonli-material-pack').file("src/main/resources/META-INF/resources/material/${materialVersion}")
         from project(':ikonli-materialdesign-pack').file("src/main/resources/META-INF/resources/materialdesignicons/${materialdesignVersion}")
         from project(':ikonli-metrizeicons-pack').file("src/main/resources/META-INF/resources/metrizeicons/${metrizeiconsVersion}")

subprojects/guide/src/asciidoc/cheat-sheet-maki2.adoc

@@ -0,0 +1,13 @@
+= Maki2
+
+++++
+<link href='./css/maki2.css' rel='stylesheet'>
+<style>
+    .maki2 {
+        font-size: 32px;
+    }
+</style>
+++++
+
+include::{projectDir}/build/tmp/_maki2_cheat_sheet.adoc[]
+

subprojects/guide/src/asciidoc/icon-packs.adoc

@@ -277,6 +277,31 @@ compile '{project-group}:ikonli-maki-pack:{project-version}'
 </dependency>
 ----
 
+== Maki2
+ * Font version: {maki2Version}
+ * link:https://github.com/mapbox/maki[]
+ * link:cheat-sheet-maki2.html[Cheat-Sheet]
+
+=== Installing
+
+[source,groovy]
+[subs="attributes"]
+.gradle
+----
+compile '{project-group}:ikonli-maki2-pack:{project-version}'
+----
+
+[source,xml]
+[subs="attributes,verbatim"]
+.maven
+----
+<dependency>
+    <groupId>{project-group}</groupId>
+    <artifactId>ikonli-maki2-pack</artifactId>
+    <version>{project-version}</version>
+</dependency>
+----
+
 == Material Icons
  * Font version: {materialVersion}
  * link:https://design.google.com/icons/[]

subprojects/ikonli-maki-pack/src/main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java

@@ -42,6 +42,6 @@ public String getFontResourcePath() {
 
     @Override
     public String getFontFamily() {
-        return "Font Awesome";
+        return "Maki";
     }
 }

subprojects/ikonli-maki-pack/src/main/resources/META-INF/resources/maki/0.5.0/css/maki.css

@@ -1,5 +1,5 @@
 @font-face {
-    font-family: 'maki';
+    font-family: 'Maki';
     src: url('../fonts/maki.eot?56675205');
     src: url('../fonts/maki.eot?56675205#iefix') format('embedded-opentype'),
     url('../fonts/maki.woff?56675205') format('woff'),
@@ -10,7 +10,7 @@
 }
 
 .maki {
-    font-family: "maki";
+    font-family: "Maki";
     font-style: normal;
     font-weight: normal;
     speak: none;

subprojects/ikonli-maki2-pack/ikonli-maki2-pack.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile project(':ikonli-core')
+    compileOnly "org.kordamp.jipsy:jipsy:${jipsyVersion}"
+}