Add options to control heuristics in structured text.

4 files changed, 11 insertions, 11 deletions

diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index 87e57e57..39256043 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -4202,7 +4202,7 @@ FUN(Page_toDisplayList)(JNIEnv *env, jobject self, jboolean no_annotations)
 }
 
 JNIEXPORT jobject JNICALL
-FUN(Page_toStructuredText)(JNIEnv *env, jobject self)
+FUN(Page_toStructuredText)(JNIEnv *env, jobject self, jint joptions)
 {
 	fz_context *ctx = get_context(env);
 	fz_page *page = from_Page(env, self);
@@ -4216,7 +4216,7 @@ FUN(Page_toStructuredText)(JNIEnv *env, jobject self)
 	fz_try(ctx)
 	{
 		sheet = fz_new_stext_sheet(ctx);
-		text = fz_new_stext_page_from_page(ctx, page, sheet);
+		text = fz_new_stext_page_from_page(ctx, page, sheet, joptions);
 	}
 	fz_always(ctx)
 		fz_drop_stext_sheet(ctx, sheet);
@@ -4258,7 +4258,7 @@ FUN(Page_textAsHtml)(JNIEnv *env, jobject self)
 		ctm = fz_identity;
 		sheet = fz_new_stext_sheet(ctx);
 		text = fz_new_stext_page(ctx, fz_bound_page(ctx, page, &mediabox));
-		dev = fz_new_stext_device(ctx, sheet, text);
+		dev = fz_new_stext_device(ctx, sheet, text, 0);
 		fz_run_page(ctx, page, dev, &ctm, NULL);
 		fz_close_device(ctx, dev);
 
@@ -4436,7 +4436,7 @@ FUN(DisplayList_toPixmap)(JNIEnv *env, jobject self, jobject jctm, jobject jcs,
 }
 
 JNIEXPORT jobject JNICALL
-FUN(DisplayList_toStructuredText)(JNIEnv *env, jobject self)
+FUN(DisplayList_toStructuredText)(JNIEnv *env, jobject self, jint joptions)
 {
 	fz_context *ctx = get_context(env);
 	fz_display_list *list = from_DisplayList(env, self);
@@ -4450,7 +4450,7 @@ FUN(DisplayList_toStructuredText)(JNIEnv *env, jobject self)
 	fz_try(ctx)
 	{
 		sheet = fz_new_stext_sheet(ctx);
-		text = fz_new_stext_page_from_display_list(ctx, list, sheet);
+		text = fz_new_stext_page_from_display_list(ctx, list, sheet, joptions);
 	}
 	fz_always(ctx)
 		fz_drop_stext_sheet(ctx, sheet);
diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h
index d43f1526..d674c715 100644
--- a/platform/java/mupdf_native.h
+++ b/platform/java/mupdf_native.h
@@ -470,10 +470,10 @@ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_DisplayList_toPixmap
 /*
  * Class:     com_artifex_mupdf_fitz_DisplayList
  * Method:    toStructuredText
- * Signature: ()Lcom/artifex/mupdf/fitz/StructuredText;
+ * Signature: (I)Lcom/artifex/mupdf/fitz/StructuredText;
  */
 JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_DisplayList_toStructuredText
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jint);
 
 /*
  * Class:     com_artifex_mupdf_fitz_DisplayList
@@ -2072,10 +2072,10 @@ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toDisplayList
 /*
  * Class:     com_artifex_mupdf_fitz_Page
  * Method:    toStructuredText
- * Signature: ()Lcom/artifex/mupdf/fitz/StructuredText;
+ * Signature: (I)Lcom/artifex/mupdf/fitz/StructuredText;
  */
 JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toStructuredText
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jint);
 
 /*
  * Class:     com_artifex_mupdf_fitz_Page
diff --git a/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
index f274ebfa..37a218e7 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
@@ -22,7 +22,7 @@ public class DisplayList
 	}
 
 	public native Pixmap toPixmap(Matrix ctm, ColorSpace colorspace, boolean alpha);
-	public native StructuredText toStructuredText();
+	public native StructuredText toStructuredText(int options);
 	public native Rect[] search(String needle);
 
 	public native void run(Device dev, Matrix ctm, Rect scissor, Cookie cookie);
diff --git a/platform/java/src/com/artifex/mupdf/fitz/Page.java b/platform/java/src/com/artifex/mupdf/fitz/Page.java
index 69a4003e..b42935c5 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Page.java
@@ -33,7 +33,7 @@ public class Page
 	//fz_transition *fz_page_presentation(fz_document *doc, fz_page *page, float *duration);
 
 	public native DisplayList toDisplayList(boolean no_annotations);
-	public native StructuredText toStructuredText();
+	public native StructuredText toStructuredText(int options);
 
 	public native Rect[] search(String needle);