doc/pdfio.md

@@ -33,7 +33,7 @@ PDFio requires the following to build the software:
 IDE files for Xcode (macOS/iOS) and Visual Studio (Windows) are also provided.
 
 
-Installing PDFio
+Installing pdfio
 ----------------
 
 PDFio comes with a configure script that creates a portable makefile that will
@@ -315,9 +315,8 @@ Reading PDF Files
 You open an existing PDF file using the [`pdfioFileOpen`](@@) function:
 
 ```c
-pdfio_file_t *pdf =
+pdfio_file_t *pdf = pdfioFileOpen("myinputfile.pdf", password_cb, password_data,
-    pdfioFileOpen("myinputfile.pdf", password_cb, password_data,
+                                  error_cb, error_data);
-                  error_cb, error_data);
 
 ```
 
@@ -764,9 +763,6 @@ pdfio_obj_t *img =
                                     /*interpolate*/true);
 ```
 
-> Note: Currently `pdfioFileCreateImageObjFromFile` does not support 12 bit JPEG
-> files or PNG files with an alpha channel.
-
 
 ### Page Dictionary Functions
 
@@ -866,7 +862,6 @@ escaping, as needed:
 Examples
 ========
 
-
 Read PDF Metadata
 -----------------
 
@@ -997,169 +992,3 @@ create_pdf_image_file(const char *pdfname, const char *imagename,
   pdfioFileClose(pdf);
 }
 ```
