修复了一些问题，将项目发布到了jcenter

zzhoujay · zzhoujay · commit d449581b1719 · 2016-07-23T21:39:27.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -4,13 +4,58 @@
 
 Markdown文本直接转换成Spanned，直接设置给TextView即可完成显示
 
+遵循Github Flavored Markdown标准
+
 ### 效果展示
 
 ![效果图](image/img1.jpg)
 
+### 使用
+
+```
+Markdown.fromMarkdown(text,imageGetter,textView);
+```
+
+**注意：** 此方法需要在textView的Measure完成后调用，因为需要获取textView的宽高
+
+例子：
+```
+textView.post(new Runnable() {
+     @Override
+     public void run() {
+     Spanned spanned = MarkDown.fromMarkdown(stream, new Html.ImageGetter() {
+           @Override
+           public Drawable getDrawable(String source) {
+                 Drawable drawable = getResources().getDrawable(R.mipmap.ic_launcher);
+                 drawable.setBounds(0, 0, 400, 400);
+                 return drawable;
+           }
+     }, textView);
+     textView.setText(spanned);
+}
+```
+
+### Use in Gradle
+
+`compile 'com.zzhoujay.markdown:markdown:0.0.1'`
+
+**注意：** 当前并非稳定版，仅供尝鲜使用
+
 ### 项目进度
 
 * 已完成大部分功能开发
 * 一些细节优化和接口待开发
 
+### 已知问题
+
+* 引用块内不支持Setext-style的标题（后续会想办法修复）
+* 不支持表格
+
+
+### 后续计划
+
+* 修复完善当前版本
+* 整合进 [RichText](https://github.com/zzhoujay/RichText)
+* 修复一些已知问题
+
 _by zzhoujay_
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,5 +23,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.4.0'
-    compile project(':markdown')
+//    compile project(':markdown')
+    compile 'com.zzhoujay.markdown:markdown:0.0.2'
 }
diff --git a/app/src/main/java/com/zzhoujay/markdowndemo/MainActivity.java b/app/src/main/java/com/zzhoujay/markdowndemo/MainActivity.java
@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
 //        });
 
 
-        final InputStream stream = getResources().openRawResource(R.raw.tt);
+        final InputStream stream = getResources().openRawResource(R.raw.test);
 //        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream));
 //        final StringBuilder sb = new StringBuilder();
 //        String line;
