true on success, false on failure
Move to the next line.
-bool pdfioContentTextNextLine(pdfio_stream_t *st);
+bool pdfioContentTextNewLine(pdfio_stream_t *st);| st | @@ -2066,6 +2068,56 @@ bool pdfioContentTextNextLine(pdfio_stream_t *st);
|---|
true on success, false on failure
Move to the next line and show text.
++bool pdfioContentTextNewLineShow(pdfio_stream_t *st, double ws, double cs, bool unicode, const char *s);
+| st | +Stream |
|---|---|
| ws | +Word spacing or 0.0 for none |
| cs | +Character spacing or 0.0 for none |
| unicode | +Unicode text? |
| s | +String to show |
true on success, false on failure
This function moves to the next line and then shows some text with optional +word and character spacing in a PDF content stream. The "unicode" argument +specifies that the current font maps to full Unicode. The "s" argument +specifies a UTF-8 encoded string.
+Show formatted text.
++bool pdfioContentTextNewLineShowf(pdfio_stream_t *st, double ws, double cs, bool unicode, const char *format, ...);
+| st | +Stream |
|---|---|
| ws | +Word spacing or 0.0 for none |
| cs | +Character spacing or 0.0 for none |
| unicode | +Unicode text? |
| format | +printf-style format string |
| ... | +Additional arguments as needed |
true on success, false on failure
This function moves to the next line and shows some formatted text with
+optional word and character spacing in a PDF content stream. The "unicode"
+argument specifies that the current font maps to full Unicode. The "format"
+argument specifies a UTF-8 encoded printf-style format string.
Show text.
@@ -2125,9 +2177,9 @@ bool pdfioContentTextShowf(pdfio_stream_t *st, boo
Show formatted text.
-This function shows some text in a PDF content stream. The "unicode" argument
-specifies that the current font maps to full Unicode. The "format" argument
-specifies a UTF-8 encoded printf-style format string.
This function shows some formatted text in a PDF content stream. The
+"unicode" argument specifies that the current font maps to full Unicode.
+The "format" argument specifies a UTF-8 encoded printf-style format string.
Copy a dictionary to a PDF file.
diff --git a/pdfio-content.c b/pdfio-content.c index 8517166..7346487 100644 --- a/pdfio-content.c +++ b/pdfio-content.c @@ -1187,17 +1187,97 @@ pdfioContentTextMoveTo( // -// 'pdfioContentTextNextLine()' - Move to the next line. +// 'pdfioContentTextNewLine()' - Move to the next line. // bool // O - `true` on success, `false` on failure -pdfioContentTextNextLine( +pdfioContentTextNewLine( pdfio_stream_t *st) // I - Stream { return (pdfioStreamPuts(st, "T*\n")); } +// +// 'pdfioContentTextNewLineShow()' - Move to the next line and show text. +// +// This function moves to the next line and then shows some text with optional +// word and character spacing in a PDF content stream. The "unicode" argument +// specifies that the current font maps to full Unicode. The "s" argument +// specifies a UTF-8 encoded string. +// + +bool // O - `true` on success, `false` on failure +pdfioContentTextNewLineShow( + pdfio_stream_t *st, // I - Stream + double ws, // I - Word spacing or `0.0` for none + double cs, // I - Character spacing or `0.0` for none + bool unicode, // I - Unicode text? + const char *s) // I - String to show +{ + bool newline = false; // New line? + char op; // Text operator + + + // Write word and/or character spacing as needed... + if (ws > 0.0 || cs > 0.0) + { + // Use " operator to show text with word and character spacing... + if (!pdfioStreamPrintf(st, "%g %g", ws, cs)) + return (false); + + op = '\"'; + } + else + { + // Use ' operator to show text with the defaults... + op = '\''; + } + + // Write the string... + if (!write_string(st, unicode, s, &newline)) + return (false); + + // Draw it... + if (newline) + return (pdfioStreamPrintf(st, "%c T*\n", op)); + else + return (pdfioStreamPrintf(st, "%c\n", op)); +} + + +// +// 'pdfioContentTextNewLineShowf()' - Show formatted text. +// +// This function moves to the next line and shows some formatted text with +// optional word and character spacing in a PDF content stream. The "unicode" +// argument specifies that the current font maps to full Unicode. The "format" +// argument specifies a UTF-8 encoded `printf`-style format string. +// + +bool // O - `true` on success, `false` on failure +pdfioContentTextNewLineShowf( + pdfio_stream_t *st, // I - Stream + double ws, // I - Word spacing or `0.0` for none + double cs, // I - Character spacing or `0.0` for none + bool unicode, // I - Unicode text? + const char *format, // I - `printf`-style format string + ...) // I - Additional arguments as needed +{ + char buffer[8192]; // Text buffer + va_list ap; // Argument pointer + + + // Format the string... + va_start(ap, format); + vsnprintf(buffer, sizeof(buffer), format, ap); + va_end(ap); + + // Show it... + return (pdfioContentTextNewLineShow(st, ws, cs, unicode, buffer)); +} + + // // 'pdfioContentTextShow()' - Show text. // @@ -1230,9 +1310,9 @@ pdfioContentTextShow( // // 'pdfioContentTextShowf()' - Show formatted text. // -// This function shows some text in a PDF content stream. The "unicode" argument -// specifies that the current font maps to full Unicode. The "format" argument -// specifies a UTF-8 encoded `printf`-style format string. +// This function shows some formatted text in a PDF content stream. The +// "unicode" argument specifies that the current font maps to full Unicode. +// The "format" argument specifies a UTF-8 encoded `printf`-style format string. // bool diff --git a/pdfio-content.h b/pdfio-content.h index 24403d2..301811d 100644 --- a/pdfio-content.h +++ b/pdfio-content.h @@ -118,7 +118,9 @@ extern bool pdfioContentTextEnd(pdfio_stream_t *st) _PDFIO_PUBLIC; extern double pdfioContentTextMeasure(pdfio_obj_t *font, const char *s, double size) _PDFIO_PUBLIC; extern bool pdfioContentTextMoveLine(pdfio_stream_t *st, double tx, double ty) _PDFIO_PUBLIC; extern bool pdfioContentTextMoveTo(pdfio_stream_t *st, double tx, double ty) _PDFIO_PUBLIC; -extern bool pdfioContentTextNextLine(pdfio_stream_t *st) _PDFIO_PUBLIC; +extern bool pdfioContentTextNewLine(pdfio_stream_t *st) _PDFIO_PUBLIC; +extern bool pdfioContentTextNewLineShow(pdfio_stream_t *st, double ws, double cs, bool unicode, const char *s) _PDFIO_PUBLIC; +extern bool pdfioContentTextNewLineShowf(pdfio_stream_t *st, double ws, double cs, bool unicode, const char *format, ...) _PDFIO_PUBLIC _PDFIO_FORMAT(5,6); extern bool pdfioContentTextShow(pdfio_stream_t *st, bool unicode, const char *s) _PDFIO_PUBLIC; extern bool pdfioContentTextShowf(pdfio_stream_t *st, bool unicode, const char *format, ...) _PDFIO_PUBLIC _PDFIO_FORMAT(3,4); extern bool pdfioContentTextShowJustified(pdfio_stream_t *st, bool unicode, size_t num_fragments, const double *offsets, const char * const *fragments) _PDFIO_PUBLIC; diff --git a/pdfio1.def b/pdfio1.def index c487d01..82a69f6 100644 --- a/pdfio1.def +++ b/pdfio1.def @@ -141,7 +141,9 @@ pdfioContentTextEnd pdfioContentTextMeasure pdfioContentTextMoveLine pdfioContentTextMoveTo -pdfioContentTextNextLine +pdfioContentTextNewLine +pdfioContentTextNewLineShow +pdfioContentTextNewLineShowf pdfioContentTextShow pdfioContentTextShowJustified pdfioContentTextShowf