[liblouis-liblouisxml] [liblouisutdml] 2 new revisions pushed by mwhapples on 2014-07-29 12:51 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Tue, 29 Jul 2014 12:51:31 +0000
2 new revisions:
Revision: 33130b605cea
Branch: default
Author: Michael Whapples
Date: Tue Jul 29 12:08:57 2014 UTC
Log: Fix of the make system for the new test stuff and addition of the
lbu_...
http://code.google.com/p/liblouisutdml/source/detail?r=33130b605cea
Revision: adba5b666608
Branch: default
Author: Michael Whapples
Date: Tue Jul 29 13:02:11 2014 UTC
Log: Expose the loadXMLCatalog function through the java bindings
http://code.google.com/p/liblouisutdml/source/detail?r=adba5b666608
==============================================================================
Revision: 33130b605cea
Branch: default
Author: Michael Whapples
Date: Tue Jul 29 12:08:57 2014 UTC
Log: Fix of the make system for the new test stuff and addition of the
lbu_loadXMLCatalog function to the API
http://code.google.com/p/liblouisutdml/source/detail?r=33130b605cea
Modified:
/configure.ac
/liblouisutdml/liblouisutdml.c
/liblouisutdml/liblouisutdml.h
=======================================
--- /configure.ac Thu Jun 19 14:55:56 2014 UTC
+++ /configure.ac Tue Jul 29 12:08:57 2014 UTC
@@ -97,9 +97,18 @@
gnulib/Makefile
doc/Makefile
java/Makefile
+ java/lib/Makefile
java/src/Makefile
java/src/org/Makefile
java/src/org/liblouis/Makefile
+ java/tests/Makefile
+ java/tests/org/Makefile
+ java/tests/org/liblouis/Makefile
+ java/testdata/Makefile
+ java/testdata/liblouis/Makefile
+ java/testdata/liblouis/tables/Makefile
+ java/testdata/liblouisutdml/Makefile
+ java/testdata/liblouisutdml/lbu_files/Makefile
man/Makefile
lbu_files/Makefile
liblouisutdml/Makefile
=======================================
--- /liblouisutdml/liblouisutdml.c Thu Jun 5 16:25:54 2014 UTC
+++ /liblouisutdml/liblouisutdml.c Tue Jul 29 12:08:57 2014 UTC
@@ -35,6 +35,7 @@
#include <string.h>
#include "louisutdml.h"
#include <libxml/HTMLparser.h>
+#include <libxml/catalog.h>
UserData *ud = NULL;
@@ -49,6 +50,10 @@
return bothVersions;
}
+void EXPORT_CALL lbu_loadXMLCatalog(const char *filename)
+{
+ xmlLoadCatalog(filename);
+}
void
libxml_errors (void *ctx ATTRIBUTE_UNUSED, const char *msg, ...)
{
=======================================
--- /liblouisutdml/liblouisutdml.h Mon May 26 08:51:33 2014 UTC
+++ /liblouisutdml/liblouisutdml.h Tue Jul 29 12:08:57 2014 UTC
@@ -53,6 +53,7 @@
char *EXPORT_CALL lbu_version (void);
/* Returns the version of liblouisutdml and liblouis. */
+ void EXPORT_CALL lbu_loadXMLCatalog(const char *fiilename);
void *EXPORT_CALL lbu_initialize (const char *configFileList,
const char *logFileName,
const char *settingsString);
==============================================================================
Revision: adba5b666608
Branch: default
Author: Michael Whapples
Date: Tue Jul 29 13:02:11 2014 UTC
Log: Expose the loadXMLCatalog function through the java bindings
http://code.google.com/p/liblouisutdml/source/detail?r=adba5b666608
Modified:
/java/Jliblouisutdml.c
/java/Jliblouisutdml.h
/java/src/org/liblouis/LibLouisUTDML.java
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 16:52:41 2014 UTC
+++ /java/Jliblouisutdml.c Tue Jul 29 13:02:11 2014 UTC
@@ -100,6 +100,17 @@
{
return (*env)->NewStringUTF (env, lbu_version ());
}
+
+/*
+ * Class: org_liblouis_LibLouisUTDML
+ * Method: loadXMLCatalog
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_loadXMLCatalog
+ (JNIEnv *env, jobject this, jstring filename)
+{
+ return lbu_loadXMLCatalog(filename);
+}
/*
* Class: org_liblouis_LibLouisUTDML
=======================================
--- /java/Jliblouisutdml.h Thu Jun 5 16:25:54 2014 UTC
+++ /java/Jliblouisutdml.h Tue Jul 29 13:02:11 2014 UTC
@@ -1,112 +1,5 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
-/* Header for class org_liblouis_LibLouis */
-
-#ifndef _Included_org_liblouis_LibLouis
-#define _Included_org_liblouis_LibLouis
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_liblouis_LibLouis
- * Method: charSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_liblouis_LibLouis_charSize
- (JNIEnv *, jobject);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: setDataPath
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setDataPath
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: setLogFile
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: logEnd
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_logEnd
- (JNIEnv *, jobject);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: registerLogCallback
- * Signature: (Lorg/liblouis/LogCallback;)V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_registerLogCallback
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: setLogLevel
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogLevel
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: compileString
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_compileString
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: translateString
- * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translateString
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: translate
- * Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translate
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: hyphenate
- * Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_hyphenate
- (JNIEnv *, jobject, jstring, jbyteArray, jint, jbyteArray, jstring,
jint);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: backTranslateString
- * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslateString
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouis
- * Method: backTranslate
- * Signature: (Ljava/lang/String;[B[I[B[I[I[I[I[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslate
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jintArray, jintArray, jintArray, jbyteArray, jstring, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
/* Header for class org_liblouis_LibLouisUTDML */
#ifndef _Included_org_liblouis_LibLouisUTDML
@@ -152,6 +45,14 @@
JNIEXPORT jstring JNICALL Java_org_liblouis_LibLouisUTDML_version
(JNIEnv *, jobject);
+/*
+ * Class: org_liblouis_LibLouisUTDML
+ * Method: loadXMLCatalog
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_loadXMLCatalog
+ (JNIEnv *, jobject, jstring);
+
/*
* Class: org_liblouis_LibLouisUTDML
* Method: translateString
@@ -274,5 +175,123 @@
#ifdef __cplusplus
}
+#endif
+#endif
+/* Header for class org_liblouis_LibLouis */
+
+#ifndef _Included_org_liblouis_LibLouis
+#define _Included_org_liblouis_LibLouis
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: charSize
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_liblouis_LibLouis_charSize
+ (JNIEnv *, jobject);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setDataPath
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setDataPath
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setLogFile
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: logEnd
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_logEnd
+ (JNIEnv *, jobject);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: registerLogCallback
+ * Signature: (Lorg/liblouis/LogCallback;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_registerLogCallback
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setLogLevel
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogLevel
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: compileString
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_compileString
+ (JNIEnv *, jobject, jstring, jstring, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: translateString
+ * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translateString
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: translate
+ * Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translate
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: hyphenate
+ * Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_hyphenate
+ (JNIEnv *, jobject, jstring, jbyteArray, jint, jbyteArray, jstring,
jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslateString
+ * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslateString
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslate
+ * Signature: (Ljava/lang/String;[B[I[B[I[I[I[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslate
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jintArray, jintArray, jintArray, jbyteArray, jstring, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class org_liblouis_LogCallback */
+
+#ifndef _Included_org_liblouis_LogCallback
+#define _Included_org_liblouis_LogCallback
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
#endif
#endif
=======================================
--- /java/src/org/liblouis/LibLouisUTDML.java Fri Jul 25 18:09:51 2014 UTC
+++ /java/src/org/liblouis/LibLouisUTDML.java Tue Jul 29 13:02:11 2014 UTC
@@ -108,6 +108,10 @@
* liblouis */
public native String version ();
+ /**
+ * Load a XML catalog into LibLouisUTDML.
+ */
+ public native void loadXMLCatalog(String filename);
/** Make a braille translation of the UTF-8 characters in inbuf
according to configuration settings to UTF-8 characters in outbuf. The
latter will be in Unicode braille. The return value is true if the
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouisutdml] 2 new revisions pushed by mwhapples on 2014-07-29 12:51 GMT - liblouisutdml