diff --git a/app/src/main/res/raw/tt.md b/app/src/main/res/raw/tt.md
@@ -1 +1,7 @@
-> * * * * hello
+> hello
+> > sdjfg
+> > > * * * sadfg
+
+
+> > > hello
+> >  > =
diff --git a/markdown/build.gradle b/markdown/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
-def version_code = 1
-def version_name = '0.0.1'
+def version_code = 2
+def version_name = '0.0.2'
 
 android {
     compileSdkVersion 23
diff --git a/markdown/src/main/java/com/zzhoujay/markdown/MarkDownParser.java b/markdown/src/main/java/com/zzhoujay/markdown/MarkDownParser.java
@@ -103,7 +103,7 @@ public LineQueue getQueue() {
 
             if (!notBlock && tagHandler.codeBlock2(queue)) {
                 block2 = !block2;
-                queue.remove();
+                queue.removeCurrLine();
                 if (!block2) {
                     removeBlankLine(queue, true);
                 }
@@ -123,7 +123,7 @@ public LineQueue getQueue() {
                 curr.setStyle(SpannableStringBuilder.valueOf(curr.getSource()));
                 tagHandler.inline(curr);
                 curr.setStyle(styleBuilder.h1(curr.getStyle()));
-                curr.removeNext();
+                queue.removeNext();
                 removeBlankLine(queue);
                 continue;
             }
@@ -133,7 +133,7 @@ public LineQueue getQueue() {
                 curr.setStyle(SpannableStringBuilder.valueOf(curr.getSource()));
                 tagHandler.inline(curr);
                 curr.setStyle(styleBuilder.h2(curr.getStyle()));
-                curr.removeNext();
+                queue.removeNext();
                 removeBlankLine(queue);
                 continue;
             }
@@ -164,7 +164,7 @@ public LineQueue getQueue() {
 //                        if (findUl(r)||findOl(r)) {
                     if (tagHandler.find(Tag.UL, r) || tagHandler.find(Tag.OL, r) || tagHandler.find(Tag.H, r)) {
                         break;
-                    } else {
+                    }else  {
                         queue.currLine().setSource(curr.getSource() + ' ' + r);
                         queue.removeNext();
                     }
@@ -226,25 +226,23 @@ private Spannable mergeSpannable(LineQueue queue) {
             builder.append(curr.getStyle()).append('\n');
             switch (curr.getType()) {
                 case Line.LINE_TYPE_QUOTA:
-                    if (next != null && next.getType() == Line.LINE_TYPE_QUOTA) {
-                        int num = curr.getCount();
-                        SpannableStringBuilder ssb = new SpannableStringBuilder(" ");
-                        while (num > 0) {
-                            ssb = styleBuilder.quota(ssb);
-                            num--;
-                        }
-                        ssb.append('\n');
-                        builder.append(ssb);
-                    } else {
+                    if(next!=null&&next.getType()!=Line.LINE_TYPE_QUOTA){
                         builder.append('\n');
                     }
                     break;
-                case Line.LINE_TYPE_H3:
+                case Line.LINE_TYPE_UL:
+                    if (next != null && next.getType() == Line.LINE_TYPE_UL)
+                        builder.append(listMarginBottom());
                     builder.append('\n');
                     break;
-                case Line.LINE_TYPE_H4:
+                case Line.LINE_TYPE_OL:
+                    if (next != null && next.getType() == Line.LINE_TYPE_OL) {
+                        builder.append(listMarginBottom());
+                    }
                     builder.append('\n');
                     break;
+                case Line.LINE_TYPE_H3:
+                case Line.LINE_TYPE_H4:
                 case Line.LINE_TYPE_H5:
                 case Line.LINE_TYPE_H6:
                 case Line.LINE_TYPE_H1:
@@ -253,16 +251,6 @@ private Spannable mergeSpannable(LineQueue queue) {
                 case Line.LINE_NORMAL:
                     builder.append('\n');
                     break;
-                case Line.LINE_TYPE_UL:
-                    if (next != null && next.getType() == Line.LINE_TYPE_UL)
-                        builder.append(listMarginBottom());
-                    builder.append('\n');
-                    break;
-                case Line.LINE_TYPE_OL:
-                    if (next != null && next.getType() == Line.LINE_TYPE_OL) {
-                        builder.append(listMarginBottom());
-                    }
-                    builder.append('\n');
             }
         } while (queue.next());
         return builder;
@@ -274,20 +262,21 @@ private boolean removeBlankLine(LineQueue queue) {
 
     private boolean removeBlankLine(LineQueue queue, boolean curr) {
         boolean flag = false;
-        if (curr) {
-            queue = queue.copy();
-        } else {
-            queue = queue.copyNext();
-        }
-        if (queue == null) {
-            return false;
+        Line m = curr ? queue.prevLine() : queue.get();
+        if (!curr) {
+            queue.next();
         }
         do {
-            if (!tagHandler.find(Tag.BLANK, queue.get())) {
+            if (!tagHandler.find(Tag.BLANK, queue.get()) || queue.get() == m) {
                 break;
             }
             flag = true;
         } while (queue.removeCurrLine() != null);
+        if (!curr) {
+            if (queue.get() != m) {
+                queue.prev();
+            }
+        }
         return flag;
     }
 
diff --git a/markdown/src/main/java/com/zzhoujay/markdown/parser/LineQueue.java b/markdown/src/main/java/com/zzhoujay/markdown/parser/LineQueue.java
diff --git a/markdown/src/main/java/com/zzhoujay/markdown/parser/TagHandlerImpl.java b/markdown/src/main/java/com/zzhoujay/markdown/parser/TagHandlerImpl.java

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,6 @@ dependencies {`
`23`	`23`	`compile fileTree(include: ['*.jar'], dir: 'libs')`
`24`	`24`	`testCompile 'junit:junit:4.12'`
`25`	`25`	`compile 'com.android.support:appcompat-v7:23.4.0'`
`26`		`- compile project(':markdown')`
	`26`	`+// compile project(':markdown')`
	`27`	`+ compile 'com.zzhoujay.markdown:markdown:0.0.2'`
`27`	`28`	`}`