# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjj@kronos.home.ben.com-20090703221627-q22dg557b4yd8unx
# target_branch: http://bazaar.launchpad.net/%7Ejpakkane/cuneiform-\
#   linux/trunk/
# testament_sha1: 63e372cb453d3fa1aa1ab53548415f22c16c69d0
# timestamp: 2009-07-03 15:21:28 -0700
# base_revision_id: jpakkane@kosto-20090603072548-5bhgqzay13e3ayt1
# 
# Begin patch
=== modified file 'cuneiform_src/cli/cuneiform-cli.cpp'
--- cuneiform_src/cli/cuneiform-cli.cpp	2009-06-02 08:53:09 +0000
+++ cuneiform_src/cli/cuneiform-cli.cpp	2009-07-03 22:16:27 +0000
@@ -226,6 +226,8 @@
     Bool32 fax = FALSE;
     const char *defaultnamestem = "cuneiform-out.";
     string outfilename;
+    Word32 pictures = 1;
+    Word32 tables = 0;
     Int32 outputformat = PUMA_TOTEXT;
 
     cout << "Cuneiform for Linux " << CF_VERSION << "\n";
@@ -277,6 +279,13 @@
             dotmatrix = TRUE;
         } else if(strcmp(argv[i], "--fax") == 0) {
             fax = TRUE;
+        } else if(strcmp(argv[i], "--nopictures") == 0) {
+            pictures = 0;
+        } else if(strncmp(argv[i], "--tables", 8) == 0) {
+	    if (argv[i][8] == '=')
+		tables = atoi(argv[i] + 9);
+	    else
+		tables++;
         } else {
         /* No switches, so set input file. */
         infilename = argv[i];
@@ -316,7 +325,7 @@
     }
 
     if(infilename == NULL) {
-        cout << "Usage: " << argv[0] << "[-l languagename -f format --dotmatrix --fax -o result_file] imagefile\n";
+        cout << "Usage: " << argv[0] << " [-l languagename -f format --dotmatrix --fax --nopictures --tables[=n] -o result_file] imagefile\n";
         return 0;
     }
 
@@ -333,6 +342,8 @@
     PUMA_SetImportData(PUMA_Word32_Language, &langcode);
     PUMA_SetImportData(PUMA_Bool32_DotMatrix, &dotmatrix);
     PUMA_SetImportData(PUMA_Bool32_Fax100, &fax);
+    PUMA_SetImportData(PUMA_Word32_Pictures, &pictures);
+    PUMA_SetImportData(PUMA_Word32_Tables, &tables);
 
     if(!PUMA_XOpen(dib, "none.txt")) {
         cerr << "PUMA_Xopen failed.\n";

# Begin bundle
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