-
-
-Generate a Code 128 Barcode
----------------------------
-
-One-dimensional barcodes are often rendered using special fonts that map ASCII
-characters to sequences of bars that can be read.  The "examples" directory
-contains such a font to create "Code 128" barcodes, with an accompanying bit of
-example code.
-
-The first thing you need to do is prepare the barcode string to use with the
-font.  Each barcode begins with a start pattern followed by the characters or
-digits you want to encode, a weighted sum digit, and a stop pattern.  The
-`make_code128` function creates this string:
-
-```c
-static char *                           // O - Output string
-make_code128(char       *dst,           // I - Destination buffer
-             const char *src,           // I - Source string
-             size_t     dstsize)        // I - Size of destination buffer
-{
-  char          *dstptr,                // Pointer into destination buffer
-                *dstend;                // End of destination buffer
-  int           sum;                    // Weighted sum
-  static const char *code128_chars =    // Code 128 characters
-                " !\"#$%&'()*+,-./0123456789:;<=>?"
-                "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-                "`abcdefghijklmnopqrstuvwxyz{|}~\303"
-                "\304\305\306\307\310\311\312";
-  static const char code128_start_code_b = '\314';
-                                        // Start code B
-  static const char code128_stop = '\316';
-                                        // Stop pattern
-
-
-  // Start a Code B barcode...
-  dstptr = dst;
-  dstend = dst + dstsize - 3;
-
-  *dstptr++ = code128_start_code_b;
-  sum       = code128_start_code_b - 100;
-
-  while (*src && dstptr < dstend)
-  {
-    if (*src >= ' ' && *src < 0x7f)
-    {
-      sum       += (dstptr - dst) * (*src - ' ');
-      *dstptr++ = *src;
-    }
-
-    src ++;
-  }
-
-  // Add the weighted sum modulo 103
-  *dstptr++ = code128_chars[sum % 103];
-
-  // Add the stop pattern and return...
-  *dstptr++ = code128_stop;
-  *dstptr   = '\0';
-
-  return (dst);
-}
-```
-
-The `main` function does the rest of the work.  The barcode font is imported
-using the [`pdfioFileCreateFontObjFromFile`](@@) function.  We pass `false`
-for the "unicode" argument since we just want the (default) ASCII encoding:
-
-```c
-barcode_font = pdfioFileCreateFontObjFromFile(pdf, "code128.ttf",
-                                              /*unicode*/false);
-```
-
-Since barcodes usually have the number or text represented by the barcode
-printed underneath it, we also need a regular text font, for which we can choose
-one of the standard 14 PostScript base fonts using the
-[`pdfioFIleCreateFontObjFromBase`](@@) function:
-
-```c
-text_font = pdfioFileCreateFontObjFromBase(pdf, "Helvetica");
-```
-
-Once we have these fonts we can measure the barcode and regular text labels
-using the [`pdfioContentTextMeasure`](@@) function to determine how large the
-PDF page needs to be to hold the barcode and text:
-
-```c
-// Compute sizes of the text...
-const char *barcode = argv[1];
-char barcode_temp[256];
-
-if (!(barcode[0] & 0x80))
-  barcode = make_code128(barcode_temp, barcode, sizeof(barcode_temp));
-
-double barcode_height = 36.0;
-double barcode_width =
-    pdfioContentTextMeasure(barcode_font, barcode, barcode_height);
-
-const char *text = argv[2];
-double text_height = 0.0;
-double text_width = 0.0;
-
-if (text && text_font)
-{
-  text_height = 9.0;
-  text_width  = pdfioContentTextMeasure(text_font, text,
-                                        text_height);
-}
-
-// Compute the size of the PDF page...
-pdfio_rect_t media_box;
-
-media_box.x1 = 0.0;
-media_box.y1 = 0.0;
-media_box.x2 = (barcode_width > text_width ?
-                    barcode_width : text_width) + 18.0;
-media_box.y2 = barcode_height + text_height + 18.0;
-```
-
-Finally, we just need to create a page of the specified size that references the
-two fonts:
-
-```c
-// Start a page for the barcode...
-page_dict = pdfioDictCreate(pdf);
-
-pdfioDictSetRect(page_dict, "MediaBox", &media_box);
-pdfioDictSetRect(page_dict, "CropBox", &media_box);
-
-pdfioPageDictAddFont(page_dict, "B128", barcode_font);
-if (text_font)
-  pdfioPageDictAddFont(page_dict, "TEXT", text_font);
-
-page_st = pdfioFileCreatePage(pdf, page_dict);
-```
-
-With the barcode font called "B128" and the text font called "TEXT", we can
-use them to draw two strings:
-
-```c
-// Draw the page...
-pdfioContentSetFillColorGray(page_st, 0.0);
-
-pdfioContentSetTextFont(page_st, "B128", barcode_height);
-pdfioContentTextBegin(page_st);
-pdfioContentTextMoveTo(page_st, 0.5 * (media_box.x2 - barcode_width),
-                       9.0 + text_height);
-pdfioContentTextShow(page_st, /*unicode*/false, barcode);
-pdfioContentTextEnd(page_st);
-
-if (text && text_font)
-{
-  pdfioContentSetTextFont(page_st, "TEXT", text_height);
-  pdfioContentTextBegin(page_st);
-  pdfioContentTextMoveTo(page_st, 0.5 * (media_box.x2 - text_width), 9.0);
-  pdfioContentTextShow(page_st, /*unicode*/false, text);
-  pdfioContentTextEnd(page_st);
-}
-
-pdfioStreamClose(page_st);
-```
-
-
-Convert Markdown to PDF
------------------------
-

examples/code128.c

@@ -23,6 +23,7 @@
 // extended characters are ignored in the source string.
 //
 
+
 static char *				// O - Output string
 make_code128(char       *dst,		// I - Destination buffer
              const char *src,		// I - Source string
@@ -53,9 +54,9 @@ make_code128(char       *dst,		// I - Destination buffer
   static const char code128_start_code_a = '\313';
 					// Start code A
   static const char code128_start_code_b = '\314';
-					// Start code B
+					// Start code A
   static const char code128_start_code_c = '\315';
-					// Start code C
+					// Start code A
   static const char code128_stop = '\316';
 					// Stop pattern
 
@@ -148,7 +149,7 @@ main(int  argc,				// I - Number of command-line arguments
   // Load fonts...
   barcode_font = pdfioFileCreateFontObjFromFile(pdf, "code128.ttf", /*unicode*/false);
   if (text)
-    text_font = pdfioFileCreateFontObjFromBase(pdf, "Helvetica");
+    text_font = pdfioFileCreateFontObjFromFile(pdf, "../testfiles/OpenSans-Regular.ttf", /*unicode*/true);
 
   // Generate Code128 characters for the desired barcode...
   if (!(barcode[0] & 0x80))
@@ -181,7 +182,7 @@ main(int  argc,				// I - Number of command-line arguments
   page_st = pdfioFileCreatePage(pdf, page_dict);
 
   // Draw the page...
-  pdfioContentSetFillColorGray(page_st, 0.0);
+  pdfioContentSetStrokeColorGray(page_st, 0.0);
 
   pdfioContentSetTextFont(page_st, "B128", barcode_height);
   pdfioContentTextBegin(page_st);
@@ -194,7 +195,7 @@ main(int  argc,				// I - Number of command-line arguments
     pdfioContentSetTextFont(page_st, "TEXT", text_height);
     pdfioContentTextBegin(page_st);
     pdfioContentTextMoveTo(page_st, 0.5 * (media_box.x2 - text_width), 9.0);
-    pdfioContentTextShow(page_st, /*unicode*/false, text);
+    pdfioContentTextShow(page_st, /*unicode*/true, text);
     pdfioContentTextEnd(page_st);
   }
 

examples/md2pdf.c

@@ -8,7 +8,6 @@
 //
 // Usage:
 //
-//   ./md2pdf FILENAME.md FILENAME.pdf
 //   ./md2pdf FILENAME.md >FILENAME.pdf
 //
 // The generated PDF file is formatted for a "universal" paper size (8.27x11",
@@ -41,7 +40,7 @@ typedef enum doccolor_e			// Document color enumeration
 {
   DOCCOLOR_BLACK,			// #000
   DOCCOLOR_RED,				// #900
-  DOCCOLOR_ORANGE,			// #CC0
+  DOCCOLOR_GREEN,			// #090
   DOCCOLOR_BLUE,			// #00C
   DOCCOLOR_LTGRAY,			// #EEE
   DOCCOLOR_GRAY				// #555
@@ -239,7 +238,7 @@ static double	measure_cell(docdata_t *dd, mmd_t *cell, tablecol_t *col);
 static mmd_t	*mmd_walk_next(mmd_t *top, mmd_t *node);
 static void	new_page(docdata_t *dd);
 static ssize_t	output_cb(void *output_cbdata, const void *buffer, size_t bytes);
-static void	render_line(docdata_t *dd, double margin_left, double margin_top, double need_bottom, double lineheight, size_t num_frags, linefrag_t *frags);
+static void	render_line(docdata_t *dd, double margin_left, double margin_top, double lineheight, size_t num_frags, linefrag_t *frags);
 static void	render_row(docdata_t *dd, size_t num_cols, tablecol_t *cols, tablerow_t *row);
 static void	set_color(docdata_t *dd, doccolor_t color);
 static void	set_font(docdata_t *dd, docfont_t font, double fsize);
@@ -263,10 +262,9 @@ main(int  argc,				// I - Number of command-line arguments
   setbuf(stderr, NULL);
 
   // Get the markdown file from the command-line...
-  if (argc < 2 || argc > 3)
+  if (argc != 2)
   {
-    fputs("Usage: md2pdf FILENANE.md [FILENAME.pdf]\n", stderr);
+    fputs("Usage: md2pdf FILENANE.md >FILENAME.pdf\n", stderr);
-    fputs("       md2pdf FILENANE.md >FILENAME.pdf\n", stderr);
     return (1);
   }
 
@@ -291,20 +289,13 @@ main(int  argc,				// I - Number of command-line arguments
 
   dd.title       = mmdGetMetadata(doc, "title");
 
-  if (argc == 2)
+  // Output a PDF file to the standard output...
-  {
-    // Output a PDF file to the standard output...
 #ifdef _WIN32
-    setmode(1, O_BINARY);		// Force binary output on Windows
+  setmode(1, O_BINARY);			// Force binary output on Windows
 #endif // _WIN32
 
-    if ((dd.pdf = pdfioFileCreateOutput(output_cb, /*output_cbdata*/NULL, /*version*/NULL, /*media_box*/NULL, /*crop_box*/NULL, /*error_cb*/NULL, /*error_data*/NULL)) == NULL)
+  if ((dd.pdf = pdfioFileCreateOutput(output_cb, /*output_cbdata*/NULL, /*version*/NULL, /*media_box*/NULL, /*crop_box*/NULL, /*error_cb*/NULL, /*error_data*/NULL)) == NULL)
-      return (1);
-  }
-  else if ((dd.pdf = pdfioFileCreate(argv[2], /*version*/NULL, /*media_box*/NULL, /*crop_box*/NULL, /*error_cb*/NULL, /*error_data*/NULL)) == NULL)
-  {
     return (1);
-  }
 
   if ((value = mmdGetMetadata(doc, "author")) != NULL)
     pdfioFileSetAuthor(dd.pdf, value);
@@ -549,7 +540,6 @@ format_block(docdata_t  *dd,		// I - Document data
 		wswidth,		// Width of whitespace
 		margin_left,		// Left margin
 		margin_top,		// Top margin
-		need_bottom,		// Space needed after this block
 		height,			// Height of current fragment
 		lineheight;		// Height of current line
 
@@ -561,11 +551,6 @@ format_block(docdata_t  *dd,		// I - Document data
   else
     margin_top = fsize * LINE_HEIGHT;
 
-  if (mmdGetNextSibling(block))
-    need_bottom = 3.0 * SIZE_BODY * LINE_HEIGHT;
-  else
-    need_bottom = 0.0;
-
   if (leader)
   {
     // Add leader text on first line...
@@ -635,26 +620,22 @@ format_block(docdata_t  *dd,		// I - Document data
       else
         margin_left = 0.0;
 
-      render_line(dd, margin_left, margin_top, need_bottom, lineheight, num_frags, frags);
+      render_line(dd, margin_left, margin_top, lineheight, num_frags, frags);
 
       if (deffont == DOCFONT_ITALIC)
       {
-        // Add an orange bar to the left of block quotes...
+        // Add a gray bar to the left of block quotes...
-        set_color(dd, DOCCOLOR_ORANGE);
+        set_color(dd, DOCCOLOR_GREEN);
-        pdfioContentSave(dd->st);
-        pdfioContentSetLineWidth(dd->st, 3.0);
         pdfioContentPathMoveTo(dd->st, left - 6.0, dd->y - (LINE_HEIGHT - 1.0) * fsize);
         pdfioContentPathLineTo(dd->st, left - 6.0, dd->y + fsize);
         pdfioContentStroke(dd->st);
-        pdfioContentRestore(dd->st);
       }
 
-      num_frags   = 0;
+      num_frags  = 0;
-      frag        = frags;
+      frag       = frags;
-      x           = left;
+      x          = left;
-      lineheight  = 0.0;
+      lineheight = 0.0;
-      margin_top  = 0.0;
+      margin_top = 0.0;
-      need_bottom = 0.0;
 
       continue;
     }
@@ -704,26 +685,22 @@ format_block(docdata_t  *dd,		// I - Document data
       else
         margin_left = 0.0;
 
-      render_line(dd, margin_left, margin_top, need_bottom, lineheight, num_frags, frags);
+      render_line(dd, margin_left, margin_top, lineheight, num_frags, frags);
 
       if (deffont == DOCFONT_ITALIC)
       {
-        // Add an orange bar to the left of block quotes...
+        // Add a gray bar to the left of block quotes...
-        set_color(dd, DOCCOLOR_ORANGE);
+        set_color(dd, DOCCOLOR_GREEN);
-        pdfioContentSave(dd->st);
-        pdfioContentSetLineWidth(dd->st, 3.0);
         pdfioContentPathMoveTo(dd->st, left - 6.0, dd->y - (LINE_HEIGHT - 1.0) * fsize);
         pdfioContentPathLineTo(dd->st, left - 6.0, dd->y + fsize);
         pdfioContentStroke(dd->st);
-        pdfioContentRestore(dd->st);
       }
 
-      num_frags   = 0;
+      num_frags  = 0;
-      frag        = frags;
+      frag       = frags;
-      x           = left;
+      x          = left;
-      lineheight  = 0.0;
+      lineheight = 0.0;
-      margin_top  = 0.0;
+      margin_top = 0.0;
-      need_bottom = 0.0;
     }
 
     // Add the current node to the fragment list
@@ -760,18 +737,15 @@ format_block(docdata_t  *dd,		// I - Document data
     else
       margin_left = 0.0;
 
-    render_line(dd, margin_left, margin_top, need_bottom, lineheight, num_frags, frags);
+    render_line(dd, margin_left, margin_top, lineheight, num_frags, frags);
 
     if (deffont == DOCFONT_ITALIC)
     {
-      // Add an orange bar to the left of block quotes...
+      // Add a gray bar to the left of block quotes...
-      set_color(dd, DOCCOLOR_ORANGE);
+      set_color(dd, DOCCOLOR_GREEN);
-      pdfioContentSave(dd->st);
-      pdfioContentSetLineWidth(dd->st, 3.0);
       pdfioContentPathMoveTo(dd->st, left - 6.0, dd->y - (LINE_HEIGHT - 1.0) * fsize);
       pdfioContentPathLineTo(dd->st, left - 6.0, dd->y + fsize);
       pdfioContentStroke(dd->st);
-      pdfioContentRestore(dd->st);
     }
   }
 }
@@ -797,7 +771,7 @@ format_code(docdata_t *dd,		// I - Document data
 
   lineheight = SIZE_CODEBLOCK * LINE_HEIGHT;
   dd->y      -= 2.0 * lineheight;
-  if ((dd->y - lineheight) < dd->art_box.y1)
+  if (dd->y < dd->art_box.y1)
   {
     new_page(dd);
 
@@ -837,7 +811,6 @@ format_code(docdata_t *dd,		// I - Document data
 
   // End the current text block...
   pdfioContentTextEnd(dd->st);
-  dd->y += lineheight;
 }
 
 
@@ -877,11 +850,6 @@ format_doc(docdata_t *dd,		// I - Document data
       default :
           break;
 
-      case MMD_TYPE_THEMATIC_BREAK :
-          // Force a page break
-          dd->y = dd->art_box.y1;
-          break;
-
       case MMD_TYPE_BLOCK_QUOTE :
           format_doc(dd, current, DOCFONT_ITALIC, left + 36.0, right - 36.0);
           break;
@@ -1404,7 +1372,6 @@ static void
 render_line(docdata_t  *dd,		// I - Document data
             double     margin_left,	// I - Left margin
             double     margin_top,	// I - Top margin
-            double     need_bottom,	// I - How much space is needed after
             double     lineheight,	// I - Height of line
             size_t     num_frags,	// I - Number of line fragments
             linefrag_t *frags)		// I - Line fragments
@@ -1421,7 +1388,7 @@ render_line(docdata_t  *dd,		// I - Document data
   }
 
   dd->y -= margin_top + lineheight;
-  if ((dd->y - need_bottom) < dd->art_box.y1)
+  if (dd->y < dd->art_box.y1)
   {
     new_page(dd);
 
@@ -1606,9 +1573,9 @@ set_color(docdata_t  *dd,		// I - Document data
         pdfioContentSetFillColorDeviceRGB(dd->st, 0.6, 0.0, 0.0);
         pdfioContentSetStrokeColorDeviceRGB(dd->st, 0.6, 0.0, 0.0);
         break;
-    case DOCCOLOR_ORANGE :
+    case DOCCOLOR_GREEN :
-        pdfioContentSetFillColorDeviceRGB(dd->st, 1.0, 0.5, 0.0);
+        pdfioContentSetFillColorDeviceRGB(dd->st, 0.0, 0.6, 0.0);
-        pdfioContentSetStrokeColorDeviceRGB(dd->st, 1.0, 0.5, 0.0);
+        pdfioContentSetStrokeColorDeviceRGB(dd->st, 0.0, 0.6, 0.0);
         break;
     case DOCCOLOR_BLUE :
         pdfioContentSetFillColorDeviceRGB(dd->st, 0.0, 0.0, 0.8);