sync tex

NanoMichael · NanoMichael · commit a25e4d52168f · 2019-02-25T22:29:59.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@
 /build
 /captures
 .externalNativeBuild
+
+
+app/src/main/assets/SAMPLES.tex
diff --git a/app/src/main/assets/SAMPLES.tex b/app/src/main/assets/SAMPLES.tex
diff --git a/libtex/src/main/java/io/nano/tex/res/ResManager.java b/libtex/src/main/java/io/nano/tex/res/ResManager.java
@@ -32,7 +32,7 @@ public String getResourcesRootDirectory() {
     }
 
     private List<String> listRes() {
-        InputStream is = ResManager.class.getResourceAsStream("readme");
+        InputStream is = ResManager.class.getResourceAsStream("RES_README");
         BufferedReader in = new BufferedReader(new InputStreamReader(is));
         String line;
         List<String> res = new ArrayList<>();
@@ -91,4 +91,3 @@ private static void copyTo(InputStream is, String targetPath) {
         }
     }
 }
-
diff --git a/libtex/src/main/jni/port/graphics_android.cpp b/libtex/src/main/jni/port/graphics_android.cpp
@@ -120,7 +120,7 @@ shared_ptr<TextLayout> TextLayout::create(const wstring& txt, const shared_ptr<F
 /******************************************* Graphics 2D ******************************************/
 
 /**
- * Keep in sync with com/welearn/tex/ActionRecorder
+ * Keep in sync with io/nano/tex/ActionRecorder
  */
 enum Action {
     ACT_setFont,
diff --git a/libtex/src/main/jni/tex b/libtex/src/main/jni/tex
@@ -1 +1 @@
-Subproject commit e03739d95b9afa4f9d35c9c3fea6b27cb565d066
+Subproject commit 63555c2e902a42bfad457d3d58a4a24c5c51c53e

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public String getResourcesRootDirectory() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`private List<String> listRes() {`
`35`		`- InputStream is = ResManager.class.getResourceAsStream("readme");`
	`35`	`+ InputStream is = ResManager.class.getResourceAsStream("RES_README");`
`36`	`36`	`BufferedReader in = new BufferedReader(new InputStreamReader(is));`
`37`	`37`	`String line;`
`38`	`38`	`List<String> res = new ArrayList<>();`
`@@ -91,4 +91,3 @@ private static void copyTo(InputStream is, String targetPath) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`-`