Fix some Unicode font embedding issues:

- Reworked Widths array compression for CID fonts to require at least 4 repeated
  widths.
- Fixed the embedded CMap for Unicode fonts.

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Update Build Environment
       run: sudo apt-get update --fix-missing -y
     - name: Install Prerequisites
-      run: sudo apt-get install -y cppcheck zlib1g-dev
+      run: sudo apt-get install -y cppcheck zlib1g-dev libpng-dev
     - name: Configure PDFio
       run: ./configure --enable-debug --enable-sanitizer --enable-maintainer
     - name: Build PDFio

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         run: sudo apt-get update --fix-missing -y
 
       - name: Install Prerequisites
-        run: sudo apt-get install -y zlib1g-dev
+        run: sudo apt-get install -y zlib1g-dev libpng-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/coverity.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Update Build Environment
         run: sudo apt-get update --fix-missing -y
       - name: Install Prerequisites
-        run: sudo apt-get install -y zlib1g-dev
+        run: sudo apt-get install -y zlib1g-dev libpng-dev
       - name: Download Coverity Build Tool
         run: |
           wget -q https://scan.coverity.com/download/linux64 --post-data token="$TOKEN&project=$GITHUB_REPOSITORY" -O cov-analysis-linux64.tar.gz

.gitignore

@@ -14,6 +14,7 @@
 /examples/code128
 /examples/image2pdf
 /examples/md2pdf
+/examples/pdf2text
 /examples/pdfioinfo
 /Makefile
 /packages
@@ -21,7 +22,6 @@
 /pdfio.xcodeproj/xcshareddata
 /pdfio-*.tar.gz*
 /pdfio-*.zip*
-/pdfiototext
 /testpdfio
 /testpdfio-*.pdf
 /testttf

CHANGES.md

@@ -1,8 +1,39 @@
 Changes in PDFio
 ================
 
+v1.5.0 - 2025-03-06
+-------------------
 
-v1.4.0 - YYYY-MM-DD
+- Added support for embedded color profiles in JPEG images (Issue #7)
+- Added `pdfioFileCreateICCObjFromData` API.
+- Added support for writing cross-reference streams for PDF 1.5 and newer files
+  (Issue #10)
+- Added `pdfioFileGetModDate()` API (Issue #88)
+- Added support for using libpng to embed PNG images in PDF output (Issue #90)
+- Added support for writing the PCLm subset of PDF (Issue #99)
+- Now support opening damaged PDF files (Issue #45)
+- Updated documentation (Issue #95)
+- Updated the pdf2txt example to support font encodings.
+- Fixed potential heap/integer overflow issues in the TrueType cmap code.
+- Fixed an output issue for extremely small `double` values with the
+  `pdfioContent` APIs.
+- Fixed a missing Widths array issue for embedded TrueType fonts.
+- Fixed some Unicode font embedding issues.
+
+
+v1.4.1 - 2025-01-24
+-------------------
+
+- Added license files for the example fonts now bundled with PDFio (Issue #91)
+- Fixed the link libraries for the example source code (Issue #86)
+- Fixed handling of the Info object (Issue #87)
+- Fixed opening of PDF files less than 1024 bytes in length (Issue #87)
+- Fixed potential `NULL` dereference when reading (Issue #89)
+- Fixed reading of compressed object streams (Issue #92)
+- Fixed reading of UTF-16 string values (Issue #92)
+
+
+v1.4.0 - 2024-12-26
 -------------------
 
 - Added new `pdfioDictGetKey` and `pdfioDictGetNumPairs` APIs (Issue #63)

Makefile.in

@@ -1,7 +1,7 @@
 #
 # Makefile for PDFio.
 #
-# Copyright © 2021-2024 by Michael R Sweet.
+# Copyright © 2021-2025 by Michael R Sweet.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -15,7 +15,7 @@
 .SILENT:
 
 
-# Version number...
+# Version numbers...
 PDFIO_VERSION		=	@PDFIO_VERSION@
 PDFIO_VERSION_MAJOR	=	@PDFIO_VERSION_MAJOR@
 PDFIO_VERSION_MINOR	=	@PDFIO_VERSION_MINOR@
@@ -103,15 +103,35 @@ LIBOBJS		=	\
 			ttf.o
 OBJS		=	\
 			$(LIBOBJS) \
-			pdfiototext.o \
 			testpdfio.o \
 			testttf.o
 TARGETS		=	\
 			$(LIBPDFIO) \
 			$(LIBPDFIO_STATIC) \
-			pdfiototext \
 			testpdfio \
 			testttf
+DOCFILES	=	\
+			doc/pdfio.html \
+			doc/pdfio-512.png \
+			LICENSE \
+			NOTICE
+EXAMPLES	=	\
+			examples/Makefile \
+			examples/Roboto-LICENSE.txt \
+			examples/Roboto-Bold.ttf \
+			examples/Roboto-Italic.ttf \
+			examples/Roboto-Regular.ttf \
+			examples/RobotoMono-Regular.ttf \
+			examples/code128.c \
+			examples/code128.ttf \
+			examples/code128-LICENSE.txt \
+			examples/image2pdf.c \
+			examples/md2pdf.c \
+			examples/md2pdf.md \
+			examples/mmd.c \
+			examples/mmd.h \
+			examples/pdf2text.c \
+			examples/pdfioinfo.c
 
 
 # Make everything
@@ -152,8 +172,13 @@ install:	$(TARGETS)
 	$(INSTALL) -c -m 644 pdfio.pc $(BUILDROOT)$(libdir)/pkgconfig
 	echo Installing documentation to $(BUILDROOT)$(datadir)/doc/pdfio...
 	$(INSTALL) -d -m 755 $(BUILDROOT)$(datadir)/doc/pdfio
-	for file in doc/pdfio.html doc/pdfio-512.png LICENSE NOTICE; do \
-		$(INSTALL) -c -m 644  $$file $(BUILDROOT)$(datadir)/doc/pdfio; \
+	for file in $(DOCFILES); do \
+		$(INSTALL) -c -m 644 $$file $(BUILDROOT)$(datadir)/doc/pdfio; \
+	done
+	echo Installing examples to $(BUILDROOT)$(datadir)/doc/pdfio/examples...
+	$(INSTALL) -d -m 755 $(BUILDROOT)$(datadir)/doc/pdfio/examples
+	for file in $(EXAMPLES); do \
+		$(INSTALL) -c -m 644 $$file $(BUILDROOT)$(datadir)/doc/pdfio/examples; \
 	done
 	echo Installing man page to $(BUILDROOT)$(mandir)/man3...
 	$(INSTALL) -d -m 755 $(BUILDROOT)$(mandir)/man3
@@ -201,12 +226,6 @@ pdfio1.def: $(LIBOBJS) Makefile
 		grep -v '^_ttf' | sed -e '1,$$s/^_//' | sort >>$@
 
 
-# pdfio text extraction (demo, doesn't handle a lot of things yet)
-pdfiototext:		pdfiototext.o libpdfio.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ pdfiototext.o libpdfio.a $(LIBS)
-
-
 # pdfio test program
 testpdfio:		testpdfio.o libpdfio.a
 	echo Linking $@...
@@ -229,7 +248,7 @@ ttf.o:			ttf.h
 # Make documentation using Codedoc <https://www.msweet.org/codedoc>
 DOCFLAGS	=	\
 			--author "Michael R Sweet" \
-			--copyright "Copyright (c) 2021-2024 by Michael R Sweet" \
+			--copyright "Copyright (c) 2021-2025 by Michael R Sweet" \
 			--docversion $(PDFIO_VERSION)
 
 .PHONY: doc

NOTICE

@@ -1,6 +1,6 @@
 PDFio - PDF Read/Write Library
 
-Copyright © 2021-2024 by Michael R Sweet.
+Copyright © 2021-2025 by Michael R Sweet.
 
 (Optional) Exceptions to the Apache 2.0 License:
 ================================================

README.md

@@ -89,7 +89,7 @@ generates a static library that will be installed under "/usr/local" with:
 Legal Stuff
 -----------
 
-PDFio is Copyright © 2021-2024 by Michael R Sweet.
+PDFio is Copyright © 2021-2025 by Michael R Sweet.
 
 This software is licensed under the Apache License Version 2.0 with an
 (optional) exception to allow linking against GPL2/LGPL2 software.  See the

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for pdfio 1.4.0.
+# Generated by GNU Autoconf 2.71 for pdfio 1.5.0.
 #
 # Report bugs to <https://github.com/michaelrsweet/pdfio/issues>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pdfio'
 PACKAGE_TARNAME='pdfio'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='pdfio 1.4.0'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='pdfio 1.5.0'
 PACKAGE_BUGREPORT='https://github.com/michaelrsweet/pdfio/issues'
 PACKAGE_URL='https://www.msweet.org/pdfio'
 
@@ -653,6 +653,7 @@ WARNINGS
 CSFLAGS
 LIBPDFIO_STATIC
 LIBPDFIO
+PKGCONFIG_LIBPNG
 PKGCONFIG_REQUIRES
 PKGCONFIG_LIBS_PRIVATE
 PKGCONFIG_LIBS
@@ -729,6 +730,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_libpng
 enable_static
 enable_shared
 enable_debug
@@ -1293,7 +1295,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pdfio 1.4.0 to adapt to many kinds of systems.
+\`configure' configures pdfio 1.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1359,7 +1361,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pdfio 1.4.0:";;
+     short | recursive ) echo "Configuration of pdfio 1.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,6 +1369,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-libpng         use libpng for pdfioFileCreateImageObjFromFile,
+                          default=auto
   --disable-static        do not install static library
   --enable-shared         install shared library
   --enable-debug          turn on debugging, default=no
@@ -1456,7 +1460,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pdfio configure 1.4.0
+pdfio configure 1.5.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1612,7 +1616,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pdfio $as_me 1.4.0, which was
+It was created by pdfio $as_me 1.5.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2368,9 +2372,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-PDFIO_VERSION="1.4.0"
-PDFIO_VERSION_MAJOR="`echo 1.4.0 | awk -F. '{print $1}'`"
-PDFIO_VERSION_MINOR="`echo 1.4.0 | awk -F. '{printf("%d\n",$2);}'`"
+PDFIO_VERSION="1.5.0"
+PDFIO_VERSION_MAJOR="`echo 1.5.0 | awk -F. '{print $1}'`"
+PDFIO_VERSION_MINOR="`echo 1.5.0 | awk -F. '{printf("%d\n",$2);}'`"
 
 
 
@@ -4099,6 +4103,55 @@ fi
 fi
 
 
+# Check whether --enable-libpng was given.
+if test ${enable_libpng+y}
+then :
+  enableval=$enable_libpng;
+fi
+
+
+PKGCONFIG_LIBPNG=""
+
+
+if test "x$PKGCONFIG" != x -a x$enable_libpng != xno
+then :
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng-1.6.x" >&5
+printf %s "checking for libpng-1.6.x... " >&6; }
+    if $PKGCONFIG --exists libpng16
+then :
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
+
+printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h
+
+	CPPFLAGS="$($PKGCONFIG --cflags libpng16) -DHAVE_LIBPNG=1 $CPPFLAGS"
+	LIBS="$($PKGCONFIG --libs libpng16) -lz $LIBS"
+	PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs libpng16) $PKGCONFIG_LIBS_PRIVATE"
+	PKGCONFIG_REQUIRES="libpng >= 1.6,$PKGCONFIG_REQUIRES"
+
+else $as_nop
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
+	if test x$enable_libpng = xyes
+then :
+
+	    as_fn_error $? "libpng-dev 1.6 or later required for --enable-libpng." "$LINENO" 5
+
+fi
+
+fi
+
+elif test x$enable_libpng = xyes
+then :
+
+    as_fn_error $? "libpng-dev 1.6 or later required for --enable-libpng." "$LINENO" 5
+
+fi
+
+
 # Check whether --enable-static was given.
 if test ${enable_static+y}
 then :
@@ -4935,7 +4988,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pdfio $as_me 1.4.0, which was
+This file was extended by pdfio $as_me 1.5.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4991,7 +5044,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-pdfio config.status 1.4.0
+pdfio config.status 1.5.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,7 +1,7 @@
 dnl
 dnl Configuration script for PDFio
 dnl
-dnl Copyright © 2023-2024 by Michael R Sweet
+dnl Copyright © 2023-2025 by Michael R Sweet
 dnl
 dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more
 dnl information.
@@ -21,7 +21,7 @@ AC_PREREQ([2.70])
 
 
 dnl Package name and version...
-AC_INIT([pdfio], [1.4.0], [https://github.com/michaelrsweet/pdfio/issues], [pdfio], [https://www.msweet.org/pdfio])
+AC_INIT([pdfio], [1.5.0], [https://github.com/michaelrsweet/pdfio/issues], [pdfio], [https://www.msweet.org/pdfio])
 
 PDFIO_VERSION="AC_PACKAGE_VERSION"
 PDFIO_VERSION_MAJOR="`echo AC_PACKAGE_VERSION | awk -F. '{print $1}'`"
@@ -121,6 +121,32 @@ AS_IF([$PKGCONFIG --exists zlib], [
 ])
 
 
+dnl libpng...
+AC_ARG_ENABLE([libpng], AS_HELP_STRING([--enable-libpng], [use libpng for pdfioFileCreateImageObjFromFile, default=auto]))
+
+PKGCONFIG_LIBPNG=""
+AC_SUBST([PKGCONFIG_LIBPNG])
+
+AS_IF([test "x$PKGCONFIG" != x -a x$enable_libpng != xno], [
+    AC_MSG_CHECKING([for libpng-1.6.x])
+    AS_IF([$PKGCONFIG --exists libpng16], [
+	AC_MSG_RESULT([yes]);
+	AC_DEFINE([HAVE_LIBPNG], 1, [Have PNG library?])
+	CPPFLAGS="$($PKGCONFIG --cflags libpng16) -DHAVE_LIBPNG=1 $CPPFLAGS"
+	LIBS="$($PKGCONFIG --libs libpng16) -lz $LIBS"
+	PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs libpng16) $PKGCONFIG_LIBS_PRIVATE"
+	PKGCONFIG_REQUIRES="libpng >= 1.6,$PKGCONFIG_REQUIRES"
+    ], [
+	AC_MSG_RESULT([no]);
+	AS_IF([test x$enable_libpng = xyes], [
+	    AC_MSG_ERROR([libpng-dev 1.6 or later required for --enable-libpng.])
+	])
+    ])
+], [test x$enable_libpng = xyes], [
+    AC_MSG_ERROR([libpng-dev 1.6 or later required for --enable-libpng.])
+])
+
+
 dnl Library target...
 AC_ARG_ENABLE([static], AS_HELP_STRING([--disable-static], [do not install static library]))
 AC_ARG_ENABLE([shared], AS_HELP_STRING([--enable-shared], [install shared library]))

examples/Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile for PDFio examples.
 #
-# Copyright © 2024 by Michael R Sweet.
+# Copyright © 2024-2025 by Michael R Sweet.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -14,8 +14,8 @@
 # Common options
 CFLAGS		=	-g $(CPPFLAGS)
 #CFLAGS		=	-g -fsanitize=address $(CPPFLAGS)
-CPPFLAGS	=	-I..
-LIBS		=	-L.. -lpdfio -lz
+CPPFLAGS	=	-I.. $(shell PKG_CONFIG_PATH="..:$(PKG_CONFIG_PATH)" pkg-config pdfio --cflags)
+LIBS		=	-L.. $(shell PKG_CONFIG_PATH="..:$(PKG_CONFIG_PATH)" pkg-config pdfio --libs)
 
 
 # Targets
@@ -23,6 +23,7 @@ TARGETS		=	\
 			code128 \
 			image2pdf \
 			md2pdf \
+			pdf2text \
 			pdfioinfo
 
 
@@ -50,6 +51,11 @@ md2pdf:		md2pdf.c mmd.c mmd.h
 	$(CC) $(CFLAGS) -o $@ md2pdf.c mmd.c $(LIBS)
 
 
+# pdfio text extraction (demo, doesn't handle a lot of things yet)
+pdf2text:	pdf2text.c
+	$(CC) $(CFLAGS) -o $@ pdf2text.c $(LIBS)
+
+
 # pdfioinfo
 pdfioinfo:	pdfioinfo.c
 	$(CC) $(CFLAGS) -o $@ pdfioinfo.c $(LIBS)

examples/Roboto-LICENSE.txt

@@ -0,0 +1,93 @@
+Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

examples/code128-LICENSE.txt

@@ -0,0 +1,343 @@
+Copyright 2003 Grandzebu, All Rights Reserved
+
+http://grandzebu.net/informatique/codbar-en/code128.htm
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

examples/image2pdf.c

@@ -1,7 +1,7 @@
 //
 // Image example for PDFio.
 //
-// Copyright © 2023-2024 by Michael R Sweet.
+// Copyright © 2023-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -22,8 +22,8 @@
 
 bool					// O - True on success, false on failure
 create_pdf_image_file(
-    const char *pdfname,		// I - PDF filename
     const char *imagename,		// I - Image filename
+    const char *pdfname,		// I - PDF filename
     const char *caption)		// I - Caption filename
 {
   pdfio_file_t   *pdf;			// PDF file
@@ -36,6 +36,15 @@ create_pdf_image_file(
   double         tx, ty;		// Position on page
 
 
+  // Default the caption...
+  if (!caption)
+  {
+    if ((caption = strrchr(imagename, '/')) != NULL)
+      caption ++;
+    else
+      caption = imagename;
+  }
+
   // Create the PDF file...
   pdf = pdfioFileCreate(pdfname, /*version*/NULL, /*media_box*/NULL,
                         /*crop_box*/NULL, /*error_cb*/NULL,

examples/md2pdf.c

@@ -101,15 +101,25 @@ typedef struct doctoc_s			// Document table-of-contents entry
 
 typedef struct docdata_s		// Document formatting data
 {
+  // State for the whole document
   pdfio_file_t	*pdf;			// PDF file
   pdfio_rect_t	media_box;		// Media (page) box
   pdfio_rect_t	crop_box;		// Crop box (for margins)
   pdfio_rect_t	art_box;		// Art box (for markdown content)
   pdfio_obj_t	*fonts[DOCFONT_MAX];	// Embedded fonts
+  double	font_space;		// Unit width of a space
   size_t	num_images;		// Number of embedded images
   docimage_t	images[DOCIMAGE_MAX];	// Embedded images
   const char	*title;			// Document title
   char		*heading;		// Current document heading
+  size_t	num_actions;		// Number of actions for this document
+  docaction_t	actions[DOCACTION_MAX];	// Actions for this document
+  size_t	num_targets;		// Number of targets for this document
+  doctarget_t	targets[DOCTARGET_MAX];	// Targets for this document
+  size_t	num_toc;		// Number of table-of-contents entries
+  doctoc_t	toc[DOCTOC_MAX];	// Table-of-contents entries
+
+  // State for the current page
   pdfio_stream_t *st;			// Current page stream
   double	y;			// Current position on page
   docfont_t	font;			// Current font
@@ -119,12 +129,6 @@ typedef struct docdata_s		// Document formatting data
   pdfio_obj_t	*annots_obj;		// Annotations object (for links)
   size_t	num_links;		// Number of links for this page
   doclink_t	links[DOCLINK_MAX];	// Links for this page
-  size_t	num_actions;		// Number of actions for this document
-  docaction_t	actions[DOCACTION_MAX];	// Actions for this document
-  size_t	num_targets;		// Number of targets for this document
-  doctarget_t	targets[DOCTARGET_MAX];	// Targets for this document
-  size_t	num_toc;		// Number of table-of-contents entries
-  doctoc_t	toc[DOCTOC_MAX];	// Table-of-contents entries
 } docdata_t;
 
 typedef struct linefrag_s		// Line fragment
@@ -205,10 +209,17 @@ static const char * const docfont_names[] =
   "FM"
 };
 
+#define BQ_PADDING	18.0		// Padding for block quotes
+#define BQ_THICKNESS	3.0		// Thickness of block quote bar
+
+#define CODE_PADDING	4.5		// Padding for code blocks
+
 #define IMAGE_PPI	100.0		// Pixels per inch for images
 
 #define LINE_HEIGHT	1.4		// Multiplier for line height
 
+#define LIST_PADDING	36.0		// Padding/indentation for lists
+
 #define SIZE_BODY	11.0		// Size of body text (points)
 #define SIZE_CODEBLOCK	10.0		// Size of code block text (points)
 #define SIZE_HEADFOOT	9.0		// Size of header/footer text (points)
@@ -251,7 +262,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 need_bottom, 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);
@@ -302,7 +313,8 @@ main(int  argc,				// I - Number of command-line arguments
   dd.art_box.x2  = PAGE_RIGHT;
   dd.art_box.y2  = PAGE_TOP;
 
-  dd.title       = mmdGetMetadata(doc, "title");
+  if ((dd.title = mmdGetMetadata(doc, "title")) == NULL)
+    dd.art_box.y2 = PAGE_HEADER;	// No header if there is no title
 
   if (argc == 2)
   {
@@ -345,6 +357,8 @@ main(int  argc,				// I - Number of command-line arguments
 #endif // USE_TRUETYPE
   }
 
+  dd.font_space = pdfioContentTextMeasure(dd.fonts[DOCFONT_REGULAR], " ", 1.0);
+
   // Add images...
   add_images(&dd, doc);
 
@@ -566,7 +580,6 @@ format_block(docdata_t  *dd,		// I - Document data
 		width,			// Width of current fragment
 		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
@@ -574,11 +587,6 @@ format_block(docdata_t  *dd,		// I - Document data
 
   blocktype  = mmdGetType(block);
 
-  if ((blocktype >= MMD_TYPE_TABLE_HEADER_CELL && blocktype <= MMD_TYPE_TABLE_BODY_CELL_RIGHT) || blocktype == MMD_TYPE_LIST_ITEM)
-    margin_top = 0.0;
-  else
-    margin_top = fsize * LINE_HEIGHT;
-
   if (mmdGetNextSibling(block))
     need_bottom = 3.0 * SIZE_BODY * LINE_HEIGHT;
   else
@@ -587,12 +595,16 @@ format_block(docdata_t  *dd,		// I - Document data
   if (leader)
   {
     // Add leader text on first line...
-    frags[0].width  = pdfioContentTextMeasure(dd->fonts[deffont], leader, fsize);
-    frags[0].height = fsize;
-    frags[0].x      = left - frags[0].width;
-    frags[0].text   = leader;
-    frags[0].font   = deffont;
-    frags[0].color  = DOCCOLOR_BLACK;
+    frags[0].type     = MMD_TYPE_NORMAL_TEXT;
+    frags[0].width    = pdfioContentTextMeasure(dd->fonts[deffont], leader, fsize);
+    frags[0].height   = fsize;
+    frags[0].x        = left - frags[0].width;
+    frags[0].imagenum = 0;
+    frags[0].text     = leader;
+    frags[0].url      = NULL;
+    frags[0].ws       = false;
+    frags[0].font     = deffont;
+    frags[0].color    = DOCCOLOR_BLACK;
 
     num_frags  = 1;
     lineheight = fsize * LINE_HEIGHT;
@@ -616,7 +628,7 @@ format_block(docdata_t  *dd,		// I - Document data
     imagenum = 0;
     url      = mmdGetURL(current);
     ws       = mmdGetWhitespace(current);
-    wswidth  = 0.0;
+    wswidth  = ws ? dd->font_space * fsize : 0.0;
     next     = mmd_walk_next(block, current);
 
     // Process the node...
@@ -653,25 +665,20 @@ 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, need_bottom, lineheight, num_frags, frags);
 
       if (deffont == DOCFONT_ITALIC)
       {
         // Add an orange bar to the left of block quotes...
         set_color(dd, DOCCOLOR_ORANGE);
-        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);
+        pdfioContentPathRect(dd->st, left - BQ_PADDING, dd->y - (LINE_HEIGHT - 1.0) * fsize - BQ_THICKNESS, BQ_THICKNESS, lineheight + 2.0 * BQ_THICKNESS);
+        pdfioContentFill(dd->st, /*even_odd*/false);
       }
 
       num_frags   = 0;
       frag        = frags;
       x           = left;
       lineheight  = 0.0;
-      margin_top  = 0.0;
       need_bottom = 0.0;
 
       continue;
@@ -706,9 +713,6 @@ format_block(docdata_t  *dd,		// I - Document data
 
       width  = pdfioContentTextMeasure(dd->fonts[font], text, fsize);
       height = fsize * LINE_HEIGHT;
-
-      if (ws)
-	wswidth = pdfioContentTextMeasure(dd->fonts[font], " ", fsize);
     }
 
     // See if this node will fit on the current line...
@@ -722,7 +726,13 @@ 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, need_bottom, lineheight, num_frags, frags);
+
+      num_frags   = 0;
+      frag        = frags;
+      x           = left;
+      lineheight  = 0.0;
+      need_bottom = 0.0;
 
       if (deffont == DOCFONT_ITALIC)
       {
@@ -735,18 +745,12 @@ format_block(docdata_t  *dd,		// I - Document data
         pdfioContentStroke(dd->st);
         pdfioContentRestore(dd->st);
       }
-
-      num_frags   = 0;
-      frag        = frags;
-      x           = left;
-      lineheight  = 0.0;
-      margin_top  = 0.0;
-      need_bottom = 0.0;
     }
 
     // Add the current node to the fragment list
     if (num_frags == 0)
     {
+      // No leading whitespace at the start of the line
       ws      = false;
       wswidth = 0.0;
     }
@@ -778,7 +782,7 @@ 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, need_bottom, lineheight, num_frags, frags);
 
     if (deffont == DOCFONT_ITALIC)
     {
@@ -809,19 +813,27 @@ format_code(docdata_t *dd,		// I - Document data
   double	lineheight;		// Line height
 
 
+  // Compute line height...
+  lineheight = SIZE_CODEBLOCK * LINE_HEIGHT;
+
   // Start a new page as needed...
   if (!dd->st)
     new_page(dd);
 
-  lineheight = SIZE_CODEBLOCK * LINE_HEIGHT;
-  dd->y      -= 2.0 * lineheight;
+  dd->y -= lineheight + CODE_PADDING;
+
   if ((dd->y - lineheight) < dd->art_box.y1)
   {
     new_page(dd);
 
-    dd->y -= lineheight;
+    dd->y -= lineheight + CODE_PADDING;
   }
 
+  // Draw the top padding...
+  set_color(dd, DOCCOLOR_LTGRAY);
+  pdfioContentPathRect(dd->st, left - CODE_PADDING, dd->y + SIZE_CODEBLOCK, right - left + 2.0 * CODE_PADDING, CODE_PADDING);
+  pdfioContentFillAndStroke(dd->st, false);
+
   // Start a code text block...
   set_font(dd, DOCFONT_MONOSPACE, SIZE_CODEBLOCK);
   pdfioContentTextBegin(dd->st);
@@ -830,7 +842,7 @@ format_code(docdata_t *dd,		// I - Document data
   for (code = mmdGetFirstChild(block); code; code = mmdGetNextSibling(code))
   {
     set_color(dd, DOCCOLOR_LTGRAY);
-    pdfioContentPathRect(dd->st, left - 3.0, dd->y - (LINE_HEIGHT - 1.0) * SIZE_CODEBLOCK, right - left + 6.0, lineheight);
+    pdfioContentPathRect(dd->st, left - CODE_PADDING, dd->y - (LINE_HEIGHT - 1.0) * SIZE_CODEBLOCK, right - left + 2.0 * CODE_PADDING, lineheight);
     pdfioContentFillAndStroke(dd->st, false);
 
     set_color(dd, DOCCOLOR_RED);
@@ -856,6 +868,11 @@ format_code(docdata_t *dd,		// I - Document data
   // End the current text block...
   pdfioContentTextEnd(dd->st);
   dd->y += lineheight;
+
+  // Draw the bottom padding...
+  set_color(dd, DOCCOLOR_LTGRAY);
+  pdfioContentPathRect(dd->st, left - CODE_PADDING, dd->y - CODE_PADDING - (LINE_HEIGHT - 1.0) * SIZE_CODEBLOCK, right - left + 2.0 * CODE_PADDING, CODE_PADDING);
+  pdfioContentFillAndStroke(dd->st, false);
 }
 
 
@@ -901,15 +918,14 @@ format_doc(docdata_t *dd,		// I - Document data
           break;
 
       case MMD_TYPE_BLOCK_QUOTE :
-          format_doc(dd, current, DOCFONT_ITALIC, left + 36.0, right - 36.0);
+          format_doc(dd, current, DOCFONT_ITALIC, left + BQ_PADDING, right - BQ_PADDING);
           break;
 
       case MMD_TYPE_ORDERED_LIST :
       case MMD_TYPE_UNORDERED_LIST :
-          if (dd->st)
-            dd->y -= SIZE_BODY * LINE_HEIGHT;
+	  dd->y -= SIZE_BODY * LINE_HEIGHT;
 
-          format_doc(dd, current, deffont, left + 36.0, right);
+          format_doc(dd, current, deffont, left + LIST_PADDING, right);
           break;
 
       case MMD_TYPE_LIST_ITEM :
@@ -930,12 +946,17 @@ format_doc(docdata_t *dd,		// I - Document data
       case MMD_TYPE_HEADING_4 :
       case MMD_TYPE_HEADING_5 :
       case MMD_TYPE_HEADING_6 :
+          // Update the current heading
           free(dd->heading);
-
           dd->heading = mmdCopyAllText(current);
 
+          // Add a blank line before the heading...
+	  dd->y -= heading_sizes[curtype - MMD_TYPE_HEADING_1] * LINE_HEIGHT;
+
+	  // Format the heading...
           format_block(dd, current, DOCFONT_BOLD, heading_sizes[curtype - MMD_TYPE_HEADING_1], left, right, /*leader*/NULL);
 
+          // Add the heading to the table-of-contents...
           if (dd->num_toc < DOCTOC_MAX)
           {
             doctoc_t *t = dd->toc + dd->num_toc;
@@ -959,6 +980,7 @@ format_doc(docdata_t *dd,		// I - Document data
             dd->num_toc ++;
           }
 
+	  // Add the heading to the list of link targets...
           if (dd->num_targets < DOCTARGET_MAX)
           {
             doctarget_t *t = dd->targets + dd->num_targets;
@@ -973,15 +995,27 @@ format_doc(docdata_t *dd,		// I - Document data
           break;
 
       case MMD_TYPE_PARAGRAPH :
+          // Add a blank line before the paragraph...
+	  dd->y -= SIZE_BODY * LINE_HEIGHT;
+
+	  // Format the paragraph...
           format_block(dd, current, deffont, SIZE_BODY, left, right, /*leader*/NULL);
           break;
 
       case MMD_TYPE_TABLE :
+          // Add a blank line before the paragraph...
+	  dd->y -= SIZE_BODY * LINE_HEIGHT;
+
+	  // Format the table...
           format_table(dd, current, left, right);
           break;
 
       case MMD_TYPE_CODE_BLOCK :
-          format_code(dd, current, left + 36.0, right - 36.0);
+          // Add a blank line before the code block...
+	  dd->y -= SIZE_BODY * LINE_HEIGHT;
+
+	  // Format the code block...
+          format_code(dd, current, left + CODE_PADDING, right - CODE_PADDING);
           break;
     }
   }
@@ -1015,14 +1049,10 @@ format_table(docdata_t *dd,		// I - Document data
 
 
   // Find all of the rows and columns in the table...
-  num_cols = num_rows = 0;
-
   memset(cols, 0, sizeof(cols));
   memset(rows, 0, sizeof(rows));
 
-  rowptr = rows;
-
-  for (current = mmdGetFirstChild(table); current && num_rows < TABLEROW_MAX; current = next)
+  for (num_cols = 0, num_rows = 0, rowptr = rows, current = mmdGetFirstChild(table); current && num_rows < TABLEROW_MAX; current = next)
   {
     next = mmd_walk_next(table, current);
     type = mmdGetType(current);
@@ -1114,9 +1144,6 @@ format_table(docdata_t *dd,		// I - Document data
   }
 
   // Render each table row...
-  if (dd->st)
-    dd->y -= SIZE_TABLE * LINE_HEIGHT;
-
   for (row = 0, rowptr = rows; row < num_rows; row ++, rowptr ++)
     render_row(dd, num_cols, cols, rowptr);
 }
@@ -1338,15 +1365,15 @@ new_page(docdata_t *dd)			// I - Document data
 
   // Prep the new page...
   page_dict = pdfioDictCreate(dd->pdf);
+
   dd->annots_array = pdfioArrayCreate(dd->pdf);
   dd->annots_obj   = pdfioFileCreateArrayObj(dd->pdf, dd->annots_array);
+  pdfioDictSetObj(page_dict, "Annots", dd->annots_obj);
 
   pdfioDictSetRect(page_dict, "MediaBox", &dd->media_box);
 //  pdfioDictSetRect(page_dict, "CropBox", &dd->crop_box);
   pdfioDictSetRect(page_dict, "ArtBox", &dd->art_box);
 
-  pdfioDictSetObj(page_dict, "Annots", dd->annots_obj);
-
   for (fontface = DOCFONT_REGULAR; fontface < DOCFONT_MAX; fontface ++)
     pdfioPageDictAddFont(page_dict, docfont_names[fontface], dd->fonts[fontface]);
 
@@ -1443,7 +1470,6 @@ output_cb(void       *output_cbdata,	// I - Callback data (not used)
 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
@@ -1455,12 +1481,9 @@ render_line(docdata_t  *dd,		// I - Document data
 
 
   if (!dd->st)
-  {
     new_page(dd);
-    margin_top = 0.0;
-  }
 
-  dd->y -= margin_top + lineheight;
+  dd->y -= lineheight;
   if ((dd->y - need_bottom) < dd->art_box.y1)
   {
     new_page(dd);
@@ -1499,9 +1522,6 @@ render_line(docdata_t  *dd,		// I - Document data
     else if (frag->text)
     {
       // Draw text
-      set_color(dd, frag->color);
-      set_font(dd, frag->font, frag->height);
-
       if (!in_text)
       {
 	pdfioContentTextBegin(dd->st);
@@ -1510,10 +1530,19 @@ render_line(docdata_t  *dd,		// I - Document data
 	in_text = true;
       }
 
-      if (frag->ws)
-	pdfioContentTextShowf(dd->st, UNICODE_VALUE, " %s", frag->text);
-      else
+      if (frag->ws && frag->font == DOCFONT_MONOSPACE)
+      {
+	set_font(dd, DOCFONT_REGULAR, frag->height);
+	pdfioContentTextShow(dd->st, UNICODE_VALUE, " ");
+      }
+
+      set_color(dd, frag->color);
+      set_font(dd, frag->font, frag->height);
+
+      if (frag->font == DOCFONT_MONOSPACE)
 	pdfioContentTextShow(dd->st, UNICODE_VALUE, frag->text);
+      else
+	pdfioContentTextShowf(dd->st, UNICODE_VALUE, "%s%s", frag->ws ? " " : "", frag->text);
 
       if (frag->url && dd->num_links < DOCLINK_MAX)
       {

examples/md2pdf.md

@@ -1,22 +1,10 @@
 ---
-title: Markdown to PDF Converter Example
+title: Markdown to PDF Converter Test File
 ...
 
-Markdown to PDF Converter Example
-=================================
 
-The `md2pdf` example program reads a markdown file and formats the content onto
-pages in a PDF file.  It demonstrates how to:
-
-- Embed base and TrueType fonts,
-- Format text,
-- Embed JPEG and PNG images,
-- Add headers and footers, and
-- Add hyperlinks.
-
-
-Source Files
-------------
+Markdown to PDF Converter Test File
+===================================
 
 The `md2pdf` program is organized into three source files: `md2pdf.c` which
 contains the code to format the markdown content and `mmd.h` and `mmd.c` (from
@@ -24,4 +12,73 @@ the [Miniature Markdown Library][MMD] project) which load the markdown content.
 
 [MMD]: https://www.msweet.org/mmd/
 
+This is a test file for `md2pdf`.  Here is a bullet list:
 
+- Embed base and TrueType fonts,
+- Format text with embedded JPEG and PNG images and check boxes, with support
+  for wrapping, alignment in table cells, leader text (as used for lists), and
+  variable line height,
+- Add headers and footers, and
+- Add hyperlinks and document platform.
+
+And here is an ordered list:
+
+1. Embed base and TrueType fonts,
+2. Format text with embedded JPEG and PNG images and check boxes, with support
+   for wrapping, alignment in table cells, leader text (as used for lists), and
+   variable line height,
+3. Add headers and footers, and
+4. Add hyperlinks and document platform.
+
+
+Code Blocks
+-----------
+
+```
+0        1         2         3         4         5         6         7         8
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+```
+
+
+Images
+------
+
+PDFio book cover image:
+
+![PDFio](../doc/pdfio-epub.png)
+
+
+Tables
+------
+
+Table with leading/trailing pipes:
+
+| Heading 1 | Heading 2 | Heading 3 |
+| --------- | --------- | --------- |
+| Cell 1,1  | Cell 1,2  | Cell 1,3  |
+| Cell 2,1  | Cell 2,2  | Cell 2,3  |
+| Cell 3,1  | Cell 3,2  | Cell 3,3  |
+
+Table without leading/trailing pipes:
+
+Heading 1 | Heading 2 | Heading 3
+--------- | --------- | ---------
+Cell 1,1  | Cell 1,2  | Cell 1,3
+Cell 2,1  | Cell 2,2  | Cell 2,3
+Cell 3,1  | Cell 3,2  | Cell 3,3
+
+Table with alignment:
+
+Left Alignment | Center Alignment | Right Alignment
+:-------- | :-------: | --------:
+Cell 1,1  | Cell 1,2  |        1
+Cell 2,1  | Cell 2,2  |       12
+Cell 3,1  | Cell 3,2  |      123
+
+Table in block quote:
+
+> Heading 1 | Heading 2 | Heading 3
+> --------- | --------- | ---------
+> Cell 1,1  | Cell 1,2  | Cell 1,3
+> Cell 2,1  | Cell 2,2  | Cell 2,3
+> Cell 3,1  | Cell 3,2  | Cell 3,3

examples/pdfioinfo.c

@@ -1,7 +1,7 @@
 //
 // PDF metadata example for PDFio.
 //
-// Copyright © 2023-2024 by Michael R Sweet.
+// Copyright © 2023-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -13,6 +13,7 @@
 
 #include <pdfio.h>
 #include <time.h>
+#include <math.h>
 
 
 //
@@ -25,9 +26,26 @@ main(int  argc,				// I - Number of command-line arguments
 {
   const char	*filename;		// PDF filename
   pdfio_file_t	*pdf;			// PDF file
-  time_t	creation_date;		// Creation date
-  struct tm	*creation_tm;		// Creation date/time information
-  char		creation_text[256];	// Creation date/time as a string
+  pdfio_dict_t	*catalog;		// Catalog dictionary
+  const char	*author,		// Author name
+  		*creator,		// Creator name
+  		*producer,		// Producer name
+		*title;			// Title
+  time_t	creation_date,		// Creation date
+		modification_date;	// Modification date
+  struct tm	*creation_tm,		// Creation date/time information
+		*modification_tm;	// Modification date/time information
+  char		creation_text[256],	// Creation date/time as a string
+		modification_text[256],	// Modification date/time human fmt string
+		range_text[255];	// Page range text
+  size_t	num_pages;		// PDF number of pages
+  bool		has_acroform;		// Does the file have an AcroForm?
+  pdfio_obj_t	*page;			// Object
+  pdfio_dict_t	*page_dict;		// Object dictionary
+  size_t	cur,			// Current page index
+		prev;			// Previous page index
+  pdfio_rect_t	cur_box,		// Current MediaBox
+		prev_box;		// Previous MediaBox
 
 
   // Get the filename from the command-line...
@@ -46,17 +64,96 @@ main(int  argc,				// I - Number of command-line arguments
   if (pdf == NULL)
     return (1);
 
+  // Get the title, author, etc...
+  catalog      = pdfioFileGetCatalog(pdf);
+  author       = pdfioFileGetAuthor(pdf);
+  creator      = pdfioFileGetCreator(pdf);
+  has_acroform = pdfioDictGetObj(catalog, "AcroForm") != NULL ? true : false;
+  num_pages    = pdfioFileGetNumPages(pdf);
+  producer     = pdfioFileGetProducer(pdf);
+  title        = pdfioFileGetTitle(pdf);
+
   // Get the creation date and convert to a string...
-  creation_date = pdfioFileGetCreationDate(pdf);
-  creation_tm   = localtime(&creation_date);
-  strftime(creation_text, sizeof(creation_text), "%c", creation_tm);
+  if ((creation_date = pdfioFileGetCreationDate(pdf)) > 0)
+  {
+    creation_tm   = localtime(&creation_date);
+    strftime(creation_text, sizeof(creation_text), "%c", creation_tm);
+  }
+  else
+  {
+    snprintf(creation_text, sizeof(creation_text), "-- not set --");
+  }
+
+  // Get the modification date and convert to a string...
+  if ((modification_date = pdfioFileGetModificationDate(pdf)) > 0)
+  {
+    modification_tm = localtime(&modification_date);
+    strftime(modification_text, sizeof(modification_text), "%c", modification_tm);
+  }
+  else
+  {
+    snprintf(modification_text, sizeof(modification_text), "-- not set --");
+  }
 
   // Print file information to stdout...
   printf("%s:\n", filename);
-  printf("         Title: %s\n", pdfioFileGetTitle(pdf));
-  printf("        Author: %s\n", pdfioFileGetAuthor(pdf));
-  printf("    Created On: %s\n", creation_text);
-  printf("  Number Pages: %u\n", (unsigned)pdfioFileGetNumPages(pdf));
+  printf("           Title: %s\n", title ? title : "-- not set --");
+  printf("          Author: %s\n", author ? author : "-- not set --");
+  printf("         Creator: %s\n", creator ? creator : "-- not set --");
+  printf("        Producer: %s\n", producer ? producer : "-- not set --");
+  printf("      Created On: %s\n", creation_text);
+  printf("     Modified On: %s\n", modification_text);
+  printf("         Version: %s\n", pdfioFileGetVersion(pdf));
+  printf("        AcroForm: %s\n", has_acroform ? "Yes" : "No");
+  printf(" Number of Pages: %u\n", (unsigned)num_pages);
+
+  // Report the MediaBox for all of the pages
+  prev_box.x1 = prev_box.x2 = prev_box.y1 = prev_box.y2 = 0.0;
+
+  for (cur = 0, prev = 0; cur < num_pages; cur ++)
+  {
+    // Find the MediaBox for this page in the page tree...
+    for (page = pdfioFileGetPage(pdf, cur);
+         page != NULL;
+         page = pdfioDictGetObj(page_dict, "Parent"))
+    {
+      cur_box.x1 = cur_box.x2 = cur_box.y1 = cur_box.y2 = 0.0;
+      page_dict  = pdfioObjGetDict(page);
+
+      if (pdfioDictGetRect(page_dict, "MediaBox", &cur_box))
+        break;
+    }
+
+    // If this MediaBox is different from the previous one, show the range of
+    // pages that have that size...
+    if (cur == 0 ||
+        fabs(cur_box.x1 - prev_box.x1) > 0.01 ||
+        fabs(cur_box.y1 - prev_box.y1) > 0.01 ||
+        fabs(cur_box.x2 - prev_box.x2) > 0.01 ||
+        fabs(cur_box.y2 - prev_box.y2) > 0.01)
+    {
+      if (cur > prev)
+      {
+        snprintf(range_text, sizeof(range_text), "Pages %u-%u",
+                 (unsigned)(prev + 1), (unsigned)cur);
+        printf("%16s: [%g %g %g %g]\n", range_text,
+               prev_box.x1, prev_box.y1, prev_box.x2, prev_box.y2);
+      }
+
+      // Start a new series of pages with the new size...
+      prev     = cur;
+      prev_box = cur_box;
+    }
+  }
+
+  // Show the last range as needed...
+  if (cur > prev)
+  {
+    snprintf(range_text, sizeof(range_text), "Pages %u-%u",
+	     (unsigned)(prev + 1), (unsigned)cur);
+    printf("%16s: [%g %g %g %g]\n", range_text,
+	   prev_box.x1, prev_box.y1, prev_box.x2, prev_box.y2);
+  }
 
   // Close the PDF file...
   pdfioFileClose(pdf);

makesrcdist

@@ -21,31 +21,60 @@ if test $# != 1; then
     exit 1
 fi
 
+status=0
 version=$1
+version_major=$(echo $1 | awk -F. '{print $1}')
+version_minor=$(echo $1 | awk -F. '{print $2}')
 
 # Check that version number has been updated everywhere...
 if test $(grep AC_INIT configure.ac | awk '{print $2}') != "[$version],"; then
     echo "Still need to update AC_INIT version in 'configure.ac'."
-    exit 1
+    status=1
+fi
+
+if test $(head -4 CHANGES.md | tail -1 | awk '{print $1}') != "v$version"; then
+    echo "Still need to update CHANGES.md version number."
+    status=1
+fi
+if test $(head -4 CHANGES.md | tail -1 | awk '{print $3}') = "YYYY-MM-DD"; then
+    echo "Still need to update CHANGES.md release date."
+    status=1
 fi
 
 if test $(grep PDFIO_VERSION= configure | awk -F \" '{print $2}') != "$version"; then
     echo "Still need to run 'autoconf -f'."
-    exit 1
+    status=1
 fi
 
 if test $(grep '<version>' pdfio_native.nuspec | sed -E -e '1,$s/^.*<version>([0-9.]+).*$/\1/') != "$version"; then
     echo "Still need to update version in 'pdfio_native.nuspec'."
-    exit 1
+    status=1
 fi
 
 if test $(grep '<version>' pdfio_native.redist.nuspec | sed -E -e '1,$s/^.*<version>([0-9.]+).*$/\1/') != "$version"; then
     echo "Still need to update version in 'pdfio_native.redist.nuspec'."
-    exit 1
+    status=1
 fi
 
 if test $(grep PDFIO_VERSION pdfio.h | awk -F \" '{print $2}') != "$version"; then
     echo "Still need to update PDFIO_VERSION in 'pdfio.h'."
+    status=1
+fi
+if test $(grep PDFIO_VERSION_MAJOR pdfio.h | awk '{print $4}') != "$version_major"; then
+    echo "Still need to update PDFIO_VERSION_MAJOR in 'pdfio.h'."
+    status=1
+fi
+if test $(grep PDFIO_VERSION_MINOR pdfio.h | awk '{print $4}') != "$version_minor"; then
+    echo "Still need to update PDFIO_VERSION_MINOR in 'pdfio.h'."
+    status=1
+fi
+
+if test $(grep VERSION pdfio1.def | awk '{print $2}') != "$version_major.$version_minor"; then
+    echo "Still need to update VERSION in 'pdfio1.def'."
+    status=1
+fi
+
+if test $status = 1; then
     exit 1
 fi
 

packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="libpng_native" version="1.6.30" targetFramework="native" />
+  <package id="libpng_native.redist" version="1.6.30" targetFramework="native" />
   <package id="zlib_native" version="1.2.11" targetFramework="native" />
   <package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
 </packages>

pdfio-aes.c

@@ -1,7 +1,7 @@
 //
 // AES functions for PDFio.
 //
-// Copyright © 2021 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -76,18 +76,18 @@ static const uint8_t Rcon[11] =		// Round constants
 // Local functions...
 //
 
-static void	AddRoundKey(size_t round, state_t *state, const uint8_t *RoundKey);
-static void	SubBytes(state_t *state);
-static void	ShiftRows(state_t *state);
+static void	add_round_key(size_t round, state_t *state, const uint8_t *round_key);
+static void	sub_bytes(state_t *state);
+static void	shift_rows(state_t *state);
 static uint8_t	xtime(uint8_t x);
-static void	MixColumns(state_t *state);
-static uint8_t	Multiply(uint8_t x, uint8_t y);
-static void	InvMixColumns(state_t *state);
-static void	InvSubBytes(state_t *state);
-static void	InvShiftRows(state_t *state);
-static void	Cipher(state_t *state, const _pdfio_aes_t *ctx);
-static void	InvCipher(state_t *state, const _pdfio_aes_t *ctx);
-static void	XorWithIv(uint8_t *buf, const uint8_t *Iv);
+static void	mix_columns(state_t *state);
+static uint8_t	multiply(uint8_t x, uint8_t y);
+static void	inv_mix_columns(state_t *state);
+static void	inv_sub_bytes(state_t *state);
+static void	inv_shift_rows(state_t *state);
+static void	cipher(state_t *state, const _pdfio_aes_t *ctx);
+static void	inv_cipher(state_t *state, const _pdfio_aes_t *ctx);
+static void	xor_with_iv(uint8_t *buf, const uint8_t *Iv);
 
 
 //
@@ -106,7 +106,6 @@ _pdfioCryptoAESInit(
 		*rkptr,			// Current round_key values
 		*rkend,			// End of round_key values
 		tempa[4];		// Used for the column/row operations
-//  size_t	roundlen = keylen + 24;	// Length of round_key
   size_t	nwords = keylen / 4;	// Number of 32-bit words in key
 
 
@@ -188,8 +187,8 @@ _pdfioCryptoAESDecrypt(
   while (len > 15)
   {
     memcpy(next_iv, outbuffer, 16);
-    InvCipher((state_t *)outbuffer, ctx);
-    XorWithIv(outbuffer, ctx->iv);
+    inv_cipher((state_t *)outbuffer, ctx);
+    xor_with_iv(outbuffer, ctx->iv);
     memcpy(ctx->iv, next_iv, 16);
     outbuffer += 16;
     len -= 16;
@@ -231,8 +230,8 @@ _pdfioCryptoAESEncrypt(
 
   while (len > 15)
   {
-    XorWithIv(outbuffer, iv);
-    Cipher((state_t*)outbuffer, ctx);
+    xor_with_iv(outbuffer, iv);
+    cipher((state_t*)outbuffer, ctx);
     iv = outbuffer;
     outbuffer += 16;
     len -= 16;
@@ -242,10 +241,10 @@ _pdfioCryptoAESEncrypt(
   if (len > 0)
   {
     // Pad the final buffer with (16 - len)...
-    memset(outbuffer + len, 16 - len, 16 - len);
+    memset(outbuffer + len, (int)(16 - len), 16 - len);
 
-    XorWithIv(outbuffer, iv);
-    Cipher((state_t*)outbuffer, ctx);
+    xor_with_iv(outbuffer, iv);
+    cipher((state_t*)outbuffer, ctx);
     iv = outbuffer;
     outbytes += 16;
   }
@@ -257,24 +256,32 @@ _pdfioCryptoAESEncrypt(
 }
 
 
-// This function adds the round key to state.
+//
+// 'add_round_key()' - Add the round key to state.
+//
 // The round key is added to the state by an XOR function.
+//
+
 static void
-AddRoundKey(size_t round, state_t *state, const uint8_t *RoundKey)
+add_round_key(size_t        round,	// I - Which round
+              state_t       *state,	// I - Current state
+              const uint8_t *round_key)	// I - Key
 {
   unsigned	i;			// Looping var
   uint8_t	*sptr = (*state)[0];	// Pointer into state
 
 
-  for (RoundKey += round * 16, i = 16; i > 0; i --, sptr ++, RoundKey ++)
-    *sptr ^= *RoundKey;
+  for (round_key += round * 16, i = 16; i > 0; i --, sptr ++, round_key ++)
+    *sptr ^= *round_key;
 }
 
 
-// The SubBytes Function Substitutes the values in the
-// state matrix with values in an S-box.
+//
+// 'sub_bytes()' - Substitute the values in the state matrix with values in an S-box.
+//
+
 static void
-SubBytes(state_t *state)
+sub_bytes(state_t *state)		// I - Current state
 {
   unsigned	i;			// Looping var
   uint8_t	*sptr = (*state)[0];	// Pointer into state
@@ -284,11 +291,16 @@ SubBytes(state_t *state)
     *sptr = sbox[*sptr];
 }
 
-// The ShiftRows() function shifts the rows in the state to the left.
+
+//
+// 'shift_rows()' - Shift the rows in the state to the left.
+//
 // Each row is shifted with different offset.
 // Offset = Row number. So the first row is not shifted.
+//
+
 static void
-ShiftRows(state_t *state)
+shift_rows(state_t *state)		// I - Current state
 {
   uint8_t	*sptr = (*state)[0];	// Pointer into state
   uint8_t	temp;			// Temporary value
@@ -319,21 +331,29 @@ ShiftRows(state_t *state)
 }
 
 
-static uint8_t
-xtime(uint8_t x)
+//
+// 'xtime()' - Compute the AES xtime function.
+//
+
+static uint8_t				// O - xtime(x)
+xtime(uint8_t x)			// I - Column value
 {
   return ((uint8_t)((x << 1) ^ ((x >> 7) * 0x1b)));
 }
 
 
-// MixColumns function mixes the columns of the state matrix
+//
+// 'mix_columns()' - Mix the columns of the state matrix.
+//
+
 static void
-MixColumns(state_t *state)
+mix_columns(state_t *state)		// I - Current state
 {
   unsigned	i;			// Looping var
   uint8_t	*sptr = (*state)[0];	// Pointer into state
   uint8_t	Tmp, Tm, t;		// Temporary values
 
+
   for (i = 4; i > 0; i --, sptr += 4)
   {
     t       = sptr[0];
@@ -357,11 +377,15 @@ MixColumns(state_t *state)
 }
 
 
-// Multiply is used to multiply numbers in the field GF(2^8)
+//
+// 'multiply()' - Multiply numbers in the field GF(2^8)
+//
 // Note: The last call to xtime() is unneeded, but often ends up generating a smaller binary
 //       The compiler seems to be able to vectorize the operation better this way.
 //       See https://github.com/kokke/tiny-AES-c/pull/34
-static uint8_t Multiply(uint8_t x, uint8_t y)
+//
+
+static uint8_t multiply(uint8_t x, uint8_t y)
 {
   return (((y & 1) * x) ^
 	  ((y>>1 & 1) * xtime(x)) ^
@@ -371,11 +395,15 @@ static uint8_t Multiply(uint8_t x, uint8_t y)
 }
 
 
-// MixColumns function mixes the columns of the state matrix.
+//
+// 'mix_columns()' - Mix the columns of the state matrix.
+//
 // The method used to multiply may be difficult to understand for the inexperienced.
 // Please use the references to gain more information.
+//
+
 static void
-InvMixColumns(state_t *state)
+inv_mix_columns(state_t *state)		// I - Current state
 {
   unsigned	i;			// Looping var
   uint8_t	*sptr = (*state)[0];	// Pointer into state
@@ -389,18 +417,20 @@ InvMixColumns(state_t *state)
     c = sptr[2];
     d = sptr[3];
 
-    *sptr++ = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^ Multiply(d, 0x09);
-    *sptr++ = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^ Multiply(d, 0x0d);
-    *sptr++ = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^ Multiply(d, 0x0b);
-    *sptr++ = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^ Multiply(d, 0x0e);
+    *sptr++ = multiply(a, 0x0e) ^ multiply(b, 0x0b) ^ multiply(c, 0x0d) ^ multiply(d, 0x09);
+    *sptr++ = multiply(a, 0x09) ^ multiply(b, 0x0e) ^ multiply(c, 0x0b) ^ multiply(d, 0x0d);
+    *sptr++ = multiply(a, 0x0d) ^ multiply(b, 0x09) ^ multiply(c, 0x0e) ^ multiply(d, 0x0b);
+    *sptr++ = multiply(a, 0x0b) ^ multiply(b, 0x0d) ^ multiply(c, 0x09) ^ multiply(d, 0x0e);
   }
 }
 
 
-// The SubBytes Function Substitutes the values in the
-// state matrix with values in an S-box.
+//
+// 'sub_bytes()' - Substitute the values in the state matrix with values in an S-box.
+//
+
 static void
-InvSubBytes(state_t *state)
+inv_sub_bytes(state_t *state)		// I - Current state
 {
   unsigned	i;			// Looping var
   uint8_t	*sptr = (*state)[0];	// Pointer into state
@@ -411,8 +441,12 @@ InvSubBytes(state_t *state)
 }
 
 
+//
+// 'inv_shift_rows()' - Shift the rows in the state to the right.
+//
+
 static void
-InvShiftRows(state_t *state)
+inv_shift_rows(state_t *state)		// I - Current state
 {
   uint8_t	*sptr = (*state)[0];	// Pointer into state
   uint8_t	temp;			// Temporary value
@@ -443,40 +477,52 @@ InvShiftRows(state_t *state)
 }
 
 
-// Cipher is the main function that encrypts the PlainText.
+//
+// 'cipher()' - Encrypt the PlainText.
+//
+
 static void
-Cipher(state_t *state, const _pdfio_aes_t *ctx)
+cipher(state_t            *state,	// I - Current state
+       const _pdfio_aes_t *ctx)		// I - AES context
 {
-  size_t round = 0;
+  size_t round = 0;			// Current round
+
 
   // Add the First round key to the state before starting the rounds.
-  AddRoundKey(0, state, ctx->round_key);
+  add_round_key(0, state, ctx->round_key);
 
   // There will be Nr rounds.
   // The first Nr-1 rounds are identical.
   // These Nr rounds are executed in the loop below.
-  // Last one without MixColumns()
+  // Last one without mix_columns()
   for (round = 1; round < ctx->round_size; round ++)
   {
-    SubBytes(state);
-    ShiftRows(state);
-    MixColumns(state);
-    AddRoundKey(round, state, ctx->round_key);
+    sub_bytes(state);
+    shift_rows(state);
+    mix_columns(state);
+    add_round_key(round, state, ctx->round_key);
   }
+
   // Add round key to last round
-  SubBytes(state);
-  ShiftRows(state);
-  AddRoundKey(ctx->round_size, state, ctx->round_key);
+  sub_bytes(state);
+  shift_rows(state);
+  add_round_key(ctx->round_size, state, ctx->round_key);
 }
 
 
+//
+// 'inv_cipher()' - Decrypt the CipherText.
+//
+
 static void
-InvCipher(state_t *state, const _pdfio_aes_t *ctx)
+inv_cipher(state_t            *state,	// I - Current state
+           const _pdfio_aes_t *ctx)	// I - AES context
 {
-  size_t round;
+  size_t round;				// Current round
+
 
   // Add the First round key to the state before starting the rounds.
-  AddRoundKey(ctx->round_size, state, ctx->round_key);
+  add_round_key(ctx->round_size, state, ctx->round_key);
 
   // There will be Nr rounds.
   // The first Nr-1 rounds are identical.
@@ -484,20 +530,25 @@ InvCipher(state_t *state, const _pdfio_aes_t *ctx)
   // Last one without InvMixColumn()
   for (round = ctx->round_size - 1; ; round --)
   {
-    InvShiftRows(state);
-    InvSubBytes(state);
-    AddRoundKey(round, state, ctx->round_key);
+    inv_shift_rows(state);
+    inv_sub_bytes(state);
+    add_round_key(round, state, ctx->round_key);
 
     if (round == 0)
       break;
 
-    InvMixColumns(state);
+    inv_mix_columns(state);
   }
 }
 
 
+//
+// 'xor_with_iv()' - XOR a block with the initialization vector.
+//
+
 static void
-XorWithIv(uint8_t *buf, const uint8_t *Iv)
+xor_with_iv(uint8_t       *buf,		// I - Block
+            const uint8_t *Iv)		// I - Initialization vector
 {
   // 16-byte block...
   *buf++ ^= *Iv++;

pdfio-common.c

@@ -1,7 +1,7 @@
 //
 // Common support functions for pdfio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -98,7 +98,7 @@ _pdfioFileFlush(pdfio_file_t *pdf)	// I - PDF file
     if (!write_buffer(pdf, pdf->buffer, (size_t)(pdf->bufptr - pdf->buffer)))
       return (false);
 
-    pdf->bufpos += pdf->bufptr - pdf->buffer;
+    pdf->bufpos += (off_t)(pdf->bufptr - pdf->buffer);
   }
 
   pdf->bufptr = pdf->buffer;
@@ -216,7 +216,7 @@ _pdfioFilePeek(pdfio_file_t *pdf,	// I - PDF file
     PDFIO_DEBUG("_pdfioFilePeek: Sliding buffer, total=%ld\n", (long)total);
 
     memmove(pdf->buffer, pdf->bufptr, total);
-    pdf->bufpos += pdf->bufptr - pdf->buffer;
+    pdf->bufpos += (off_t)(pdf->bufptr - pdf->buffer);
     pdf->bufptr = pdf->buffer;
     pdf->bufend = pdf->buffer + total;
 
@@ -317,14 +317,14 @@ _pdfioFileRead(pdfio_file_t *pdf,	// I - PDF file
       // Advance current position in file as needed...
       if (pdf->bufend)
       {
-	pdf->bufpos += pdf->bufend - pdf->buffer;
+	pdf->bufpos += (off_t)(pdf->bufend - pdf->buffer);
 	pdf->bufptr = pdf->bufend = NULL;
       }
 
       // Read directly from the file...
       if ((rbytes = read_buffer(pdf, bufptr, bytes)) > 0)
       {
-	pdf->bufpos += rbytes;
+	pdf->bufpos += (off_t)rbytes;
 	continue;
       }
       else if (rbytes < 0 && (errno == EINTR || errno == EAGAIN))
@@ -361,14 +361,14 @@ _pdfioFileSeek(pdfio_file_t *pdf,	// I - PDF file
   // Adjust offset for relative seeks...
   if (whence == SEEK_CUR)
   {
-    offset += pdf->bufpos + (pdf->bufptr - pdf->buffer);
+    offset += pdf->bufpos + (off_t)(pdf->bufptr - pdf->buffer);
     whence = SEEK_SET;
   }
 
   if (pdf->mode == _PDFIO_MODE_READ)
   {
     // Reading, see if we already have the data we need...
-    if (whence != SEEK_END && offset >= pdf->bufpos && offset < (pdf->bufpos + pdf->bufend - pdf->buffer))
+    if (whence != SEEK_END && offset >= pdf->bufpos && pdf->bufend && offset < (off_t)(pdf->bufpos + pdf->bufend - pdf->buffer))
     {
       // Yes, seek within existing buffer...
       pdf->bufptr = pdf->buffer + (offset - pdf->bufpos);
@@ -398,7 +398,10 @@ _pdfioFileSeek(pdfio_file_t *pdf,	// I - PDF file
   }
 
   // Seek within the file...
-  if ((offset = lseek(pdf->fd, offset, whence)) < 0)
+  if ((offset = lseek(pdf->fd, offset, whence)) < 0 && whence == SEEK_END && errno == EINVAL)
+    offset = lseek(pdf->fd, 0, SEEK_SET);
+
+  if (offset < 0)
   {
     _pdfioFileError(pdf, "Unable to seek within file - %s", strerror(errno));
     return (-1);

pdfio-content.h

@@ -129,6 +129,7 @@ extern bool		pdfioContentTextShowJustified(pdfio_stream_t *st, bool unicode, siz
 // Resource helpers...
 extern pdfio_obj_t	*pdfioFileCreateFontObjFromBase(pdfio_file_t *pdf, const char *name) _PDFIO_PUBLIC;
 extern pdfio_obj_t	*pdfioFileCreateFontObjFromFile(pdfio_file_t *pdf, const char *filename, bool unicode) _PDFIO_PUBLIC;
+extern pdfio_obj_t	*pdfioFileCreateICCObjFromData(pdfio_file_t *pdf, const unsigned char *data, size_t datalen, size_t num_colors) _PDFIO_PUBLIC;
 extern pdfio_obj_t	*pdfioFileCreateICCObjFromFile(pdfio_file_t *pdf, const char *filename, size_t num_colors) _PDFIO_PUBLIC;
 extern pdfio_obj_t	*pdfioFileCreateImageObjFromData(pdfio_file_t *pdf, const unsigned char *data, size_t width, size_t height, size_t num_colors, pdfio_array_t *color_data, bool alpha, bool interpolate) _PDFIO_PUBLIC;
 extern pdfio_obj_t	*pdfioFileCreateImageObjFromFile(pdfio_file_t *pdf, const char *filename, bool interpolate) _PDFIO_PUBLIC;

pdfio-crypto.c

@@ -1,7 +1,7 @@
 //
 // Cryptographic support functions for PDFio.
 //
-// Copyright © 2021-2023 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -466,6 +466,7 @@ _pdfioCryptoMakeReader(
 
       if (memcmp(pdf->password, pdf_user_key, 32) && memcmp(own_user_key, pdf_user_key, 16))
       {
+        _pdfioFileError(pdf, "Unable to unlock file.");
 	*ivlen = 0;
 	return (NULL);
       }
@@ -483,6 +484,7 @@ _pdfioCryptoMakeReader(
   switch (pdf->encryption)
   {
     default :
+        _pdfioFileError(pdf, "Unsupported encryption algorithm.");
         *ivlen = 0;
         return (NULL);
 

pdfio-dict.c

@@ -465,10 +465,134 @@ pdfioDictGetString(pdfio_dict_t *dict,	// I - Dictionary
   else if (value && value->type == PDFIO_VALTYPE_BINARY && value->value.binary.datalen < 4096)
   {
     // Convert binary string to regular string...
-    char	temp[4096];		// Temporary string
+    char	temp[4096],		// Temporary string
+		*tempptr;		// Pointer into temporary string
+    unsigned char *dataptr;		// Pointer into the data string
 
-    memcpy(temp, value->value.binary.data, value->value.binary.datalen);
-    temp[value->value.binary.datalen] = '\0';
+    if (!(value->value.binary.datalen & 1) && !memcmp(value->value.binary.data, "\377\376", 2))
+    {
+      // Copy UTF-16 BE
+      int	ch;			// Unicode character
+      size_t	remaining;		// Remaining bytes
+
+      for (dataptr = value->value.binary.data + 2, remaining = value->value.binary.datalen - 2, tempptr = temp; remaining > 1 && tempptr < (temp + sizeof(temp) - 5); dataptr += 2, remaining -= 2)
+      {
+        ch = (dataptr[0] << 8) | dataptr[1];
+
+        if (ch >= 0xd800 && ch <= 0xdbff && remaining > 3)
+	{
+	  // Multi-word UTF-16 char...
+          int lch;			// Lower bits
+
+	  lch = (dataptr[2] << 8) | dataptr[3];
+
+          if (lch < 0xdc00 || lch >= 0xdfff)
+	    break;
+
+          ch        = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
+          dataptr   += 2;
+          remaining -= 2;
+	}
+	else if (ch >= 0xfffe)
+	{
+	  continue;
+	}
+
+        if (ch < 128)
+        {
+          // ASCII
+          *tempptr++ = (char)ch;
+        }
+        else if (ch < 4096)
+        {
+          // 2-byte UTF-8
+          *tempptr++ = (char)(0xc0 | (ch >> 6));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+        else if (ch < 65536)
+        {
+          // 3-byte UTF-8
+          *tempptr++ = (char)(0xe0 | (ch >> 12));
+          *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+        else
+        {
+          // 4-byte UTF-8
+          *tempptr++ = (char)(0xe0 | (ch >> 18));
+          *tempptr++ = (char)(0x80 | ((ch >> 12) & 0x3f));
+          *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+      }
+
+      *tempptr = '\0';
+    }
+    else if (!(value->value.binary.datalen & 1) && !memcmp(value->value.binary.data, "\376\377", 2))
+    {
+      // Copy UTF-16 LE
+      int	ch;			// Unicode character
+      size_t	remaining;		// Remaining bytes
+
+      for (dataptr = value->value.binary.data + 2, remaining = value->value.binary.datalen - 2, tempptr = temp; remaining > 1 && tempptr < (temp + sizeof(temp) - 5); dataptr += 2, remaining -= 2)
+      {
+        ch = (dataptr[1] << 8) | dataptr[0];
+
+        if (ch >= 0xd800 && ch <= 0xdbff && remaining > 3)
+	{
+	  // Multi-word UTF-16 char...
+          int lch;			// Lower bits
+
+	  lch = (dataptr[3] << 8) | dataptr[2];
+
+          if (lch < 0xdc00 || lch >= 0xdfff)
+	    break;
+
+          ch        = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
+          dataptr   += 2;
+          remaining -= 2;
+	}
+	else if (ch >= 0xfffe)
+	{
+	  continue;
+	}
+
+        if (ch < 128)
+        {
+          // ASCII
+          *tempptr++ = (char)ch;
+        }
+        else if (ch < 4096)
+        {
+          // 2-byte UTF-8
+          *tempptr++ = (char)(0xc0 | (ch >> 6));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+        else if (ch < 65536)
+        {
+          // 3-byte UTF-8
+          *tempptr++ = (char)(0xe0 | (ch >> 12));
+          *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+        else
+        {
+          // 4-byte UTF-8
+          *tempptr++ = (char)(0xe0 | (ch >> 18));
+          *tempptr++ = (char)(0x80 | ((ch >> 12) & 0x3f));
+          *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+          *tempptr++ = (char)(0x80 | (ch & 0x3f));
+        }
+      }
+
+      *tempptr = '\0';
+    }
+    else
+    {
+      // Copy as-is...
+      memcpy(temp, value->value.binary.data, value->value.binary.datalen);
+      temp[value->value.binary.datalen] = '\0';
+    }
 
     free(value->value.binary.data);
     value->type         = PDFIO_VALTYPE_STRING;

pdfio-file.c

@@ -1,7 +1,7 @@
 //
 // PDF file functions for PDFio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -25,6 +25,7 @@ static struct lconv	*get_lconv(void);
 static bool		load_obj_stream(pdfio_obj_t *obj);
 static bool		load_pages(pdfio_file_t *pdf, pdfio_obj_t *obj, size_t depth);
 static bool		load_xref(pdfio_file_t *pdf, off_t xref_offset, pdfio_password_cb_t password_cb, void *password_data);
+static bool		repair_xref(pdfio_file_t *pdf, pdfio_password_cb_t password_cb, void *password_data);
 static bool		write_pages(pdfio_file_t *pdf);
 static bool		write_trailer(pdfio_file_t *pdf);
 
@@ -164,7 +165,8 @@ pdfioFileClose(pdfio_file_t *pdf)	// I - PDF file
 // name of the PDF file to create.
 //
 // The "version" argument specifies the PDF version number for the file or
-// `NULL` for the default ("2.0").
+// `NULL` for the default ("2.0").  The value "PCLm-1.0" can be specified to
+// produce the PCLm subset of PDF.
 //
 // The "media_box" and "crop_box" arguments specify the default MediaBox and
 // CropBox for pages in the PDF file - if `NULL` then a default "Universal" size
@@ -396,7 +398,9 @@ _pdfioFileCreateObj(
 // ```
 //
 // The "version" argument specifies the PDF version number for the file or
-// `NULL` for the default ("2.0").
+// `NULL` for the default ("2.0").  Unlike @link pdfioFileCreate@ and
+// @link pdfioFileCreateTemporary@, it is generally not safe to pass the
+// "PCLm-1.0" version string.
 //
 // The "media_box" and "crop_box" arguments specify the default MediaBox and
 // CropBox for pages in the PDF file - if `NULL` then a default "Universal" size
@@ -531,8 +535,19 @@ pdfioFileCreateStringObj(
 //
 // This function creates a PDF file with a unique filename in the current
 // temporary directory.  The temporary file is stored in the string "buffer" an
-// will have a ".pdf" extension.  Otherwise, this function works the same as
-// the @link pdfioFileCreate@ function.
+// will have a ".pdf" extension.
+//
+// The "version" argument specifies the PDF version number for the file or
+// `NULL` for the default ("2.0").  The value "PCLm-1.0" can be specified to
+// produce the PCLm subset of PDF.
+//
+// The "media_box" and "crop_box" arguments specify the default MediaBox and
+// CropBox for pages in the PDF file - if `NULL` then a default "Universal" size
+// of 8.27x11in (the intersection of US Letter and ISO A4) is used.
+//
+// The "error_cb" and "error_cbdata" arguments specify an error handler callback
+// and its data pointer - if `NULL` the default error handler is used that
+// writes error messages to `stderr`.
 //
 // @since PDFio v1.1@
 //
@@ -801,6 +816,18 @@ pdfioFileGetKeywords(pdfio_file_t *pdf)	// I - PDF file
 }
 
 
+//
+// 'pdfioFileGetModificationDate()' - Get the most recent modification date for a PDF file.
+//
+
+time_t					// O - Modification date or `0` for none
+pdfioFileGetModificationDate(
+    pdfio_file_t *pdf)			// I - PDF file
+{
+  return (pdf && pdf->info_obj ? pdfioDictGetDate(pdfioObjGetDict(pdf->info_obj), "ModDate") : 0);
+}
+
+
 //
 // 'pdfioFileGetName()' - Get a PDF's filename.
 //
@@ -1058,7 +1085,10 @@ pdfioFileOpen(
   xref_offset = (off_t)strtol(ptr + 9, NULL, 10);
 
   if (!load_xref(pdf, xref_offset, password_cb, password_cbdata))
-    goto error;
+  {
+    if (!repair_xref(pdf, password_cb, password_cbdata))
+      goto error;
+  }
 
   return (pdf);
 
@@ -1126,6 +1156,20 @@ pdfioFileSetKeywords(
 }
 
 
+//
+// 'pdfioFileSetModificationDate()' - Set the modification date for a PDF file.
+//
+
+void
+pdfioFileSetModificationDate(
+    pdfio_file_t *pdf,			// I - PDF file
+    time_t       value)			// I - Value
+{
+  if (pdf && pdf->info_obj)
+    pdfioDictSetDate(pdf->info_obj->value.value.dict, "ModDate", value);
+}
+
+
 //
 // 'pdfioFileSetPermissions()' - Set the PDF permissions, encryption mode, and passwords.
 //
@@ -1366,7 +1410,7 @@ create_common(
   pdf->output_cb   = output_cb;
   pdf->output_ctx  = output_cbdata;
   pdf->filename    = strdup(filename);
-  pdf->version     = strdup(version);
+  pdf->version     = strdup(!strncmp(version, "PCLm-", 5) ? "1.4" : version);
   pdf->mode        = _PDFIO_MODE_WRITE;
   pdf->error_cb    = error_cb;
   pdf->error_data  = error_cbdata;
@@ -1397,8 +1441,15 @@ create_common(
   }
 
   // Write a standard PDF header...
-  if (!_pdfioFilePrintf(pdf, "%%PDF-%s\n%%\342\343\317\323\n", version))
+  if (!strncmp(version, "PCLm-", 5))
+  {
+    if (!_pdfioFilePrintf(pdf, "%%PDF-1.4\n%%%s\n", version))
+      goto error;
+  }
+  else if (!_pdfioFilePrintf(pdf, "%%PDF-%s\n%%\342\343\317\323\n", version))
+  {
     goto error;
+  }
 
   // Create the pages object...
   if ((dict = pdfioDictCreate(pdf)) == NULL)
@@ -1517,6 +1568,7 @@ load_obj_stream(pdfio_obj_t *obj)	// I - Object to load
 			cur_obj,	// Current object
 			num_objs = 0;	// Number of objects
   pdfio_obj_t		*objs[16384];	// Objects
+  int			count;		// Count of objects
 
 
   PDFIO_DEBUG("load_obj_stream(obj=%p(%d))\n", obj, (int)obj->number);
@@ -1528,12 +1580,17 @@ load_obj_stream(pdfio_obj_t *obj)	// I - Object to load
     return (false);
   }
 
+  count = (int)pdfioDictGetNumber(pdfioObjGetDict(obj), "N");
+
+  PDFIO_DEBUG("load_obj_stream: N=%d\n", count);
+
   _pdfioTokenInit(&tb, obj->pdf, (_pdfio_tconsume_cb_t)pdfioStreamConsume, (_pdfio_tpeek_cb_t)pdfioStreamPeek, st);
 
   // Read the object numbers from the beginning of the stream...
-  while (_pdfioTokenGet(&tb, buffer, sizeof(buffer)))
+  while (count > 0 && _pdfioTokenGet(&tb, buffer, sizeof(buffer)))
   {
     // Stop if this isn't an object number...
+    PDFIO_DEBUG("load_obj_stream: %s\n", buffer);
     if (!isdigit(buffer[0] & 255))
       break;
 
@@ -1556,21 +1613,19 @@ load_obj_stream(pdfio_obj_t *obj)	// I - Object to load
     // Skip offset
     _pdfioTokenGet(&tb, buffer, sizeof(buffer));
     PDFIO_DEBUG("load_obj_stream: %ld at offset %s\n", (long)number, buffer);
+
+    // One less compressed object...
+    count --;
   }
 
-  if (!buffer[0])
-  {
-    pdfioStreamClose(st);
-    return (false);
-  }
-
-  _pdfioTokenPush(&tb, buffer);
+  PDFIO_DEBUG("load_obj_stream: num_objs=%lu\n", (unsigned long)num_objs);
 
   // Read the objects themselves...
   for (cur_obj = 0; cur_obj < num_objs; cur_obj ++)
   {
     if (!_pdfioValueRead(obj->pdf, obj, &tb, &(objs[cur_obj]->value), 0))
     {
+      _pdfioFileError(obj->pdf, "Unable to read compressed object.");
       pdfioStreamClose(st);
       return (false);
     }
@@ -1720,7 +1775,7 @@ load_xref(
       pdfio_stream_t	*st;		// Stream
       unsigned char	buffer[32];	// Read buffer
       size_t		num_sobjs = 0,	// Number of object streams
-			sobjs[8192];	// Object streams to load
+			sobjs[16384];	// Object streams to load
       pdfio_obj_t	*current;	// Current object
 
       if ((number = strtoimax(line, &ptr, 10)) < 1)
@@ -1744,7 +1799,7 @@ load_xref(
 	return (false);
       }
 
-      if (_pdfioFileSeek(pdf, line_offset + ptr + 3 - line, SEEK_SET) < 0)
+      if (_pdfioFileSeek(pdf, line_offset + (off_t)(ptr + 3 - line), SEEK_SET) < 0)
       {
         _pdfioFileError(pdf, "Unable to seek to xref object %lu %u.", (unsigned long)number, (unsigned)generation);
         return (false);
@@ -1886,7 +1941,7 @@ load_xref(
             if (w[0] == 0 || buffer[0] == 1)
             {
               // Location of object...
-	      current->offset = offset;
+	      current->offset = (off_t)offset;
 	    }
 	    else if (number != offset)
 	    {
@@ -1923,7 +1978,7 @@ load_xref(
 	  else if (!current)
 	  {
 	    // Add this object...
-	    if (!add_obj(pdf, (size_t)number, (unsigned short)generation, offset))
+	    if (!add_obj(pdf, (size_t)number, (unsigned short)generation, (off_t)offset))
 	      return (false);
 	  }
 
@@ -1938,7 +1993,6 @@ load_xref(
 	// Save the trailer dictionary and grab the root (catalog) and info
 	// objects...
 	pdf->trailer_dict = trailer.value.dict;
-	pdf->info_obj     = pdfioDictGetObj(pdf->trailer_dict, "Info");
 	pdf->encrypt_obj  = pdfioDictGetObj(pdf->trailer_dict, "Encrypt");
 	pdf->id_array     = pdfioDictGetArray(pdf->trailer_dict, "ID");
 
@@ -2051,7 +2105,7 @@ load_xref(
 	  if (pdfioFileFindObj(pdf, (size_t)number))
 	    continue;			// Don't replace newer object...
 
-	  if (!add_obj(pdf, (size_t)number, (unsigned short)generation, offset))
+	  if (!add_obj(pdf, (size_t)number, (unsigned short)generation, (off_t)offset))
 	    return (false);
 	}
 
@@ -2086,7 +2140,6 @@ load_xref(
 	// Save the trailer dictionary and grab the root (catalog) and info
 	// objects...
 	pdf->trailer_dict = trailer.value.dict;
-	pdf->info_obj     = pdfioDictGetObj(pdf->trailer_dict, "Info");
 	pdf->encrypt_obj  = pdfioDictGetObj(pdf->trailer_dict, "Encrypt");
 	pdf->id_array     = pdfioDictGetArray(pdf->trailer_dict, "ID");
 
@@ -2123,6 +2176,8 @@ load_xref(
 
   // Once we have all of the xref tables loaded, get the important objects and
   // build the pages array...
+  pdf->info_obj = pdfioDictGetObj(pdf->trailer_dict, "Info");
+
   if ((pdf->root_obj = pdfioDictGetObj(pdf->trailer_dict, "Root")) == NULL)
   {
     _pdfioFileError(pdf, "Missing Root object.");
@@ -2135,6 +2190,159 @@ load_xref(
 }
 
 
+//
+// 'repair_xref()' - Try to "repair" a PDF file and its cross-references...
+//
+
+static bool				// O - `true` on success, `false` on failure
+repair_xref(
+    pdfio_file_t        *pdf,		// I - PDF file
+    pdfio_password_cb_t password_cb,	// I - Password callback or `NULL` for none
+    void                *password_data)	// I - Password callback data, if any
+{
+  char		line[16384],		// Line from file
+		*ptr;			// Pointer into line
+  off_t		line_offset;		// Offset in file
+  intmax_t	number;			// Object number
+  int		generation;		// Generation number
+  size_t	i;			// Looping var
+  size_t	num_sobjs = 0;		// Number of object streams
+  pdfio_obj_t	*sobjs[16384];		// Object streams to load
+
+
+  // Read from the beginning of the file, looking for
+  if ((line_offset = _pdfioFileSeek(pdf, 0, SEEK_SET)) < 0)
+    return (false);
+
+  while (_pdfioFileGets(pdf, line, sizeof(line)))
+  {
+    // See if this is the start of an object...
+    if (line[0] >= '1' && line[0] <= '9')
+    {
+      // Maybe, look some more...
+      if ((number = strtoimax(line, &ptr, 10)) >= 1 && (generation = (int)strtol(ptr, &ptr, 10)) >= 0 && generation < 65536)
+      {
+        while (isspace(*ptr & 255))
+	  ptr ++;
+
+	if (!strncmp(ptr, "obj", 3))
+	{
+	  // Yes, start of an object...
+	  pdfio_obj_t	*obj;		// Object
+	  _pdfio_token_t tb;		// Token buffer/stack
+
+          PDFIO_DEBUG("OBJECT %ld %d at offset %ld\n", (long)number, generation, (long)line_offset);
+
+	  if ((obj = add_obj(pdf, (size_t)number, (unsigned short)generation, line_offset)) == NULL)
+	  {
+	    _pdfioFileError(pdf, "Unable to allocate memory for object.");
+	    return (false);
+	  }
+
+	  _pdfioTokenInit(&tb, pdf, (_pdfio_tconsume_cb_t)_pdfioFileConsume, (_pdfio_tpeek_cb_t)_pdfioFilePeek, pdf);
+
+	  if (!_pdfioValueRead(pdf, obj, &tb, &obj->value, 0))
+	  {
+	    _pdfioFileError(pdf, "Unable to read cross-reference stream dictionary.");
+	    return (false);
+	  }
+
+	  if (_pdfioTokenGet(&tb, line, sizeof(line)) && strcmp(line, "stream"))
+	  {
+	    const char *type = pdfioObjGetType(obj);
+					// Object type
+
+	    _pdfioTokenFlush(&tb);
+	    obj->stream_offset = _pdfioFileTell(pdf);
+
+	    if (type && !strcmp(type, "ObjStm") && num_sobjs < (sizeof(sobjs) / sizeof(sobjs[0])))
+	    {
+	      sobjs[num_sobjs] = obj;
+	      num_sobjs ++;
+	    }
+
+            if (type && !strcmp(type, "XRef") && !pdf->trailer_dict)
+            {
+              // Save the trailer dictionary...
+	      pdf->trailer_dict = pdfioObjGetDict(obj);
+	      pdf->encrypt_obj  = pdfioDictGetObj(pdf->trailer_dict, "Encrypt");
+	      pdf->id_array     = pdfioDictGetArray(pdf->trailer_dict, "ID");
+            }
+	  }
+	}
+      }
+    }
+    else if (!strncmp(line, "trailer", 7) && (!line[7] || isspace(line[7] & 255) || line[7] == '<'))
+    {
+      // Trailer dictionary
+      _pdfio_token_t tb;		// Token buffer/stack
+      _pdfio_value_t trailer;		// Trailer
+
+      if (line[7])
+      {
+	// Probably the start of the trailer dictionary, rewind the file so
+	// we can read it...
+	_pdfioFileSeek(pdf, line_offset + 7, SEEK_SET);
+      }
+
+      PDFIO_DEBUG("TRAILER at offset %ld\n", (long)line_offset);
+
+      _pdfioTokenInit(&tb, pdf, (_pdfio_tconsume_cb_t)_pdfioFileConsume, (_pdfio_tpeek_cb_t)_pdfioFilePeek, pdf);
+      if (!_pdfioValueRead(pdf, NULL, &tb, &trailer, 0))
+      {
+	_pdfioFileError(pdf, "Unable to read cross-reference stream dictionary.");
+	return (false);
+      }
+      else if (trailer.type != PDFIO_VALTYPE_DICT)
+      {
+	_pdfioFileError(pdf, "Trailer is not a dictionary.");
+	return (false);
+      }
+
+      _pdfioTokenFlush(&tb);
+
+      if (!pdf->trailer_dict)
+      {
+	// Save the trailer dictionary and grab the root (catalog) and info
+	// objects...
+	pdf->trailer_dict = trailer.value.dict;
+	pdf->encrypt_obj  = pdfioDictGetObj(pdf->trailer_dict, "Encrypt");
+	pdf->id_array     = pdfioDictGetArray(pdf->trailer_dict, "ID");
+      }
+    }
+
+    // Get the offset for the next line...
+    line_offset = _pdfioFileTell(pdf);
+  }
+
+  // If the trailer contains an Encrypt key, try unlocking the file...
+  if (pdf->encrypt_obj && !_pdfioCryptoUnlock(pdf, password_cb, password_data))
+    return (false);
+
+  // Load any stream objects...
+  for (i = 0; i < num_sobjs; i ++)
+  {
+    if (!load_obj_stream(sobjs[i]))
+      return (false);
+  }
+
+  // Once we have all of the xref tables loaded, get the important objects and
+  // build the pages array...
+  pdf->info_obj = pdfioDictGetObj(pdf->trailer_dict, "Info");
+
+  if ((pdf->root_obj = pdfioDictGetObj(pdf->trailer_dict, "Root")) == NULL)
+  {
+    _pdfioFileError(pdf, "Missing Root object.");
+    return (false);
+  }
+
+  PDFIO_DEBUG("repair_xref: Root=%p(%lu)\n", pdf->root_obj, (unsigned long)pdf->root_obj->number);
+
+  // Load pages...
+  return (load_pages(pdf, pdfioDictGetObj(pdfioObjGetDict(pdf->root_obj), "Pages"), 0));
+}
+
+
 //
 // 'write_pages()' - Write the PDF pages objects.
 //
@@ -2153,7 +2361,7 @@ write_pages(pdfio_file_t *pdf)		// I - PDF file
   for (i = 0; i < pdf->num_pages; i ++)
     pdfioArrayAppendObj(kids, pdf->pages[i]);
 
-  pdfioDictSetNumber(pdf->pages_obj->value.value.dict, "Count", pdf->num_pages);
+  pdfioDictSetNumber(pdf->pages_obj->value.value.dict, "Count", (double)pdf->num_pages);
   pdfioDictSetArray(pdf->pages_obj->value.value.dict, "Kids", kids);
 
   // Write the Pages object...
@@ -2171,59 +2379,221 @@ write_trailer(pdfio_file_t *pdf)	// I - PDF file
   bool		ret = true;		// Return value
   off_t		xref_offset;		// Offset to xref table
   size_t	i;			// Looping var
+  pdfio_obj_t	*obj;			// Current object
 
 
   // Write the xref table...
-  // TODO: Look at adding support for xref streams...
   xref_offset = _pdfioFileTell(pdf);
 
-  if (!_pdfioFilePrintf(pdf, "xref\n0 %lu \n0000000000 65535 f \n", (unsigned long)pdf->num_objs + 1))
+  if (strcmp(pdf->version, "1.5") >= 0 && !pdf->output_cb)
   {
-    _pdfioFileError(pdf, "Unable to write cross-reference table.");
-    ret = false;
-    goto done;
-  }
+    // Write a cross-reference stream...
+    pdfio_dict_t	*xref_dict;	// Object dictionary
+    pdfio_array_t	*w_array;	// W array
+    pdfio_obj_t		*xref_obj;	// Object
+    pdfio_stream_t	*xref_st;	// Stream
+    int			offsize;	// Size of object offsets
+    unsigned char	buffer[10];	// Buffer entry
+    pdfio_encryption_t	encryption;	// PDF encryption mode
 
-  for (i = 0; i < pdf->num_objs; i ++)
-  {
-    pdfio_obj_t	*obj = pdf->objs[i];	// Current object
+    // Disable encryption while we write the xref stream...
+    encryption      = pdf->encryption;
+    pdf->encryption = PDFIO_ENCRYPTION_NONE;
 
-    if (!_pdfioFilePrintf(pdf, "%010lu %05u n \n", (unsigned long)obj->offset, obj->generation))
+    // Figure out how many bytes are needed for the object numbers
+    if (xref_offset < 0xff)
+      offsize = 1;
+    else if (xref_offset < 0xffff)
+      offsize = 2;
+    else if (xref_offset < 0xffffff)
+      offsize = 3;
+    else if (xref_offset < 0xffffffff)
+      offsize = 4;
+    else if (xref_offset < 0xffffffffff)
+      offsize = 5;
+    else if (xref_offset < 0xffffffffffff)
+      offsize = 6;
+    else if (xref_offset < 0xffffffffffffff)
+      offsize = 7;
+    else
+      offsize = 8;
+
+    // Create the object...
+    if ((w_array = pdfioArrayCreate(pdf)) == NULL)
     {
       _pdfioFileError(pdf, "Unable to write cross-reference table.");
       ret = false;
       goto done;
     }
+
+    pdfioArrayAppendNumber(w_array, 1);
+    pdfioArrayAppendNumber(w_array, offsize);
+    pdfioArrayAppendNumber(w_array, 1);
+
+    if ((xref_dict = pdfioDictCreate(pdf)) == NULL)
+    {
+      _pdfioFileError(pdf, "Unable to write cross-reference table.");
+      ret = false;
+      goto done;
+    }
+
+    pdfioDictSetName(xref_dict, "Type", "XRef");
+    pdfioDictSetNumber(xref_dict, "Size", (double)(pdf->num_objs + 2));
+    pdfioDictSetArray(xref_dict, "W", w_array);
+    pdfioDictSetName(xref_dict, "Filter", "FlateDecode");
+    pdfioDictSetObj(xref_dict, "Info", pdf->info_obj);
+    pdfioDictSetObj(xref_dict, "Root", pdf->root_obj);
+
+    if (pdf->encrypt_obj)
+      pdfioDictSetObj(xref_dict, "Encrypt", pdf->encrypt_obj);
+
+    if (pdf->id_array)
+      pdfioDictSetArray(xref_dict, "ID", pdf->id_array);
+
+    if ((xref_obj = pdfioFileCreateObj(pdf, xref_dict)) == NULL)
+    {
+      _pdfioFileError(pdf, "Unable to write cross-reference table.");
+      ret = false;
+      goto done;
+    }
+
+    if ((xref_st = pdfioObjCreateStream(xref_obj, PDFIO_FILTER_FLATE)) == NULL)
+    {
+      _pdfioFileError(pdf, "Unable to write cross-reference table.");
+      ret = false;
+      goto done;
+    }
+
+    // Write the "free" 0 object...
+    memset(buffer, 0, sizeof(buffer));
+    pdfioStreamWrite(xref_st, buffer, offsize + 2);
+
+    // Then write the "allocated" objects...
+    buffer[0] = 1;
+
+    for (i = 0; i < pdf->num_objs; i ++)
+    {
+      obj = pdf->objs[i];		// Current object
+
+      switch (offsize)
+      {
+        case 1 :
+            buffer[1] = obj->offset & 255;
+            break;
+        case 2 :
+            buffer[1] = (obj->offset >> 8) & 255;
+            buffer[2] = obj->offset & 255;
+            break;
+        case 3 :
+            buffer[1] = (obj->offset >> 16) & 255;
+            buffer[2] = (obj->offset >> 8) & 255;
+            buffer[3] = obj->offset & 255;
+            break;
+        case 4 :
+            buffer[1] = (obj->offset >> 24) & 255;
+            buffer[2] = (obj->offset >> 16) & 255;
+            buffer[3] = (obj->offset >> 8) & 255;
+            buffer[4] = obj->offset & 255;
+            break;
+        case 5 :
+            buffer[1] = (obj->offset >> 32) & 255;
+            buffer[2] = (obj->offset >> 24) & 255;
+            buffer[3] = (obj->offset >> 16) & 255;
+            buffer[4] = (obj->offset >> 8) & 255;
+            buffer[5] = obj->offset & 255;
+            break;
+        case 6 :
+            buffer[1] = (obj->offset >> 40) & 255;
+            buffer[2] = (obj->offset >> 32) & 255;
+            buffer[3] = (obj->offset >> 24) & 255;
+            buffer[4] = (obj->offset >> 16) & 255;
+            buffer[5] = (obj->offset >> 8) & 255;
+            buffer[6] = obj->offset & 255;
+            break;
+        case 7 :
+            buffer[1] = (obj->offset >> 48) & 255;
+            buffer[2] = (obj->offset >> 40) & 255;
+            buffer[3] = (obj->offset >> 32) & 255;
+            buffer[4] = (obj->offset >> 24) & 255;
+            buffer[5] = (obj->offset >> 16) & 255;
+            buffer[6] = (obj->offset >> 8) & 255;
+            buffer[7] = obj->offset & 255;
+            break;
+        default :
+            buffer[1] = (obj->offset >> 56) & 255;
+            buffer[2] = (obj->offset >> 48) & 255;
+            buffer[3] = (obj->offset >> 40) & 255;
+            buffer[4] = (obj->offset >> 32) & 255;
+            buffer[5] = (obj->offset >> 24) & 255;
+            buffer[6] = (obj->offset >> 16) & 255;
+            buffer[7] = (obj->offset >> 8) & 255;
+            buffer[8] = obj->offset & 255;
+            break;
+      }
+
+      if (!pdfioStreamWrite(xref_st, buffer, offsize + 2))
+      {
+	_pdfioFileError(pdf, "Unable to write cross-reference table.");
+	ret = false;
+	goto done;
+      }
+    }
+
+    pdfioStreamClose(xref_st);
+
+    pdf->encryption = encryption;
   }
-
-  // Write the trailer...
-  if (!_pdfioFilePuts(pdf, "trailer\n"))
+  else
   {
-    _pdfioFileError(pdf, "Unable to write trailer.");
-    ret = false;
-    goto done;
-  }
+    // Write a cross-reference table...
+    if (!_pdfioFilePrintf(pdf, "xref\n0 %lu \n0000000000 65535 f \n", (unsigned long)pdf->num_objs + 1))
+    {
+      _pdfioFileError(pdf, "Unable to write cross-reference table.");
+      ret = false;
+      goto done;
+    }
 
-  if ((pdf->trailer_dict = pdfioDictCreate(pdf)) == NULL)
-  {
-    _pdfioFileError(pdf, "Unable to create trailer.");
-    ret = false;
-    goto done;
-  }
+    for (i = 0; i < pdf->num_objs; i ++)
+    {
+      obj = pdf->objs[i];		// Current object
 
-  if (pdf->encrypt_obj)
-    pdfioDictSetObj(pdf->trailer_dict, "Encrypt", pdf->encrypt_obj);
-  if (pdf->id_array)
-    pdfioDictSetArray(pdf->trailer_dict, "ID", pdf->id_array);
-  pdfioDictSetObj(pdf->trailer_dict, "Info", pdf->info_obj);
-  pdfioDictSetObj(pdf->trailer_dict, "Root", pdf->root_obj);
-  pdfioDictSetNumber(pdf->trailer_dict, "Size", pdf->num_objs + 1);
+      if (!_pdfioFilePrintf(pdf, "%010lu %05u n \n", (unsigned long)obj->offset, obj->generation))
+      {
+	_pdfioFileError(pdf, "Unable to write cross-reference table.");
+	ret = false;
+	goto done;
+      }
+    }
 
-  if (!_pdfioDictWrite(pdf->trailer_dict, NULL, NULL))
-  {
-    _pdfioFileError(pdf, "Unable to write trailer.");
-    ret = false;
-    goto done;
+    // Write the trailer...
+    if (!_pdfioFilePuts(pdf, "trailer\n"))
+    {
+      _pdfioFileError(pdf, "Unable to write trailer.");
+      ret = false;
+      goto done;
+    }
+
+    if ((pdf->trailer_dict = pdfioDictCreate(pdf)) == NULL)
+    {
+      _pdfioFileError(pdf, "Unable to create trailer.");
+      ret = false;
+      goto done;
+    }
+
+    if (pdf->encrypt_obj)
+      pdfioDictSetObj(pdf->trailer_dict, "Encrypt", pdf->encrypt_obj);
+    if (pdf->id_array)
+      pdfioDictSetArray(pdf->trailer_dict, "ID", pdf->id_array);
+    pdfioDictSetObj(pdf->trailer_dict, "Info", pdf->info_obj);
+    pdfioDictSetObj(pdf->trailer_dict, "Root", pdf->root_obj);
+    pdfioDictSetNumber(pdf->trailer_dict, "Size", (double)(pdf->num_objs + 1));
+
+    if (!_pdfioDictWrite(pdf->trailer_dict, NULL, NULL))
+    {
+      _pdfioFileError(pdf, "Unable to write trailer.");
+      ret = false;
+      goto done;
+    }
   }
 
   if (!_pdfioFilePrintf(pdf, "\nstartxref\n%lu\n%%EOF\n", (unsigned long)xref_offset))

pdfio-md5.c

@@ -1,7 +1,7 @@
 //
 // MD5 functions for PDFio.
 //
-// Copyright © 2021 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 // Copyright © 1999 Aladdin Enterprises.  All rights reserved.
 //
 // This software is provided 'as-is', without any express or implied
@@ -108,231 +108,285 @@
 #define T63 0x2ad7d2bb
 #define T64 0xeb86d391
 
+
+//
+// Use the unoptimized (big-endian) implementation if we don't know the
+// endian-ness of the platform.
+//
+
+#ifdef __BYTE_ORDER__
+#  if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#    define ARCH_IS_BIG_ENDIAN	0	// Use little endian optimized version
+#  else
+#    define ARCH_IS_BIG_ENDIAN	1	// Use generic version
+#  endif // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#elif !defined(ARCH_IS_BIG_ENDIAN)
+#  define ARCH_IS_BIG_ENDIAN	1	// Use generic version
+#endif // !ARCH_IS_BIG_ENDIAN
+
+
+//
+// 'md5_process()' - Hash a block of data.
+//
+
 static void
-md5_process(_pdfio_md5_t *pms, const uint8_t *data /*[64]*/)
+md5_process(_pdfio_md5_t  *pms,		// I - MD5 state
+            const uint8_t *data/*[64]*/)// I - Data
 {
-    uint32_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    uint32_t t;
+  uint32_t	a = pms->abcd[0],	// First word of state
+		b = pms->abcd[1],	// Second word of state
+		c = pms->abcd[2],	// Third word of state
+		d = pms->abcd[3];	// Fourth word of state
+  uint32_t	t;			// Temporary state
+
 
-#ifndef ARCH_IS_BIG_ENDIAN
-# define ARCH_IS_BIG_ENDIAN 1	/* slower, default implementation */
-#endif
 #if ARCH_IS_BIG_ENDIAN
+  // On big-endian machines, we must arrange the bytes in the right
+  // order.  (This also works on machines of unknown byte order.)
+  uint32_t	X[16];			// Little-endian representation
+  const uint8_t	*xp;			// Pointer into data
+  int		i;			// Looping var
 
-    /*
-     * On big-endian machines, we must arrange the bytes in the right
-     * order.  (This also works on machines of unknown byte order.)
-     */
-    uint32_t X[16];
-    const uint8_t *xp = data;
-    int i;
-
-    for (i = 0; i < 16; ++i, xp += 4)
-	X[i] = xp[0] + (unsigned)(xp[1] << 8) + (unsigned)(xp[2] << 16) + (unsigned)(xp[3] << 24);
+  for (i = 0, xp = data; i < 16; i ++, xp += 4)
+    X[i] = xp[0] + (unsigned)(xp[1] << 8) + (unsigned)(xp[2] << 16) + (unsigned)(xp[3] << 24);
 
 #else  /* !ARCH_IS_BIG_ENDIAN */
+  // On little-endian machines, we can process properly aligned data without copying it.
+  uint32_t	xbuf[16];		// Aligned buffer
+  const uint32_t *X;			// Pointer to little-endian representation
 
-    /*
-     * On little-endian machines, we can process properly aligned data
-     * without copying it.
-     */
-    uint32_t xbuf[16];
-    const uint32_t *X;
-
-    if (!((data - (const uint8_t *)0) & 3)) {
-	/* data are properly aligned */
-	X = (const uint32_t *)data;
-    } else {
-	/* not aligned */
-	memcpy(xbuf, data, 64);
-	X = xbuf;
-    }
-#endif
+  if (!((data - (const uint8_t *)0) & 3))
+  {
+    // data is properly aligned, use it directly...
+    X = (const uint32_t *)data;
+  }
+  else
+  {
+    // data is not aligned, copy to the aligned buffer...
+    memcpy(xbuf, data, 64);
+    X = xbuf;
+  }
+#endif // ARCH_IS_BIG_ENDIAN
 
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
+  // Round 1.
+  // Let [abcd k s i] denote the operation
+  //   a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s).
+#define F(x, y, z)		(((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti) t = a + F(b,c,d) + X[k] + Ti; a = ROTATE_LEFT(t, s) + b
+
+  // Do the following 16 operations.
+  SET(a, b, c, d,  0,  7,  T1);
+  SET(d, a, b, c,  1, 12,  T2);
+  SET(c, d, a, b,  2, 17,  T3);
+  SET(b, c, d, a,  3, 22,  T4);
+  SET(a, b, c, d,  4,  7,  T5);
+  SET(d, a, b, c,  5, 12,  T6);
+  SET(c, d, a, b,  6, 17,  T7);
+  SET(b, c, d, a,  7, 22,  T8);
+  SET(a, b, c, d,  8,  7,  T9);
+  SET(d, a, b, c,  9, 12, T10);
+  SET(c, d, a, b, 10, 17, T11);
+  SET(b, c, d, a, 11, 22, T12);
+  SET(a, b, c, d, 12,  7, T13);
+  SET(d, a, b, c, 13, 12, T14);
+  SET(c, d, a, b, 14, 17, T15);
+  SET(b, c, d, a, 15, 22, T16);
+
 #undef SET
 
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
+  // Round 2.
+  // Let [abcd k s i] denote the operation
+  //   a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s).
+#define G(x, y, z)		(((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti) t = a + G(b,c,d) + X[k] + Ti; a = ROTATE_LEFT(t, s) + b
+
+  // Do the following 16 operations.
+  SET(a, b, c, d,  1,  5, T17);
+  SET(d, a, b, c,  6,  9, T18);
+  SET(c, d, a, b, 11, 14, T19);
+  SET(b, c, d, a,  0, 20, T20);
+  SET(a, b, c, d,  5,  5, T21);
+  SET(d, a, b, c, 10,  9, T22);
+  SET(c, d, a, b, 15, 14, T23);
+  SET(b, c, d, a,  4, 20, T24);
+  SET(a, b, c, d,  9,  5, T25);
+  SET(d, a, b, c, 14,  9, T26);
+  SET(c, d, a, b,  3, 14, T27);
+  SET(b, c, d, a,  8, 20, T28);
+  SET(a, b, c, d, 13,  5, T29);
+  SET(d, a, b, c,  2,  9, T30);
+  SET(c, d, a, b,  7, 14, T31);
+  SET(b, c, d, a, 12, 20, T32);
+
 #undef SET
 
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
+  // Round 3.
+  // Let [abcd k s t] denote the operation
+  //   a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s).
+#define H(x, y, z)		((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti) t = a + H(b,c,d) + X[k] + Ti; a = ROTATE_LEFT(t, s) + b
+
+  // Do the following 16 operations.
+  SET(a, b, c, d,  5,  4, T33);
+  SET(d, a, b, c,  8, 11, T34);
+  SET(c, d, a, b, 11, 16, T35);
+  SET(b, c, d, a, 14, 23, T36);
+  SET(a, b, c, d,  1,  4, T37);
+  SET(d, a, b, c,  4, 11, T38);
+  SET(c, d, a, b,  7, 16, T39);
+  SET(b, c, d, a, 10, 23, T40);
+  SET(a, b, c, d, 13,  4, T41);
+  SET(d, a, b, c,  0, 11, T42);
+  SET(c, d, a, b,  3, 16, T43);
+  SET(b, c, d, a,  6, 23, T44);
+  SET(a, b, c, d,  9,  4, T45);
+  SET(d, a, b, c, 12, 11, T46);
+  SET(c, d, a, b, 15, 16, T47);
+  SET(b, c, d, a,  2, 23, T48);
+
 #undef SET
 
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
+  // Round 4.
+  // Let [abcd k s t] denote the operation
+  //   a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s).
+#define I(x, y, z)		((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti) t = a + I(b,c,d) + X[k] + Ti; a = ROTATE_LEFT(t, s) + b
+
+  // Do the following 16 operations.
+  SET(a, b, c, d,  0,  6, T49);
+  SET(d, a, b, c,  7, 10, T50);
+  SET(c, d, a, b, 14, 15, T51);
+  SET(b, c, d, a,  5, 21, T52);
+  SET(a, b, c, d, 12,  6, T53);
+  SET(d, a, b, c,  3, 10, T54);
+  SET(c, d, a, b, 10, 15, T55);
+  SET(b, c, d, a,  1, 21, T56);
+  SET(a, b, c, d,  8,  6, T57);
+  SET(d, a, b, c, 15, 10, T58);
+  SET(c, d, a, b,  6, 15, T59);
+  SET(b, c, d, a, 13, 21, T60);
+  SET(a, b, c, d,  4,  6, T61);
+  SET(d, a, b, c, 11, 10, T62);
+  SET(c, d, a, b,  2, 15, T63);
+  SET(b, c, d, a,  9, 21, T64);
+
 #undef SET
 
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
+  // Then perform the following additions. (That is increment each of the four
+  // registers by the value it had before this block was started.)
+  pms->abcd[0] += a;
+  pms->abcd[1] += b;
+  pms->abcd[2] += c;
+  pms->abcd[3] += d;
 }
 
+
+//
+// '_pdfioCryptoMD5Init()' - Initialize an MD5 hash.
+//
+
 void
-_pdfioCryptoMD5Init(_pdfio_md5_t *pms)
+_pdfioCryptoMD5Init(_pdfio_md5_t *pms)	// I - MD5 state
 {
     pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = 0xefcdab89;
-    pms->abcd[2] = 0x98badcfe;
-    pms->abcd[3] = 0x10325476;
+    pms->abcd[0]  = 0x67452301;
+    pms->abcd[1]  = 0xefcdab89;
+    pms->abcd[2]  = 0x98badcfe;
+    pms->abcd[3]  = 0x10325476;
 }
 
+
+//
+// '_pdfioCryptoMD5Append()' - Append bytes to the MD5 hash.
+//
+
 void
-_pdfioCryptoMD5Append(_pdfio_md5_t *pms, const uint8_t *data, size_t nbytes)
+_pdfioCryptoMD5Append(
+    _pdfio_md5_t  *pms,			// I - MD5 state
+    const uint8_t *data,		// I - Data to add
+    size_t        nbytes)		// I - Number of bytes
 {
-    const uint8_t *p = data;
-    size_t left = nbytes;
-    size_t offset = (pms->count[0] >> 3) & 63;
-    uint32_t nbits = (uint32_t)(nbytes << 3);
+  const uint8_t	*p = data;		// Pointer into data
+  size_t	left = nbytes;		// Remaining bytes
+  size_t	offset = (pms->count[0] >> 3) & 63;
+					// Offset into state
+  uint32_t	nbits = (uint32_t)(nbytes << 3);
+					// Number of bits to add
 
-    if (nbytes == 0)
-	return;
 
-    /* Update the message length. */
-    pms->count[1] += (unsigned)(nbytes >> 29);
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
+  if (nbytes == 0)
+    return;
 
-    /* Process an initial partial block. */
-    if (offset) {
-	size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+  // Update the message length.
+  pms->count[1] += (unsigned)(nbytes >> 29);
+  pms->count[0] += nbits;
+  if (pms->count[0] < nbits)
+    pms->count[1] ++;
 
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
+  // Process an initial partial block.
+  if (offset)
+  {
+    size_t copy = ((offset + nbytes) > 64 ? 64 - offset : nbytes);
+					// Number of bytes to copy
 
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
+    memcpy(pms->buf + offset, p, copy);
 
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
+    if ((offset + copy) < 64)
+      return;
+
+    p    += copy;
+    left -= copy;
+
+    md5_process(pms, pms->buf);
+  }
+
+  // Process full blocks.
+  for (; left >= 64; p += 64, left -= 64)
+    md5_process(pms, p);
+
+  // Copy a final partial block.
+  if (left)
+    memcpy(pms->buf, p, left);
 }
 
+
+//
+// '_pdfioCryptoMD5Finish()' - Finalize the MD5 hash.
+//
+
 void
-_pdfioCryptoMD5Finish(_pdfio_md5_t *pms, uint8_t digest[16])
+_pdfioCryptoMD5Finish(
+    _pdfio_md5_t *pms,			// I - MD5 state
+    uint8_t      digest[16])		// O - Digest value
 {
-    static const uint8_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    uint8_t data[8];
-    int i;
+  int		i;			// Looping var
+  uint8_t	data[8];		// Digest length data
+  static const uint8_t pad[64] =	// Padding bytes
+  {
+    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
 
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    _pdfioCryptoMD5Append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    _pdfioCryptoMD5Append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (uint8_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+
+  // Save the length before padding.
+  for (i = 0; i < 8; ++i)
+    data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+
+  // Pad to 56 bytes mod 64.
+  _pdfioCryptoMD5Append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+
+  // Append the length.
+  _pdfioCryptoMD5Append(pms, data, 8);
+
+  // Copy the digest from the state...
+  for (i = 0; i < 16; ++i)
+    digest[i] = (uint8_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }

pdfio-object.c

@@ -1,7 +1,7 @@
 //
 // PDF object functions for PDFio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -10,13 +10,6 @@
 #include "pdfio-private.h"
 
 
-//
-// Local functions...
-//
-
-static bool	write_obj_header(pdfio_obj_t *obj);
-
-
 //
 // 'pdfioObjClose()' - Close an object, writing any data as needed to the PDF
 //                     file.
@@ -42,7 +35,7 @@ pdfioObjClose(pdfio_obj_t *obj)		// I - Object
   if (!obj->offset)
   {
     // Write the object value
-    if (!write_obj_header(obj))
+    if (!_pdfioObjWriteHeader(obj))
       return (false);
 
     // Write the "endobj" line...
@@ -195,7 +188,7 @@ pdfioObjCreateStream(
     }
   }
 
-  if (!write_obj_header(obj))
+  if (!_pdfioObjWriteHeader(obj))
     return (NULL);
 
   if (!_pdfioFilePuts(obj->pdf, "stream\n"))
@@ -205,7 +198,7 @@ pdfioObjCreateStream(
   obj->pdf->current_obj = obj;
 
   // Return the new stream...
-  return (_pdfioStreamCreate(obj, length_obj, filter));
+  return (_pdfioStreamCreate(obj, length_obj, 0, filter));
 }
 
 
@@ -582,11 +575,11 @@ _pdfioObjSetExtension(
 
 
 //
-// 'write_obj_header()' - Write the object header...
+// '_pdfioObjWriteHeader()' - Write the object header...
 //
 
-static bool				// O - `true` on success, `false` on failure
-write_obj_header(pdfio_obj_t *obj)	// I - Object
+bool					// O - `true` on success, `false` on failure
+_pdfioObjWriteHeader(pdfio_obj_t *obj)	// I - Object
 {
   obj->offset = _pdfioFileTell(obj->pdf);
 

pdfio-private.h

@@ -1,7 +1,7 @@
 //
 // Private header file for PDFio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -107,7 +107,7 @@ typedef enum _pdfio_mode_e		// Read/write mode
 typedef enum _pdfio_predictor_e		// PNG predictor constants
 {
   _PDFIO_PREDICTOR_NONE = 1,		// No predictor (default)
-  _PDFIO_PREDICTOR_TIFF2 = 2,		// TIFF2 predictor (???)
+  _PDFIO_PREDICTOR_TIFF2 = 2,		// TIFF predictor 2 (difference from left neighbor)
   _PDFIO_PREDICTOR_PNG_NONE = 10,	// PNG None predictor (same as `_PDFIO_PREDICTOR_NONE`)
   _PDFIO_PREDICTOR_PNG_SUB = 11,	// PNG Sub predictor
   _PDFIO_PREDICTOR_PNG_UP = 12,		// PNG Up predictor
@@ -313,8 +313,9 @@ struct _pdfio_stream_s			// Stream
   z_stream	flate;			// Flate filter state
   _pdfio_predictor_t predictor;		// Predictor function, if any
   size_t	pbpixel,		// Size of a pixel in bytes
-		pbsize;			// Predictor buffer size, if any
-  unsigned char	cbuffer[4096],		// Compressed data buffer
+		pbsize,			// Predictor buffer size, if any
+		cbsize;			// Compressed data buffer size
+  unsigned char	*cbuffer,		// Compressed data buffer
 		*prbuffer,		// Raw buffer (previous line), as needed
 		*psbuffer;		// PNG filter buffer, as needed
   _pdfio_crypto_cb_t crypto_cb;		// Encryption/descryption callback, if any
@@ -383,8 +384,9 @@ extern void		_pdfioObjDelete(pdfio_obj_t *obj) _PDFIO_INTERNAL;
 extern void		*_pdfioObjGetExtension(pdfio_obj_t *obj) _PDFIO_INTERNAL;
 extern bool		_pdfioObjLoad(pdfio_obj_t *obj) _PDFIO_INTERNAL;
 extern void		_pdfioObjSetExtension(pdfio_obj_t *obj, void *data, _pdfio_extfree_t datafree) _PDFIO_INTERNAL;
+extern bool		_pdfioObjWriteHeader(pdfio_obj_t *obj) _PDFIO_INTERNAL;
 
-extern pdfio_stream_t	*_pdfioStreamCreate(pdfio_obj_t *obj, pdfio_obj_t *length_obj, pdfio_filter_t compression) _PDFIO_INTERNAL;
+extern pdfio_stream_t	*_pdfioStreamCreate(pdfio_obj_t *obj, pdfio_obj_t *length_obj, size_t cbsize, pdfio_filter_t compression) _PDFIO_INTERNAL;
 extern pdfio_stream_t	*_pdfioStreamOpen(pdfio_obj_t *obj, bool decode) _PDFIO_INTERNAL;
 
 extern bool		_pdfioStringIsAllocated(pdfio_file_t *pdf, const char *s) _PDFIO_INTERNAL;

pdfio-stream.c

@@ -1,7 +1,7 @@
 //
 // PDF stream functions for PDFio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -50,7 +50,7 @@ pdfioStreamClose(pdfio_stream_t *st)	// I - Stream
 
       while ((status = deflate(&st->flate, Z_FINISH)) != Z_STREAM_END)
       {
-        size_t	bytes = sizeof(st->cbuffer) - st->flate.avail_out,
+        size_t	bytes = st->cbsize - st->flate.avail_out,
 					// Bytes to write
 		outbytes;		// Actual bytes written
 
@@ -89,13 +89,13 @@ pdfioStreamClose(pdfio_stream_t *st)	// I - Stream
         }
 
 	st->flate.next_out  = (Bytef *)st->cbuffer + bytes;
-	st->flate.avail_out = (uInt)(sizeof(st->cbuffer) - bytes);
+	st->flate.avail_out = (uInt)(st->cbsize - bytes);
       }
 
-      if (st->flate.avail_out < (uInt)sizeof(st->cbuffer))
+      if (st->flate.avail_out < (uInt)st->cbsize)
       {
         // Write any residuals...
-        size_t bytes = sizeof(st->cbuffer) - st->flate.avail_out;
+        size_t bytes = st->cbsize - st->flate.avail_out;
 					// Bytes to write
 
 	if (st->crypto_cb)
@@ -140,7 +140,7 @@ pdfioStreamClose(pdfio_stream_t *st)	// I - Stream
     // Update the length as needed...
     if (st->length_obj)
     {
-      st->length_obj->value.value.number = st->obj->stream_length;
+      st->length_obj->value.value.number = (double)st->obj->stream_length;
       pdfioObjClose(st->length_obj);
     }
     else if (st->obj->length_offset)
@@ -172,6 +172,7 @@ pdfioStreamClose(pdfio_stream_t *st)	// I - Stream
 
   st->pdf->current_obj = NULL;
 
+  free(st->cbuffer);
   free(st->prbuffer);
   free(st->psbuffer);
   free(st);
@@ -190,6 +191,7 @@ pdfio_stream_t *			// O - Stream or `NULL` on error
 _pdfioStreamCreate(
     pdfio_obj_t    *obj,		// I - Object
     pdfio_obj_t    *length_obj,		// I - Length object, if any
+    size_t         cbsize,		// I - Size of compression buffer
     pdfio_filter_t compression)		// I - Compression to apply
 {
   pdfio_stream_t	*st;		// Stream
@@ -302,8 +304,21 @@ _pdfioStreamCreate(
     else
       st->predictor = _PDFIO_PREDICTOR_NONE;
 
+    if (cbsize == 0)
+      cbsize = 4096;
+
+    st->cbsize = cbsize;
+    if ((st->cbuffer = malloc(cbsize)) == NULL)
+    {
+      _pdfioFileError(st->pdf, "Unable to allocate %lu bytes for Flate output buffer: %s", (unsigned long)cbsize, strerror(errno));
+      free(st->prbuffer);
+      free(st->psbuffer);
+      free(st);
+      return (NULL);
+    }
+
     st->flate.next_out  = (Bytef *)st->cbuffer;
-    st->flate.avail_out = (uInt)sizeof(st->cbuffer);
+    st->flate.avail_out = (uInt)cbsize;
 
     if ((status = deflateInit(&(st->flate), 9)) != Z_OK)
     {
@@ -362,15 +377,16 @@ pdfioStreamConsume(pdfio_stream_t *st,	// I - Stream
 //
 // 'pdfioStreamGetToken()' - Read a single PDF token from a stream.
 //
-// This function reads a single PDF token from a stream.  Operator tokens,
-// boolean values, and numbers are returned as-is in the provided string buffer.
-// String values start with the opening parenthesis ('(') but have all escaping
-// resolved and the terminating parenthesis removed.  Hexadecimal string values
-// start with the opening angle bracket ('<') and have all whitespace and the
-// terminating angle bracket removed.
+// This function reads a single PDF token from a stream, skipping all whitespace
+// and comments.  Operator tokens, boolean values, and numbers are returned
+// as-is in the provided string buffer.  String values start with the opening
+// parenthesis ('(') but have all escaping resolved and the terminating
+// parenthesis removed.  Hexadecimal string values start with the opening angle
+// bracket ('<') and have all whitespace and the terminating angle bracket
+// removed.
 //
 
-bool					// O - `true` on success, `false` on EOF
+bool					// O - `true` on success, `false` on end-of-stream or error
 pdfioStreamGetToken(
     pdfio_stream_t *st,			// I - Stream
     char           *buffer,		// I - String buffer
@@ -425,14 +441,14 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
 
   if ((st->remaining = pdfioObjGetLength(obj)) == 0)
   {
-    free(st);
-    return (NULL);
+    _pdfioFileError(obj->pdf, "No stream data.");
+    goto error;
   }
 
   if (_pdfioFileSeek(st->pdf, obj->stream_offset, SEEK_SET) != obj->stream_offset)
   {
-    free(st);
-    return (NULL);
+    _pdfioFileError(obj->pdf, "Unable to seek to stream data.");
+    goto error;
   }
 
   type = pdfioObjGetType(obj);
@@ -445,11 +461,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
     ivlen = (size_t)_pdfioFilePeek(st->pdf, iv, sizeof(iv));
 
     if ((st->crypto_cb = _pdfioCryptoMakeReader(st->pdf, obj, &st->crypto_ctx, iv, &ivlen)) == NULL)
-    {
-      // TODO: Add error message?
-      free(st);
-      return (NULL);
-    }
+      goto error;
 
     PDFIO_DEBUG("_pdfioStreamOpen: ivlen=%d\n", (int)ivlen);
     if (ivlen > 0)
@@ -480,8 +492,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
       {
 	// TODO: Implement compound filters...
 	_pdfioFileError(st->pdf, "Unsupported compound stream filter.");
-	free(st);
-	return (NULL);
+	goto error;
       }
 
       // No filter, read as-is...
@@ -514,8 +525,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
       else if (bpc < 1 || bpc == 3 || (bpc > 4 && bpc < 8) || (bpc > 8 && bpc < 16) || bpc > 16)
       {
         _pdfioFileError(st->pdf, "Unsupported BitsPerColor value %d.", bpc);
-        free(st);
-        return (NULL);
+	goto error;
       }
 
       if (colors == 0)
@@ -525,8 +535,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
       else if (colors < 0 || colors > 4)
       {
         _pdfioFileError(st->pdf, "Unsupported Colors value %d.", colors);
-        free(st);
-        return (NULL);
+	goto error;
       }
 
       if (columns == 0)
@@ -536,15 +545,13 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
       else if (columns < 0)
       {
         _pdfioFileError(st->pdf, "Unsupported Columns value %d.", columns);
-        free(st);
-        return (NULL);
+	goto error;
       }
 
       if ((predictor > 2 && predictor < 10) || predictor > 15)
       {
         _pdfioFileError(st->pdf, "Unsupported Predictor function %d.", predictor);
-        free(st);
-        return (NULL);
+	goto error;
       }
       else if (predictor > 1)
       {
@@ -558,28 +565,31 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
         if ((st->prbuffer = calloc(1, st->pbsize - 1)) == NULL || (st->psbuffer = calloc(1, st->pbsize)) == NULL)
         {
           _pdfioFileError(st->pdf, "Unable to allocate %lu bytes for Predictor buffers.", (unsigned long)st->pbsize);
-	  free(st->prbuffer);
-	  free(st->psbuffer);
-	  free(st);
-	  return (NULL);
+	  goto error;
         }
       }
       else
+      {
         st->predictor = _PDFIO_PREDICTOR_NONE;
+      }
+
+      st->cbsize = 4096;
+      if ((st->cbuffer = malloc(st->cbsize)) == NULL)
+      {
+	_pdfioFileError(st->pdf, "Unable to allocate %lu bytes for Flate compression buffer.", (unsigned long)st->cbsize);
+	goto error;
+      }
 
       PDFIO_DEBUG("_pdfioStreamOpen: pos=%ld\n", (long)_pdfioFileTell(st->pdf));
-      if (sizeof(st->cbuffer) > st->remaining)
+      if (st->cbsize > st->remaining)
 	rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->remaining);
       else
-	rbytes = _pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer));
+	rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->cbsize);
 
       if (rbytes <= 0)
       {
 	_pdfioFileError(st->pdf, "Unable to read bytes for stream.");
-	free(st->prbuffer);
-	free(st->psbuffer);
-	free(st);
-	return (NULL);
+	goto error;
       }
 
       if (st->crypto_cb)
@@ -593,10 +603,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
       if ((status = inflateInit(&(st->flate))) != Z_OK)
       {
 	_pdfioFileError(st->pdf, "Unable to start Flate filter: %s", zstrerror(status));
-	free(st->prbuffer);
-	free(st->psbuffer);
-	free(st);
-	return (NULL);
+	goto error;
       }
 
       st->remaining -= st->flate.avail_in;
@@ -610,8 +617,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
     {
       // Something else we don't support
       _pdfioFileError(st->pdf, "Unsupported stream filter '/%s'.", filter);
-      free(st);
-      return (NULL);
+      goto error;
     }
   }
   else
@@ -621,6 +627,16 @@ _pdfioStreamOpen(pdfio_obj_t *obj,	// I - Object
   }
 
   return (st);
+
+  // If we get here something went wrong...
+  error:
+
+  free(st->cbuffer);
+  free(st->prbuffer);
+  free(st->psbuffer);
+  free(st);
+  return (NULL);
+
 }
 
 
@@ -1045,10 +1061,10 @@ stream_read(pdfio_stream_t *st,		// I - Stream
       if (st->flate.avail_in == 0)
       {
 	// Read more from the file...
-	if (sizeof(st->cbuffer) > st->remaining)
+	if (st->cbsize > st->remaining)
 	  rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->remaining);
 	else
-	  rbytes = _pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer));
+	  rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->cbsize);
 
 	if (rbytes <= 0)
 	  return (-1);			// End of file...
@@ -1101,10 +1117,10 @@ stream_read(pdfio_stream_t *st,		// I - Stream
 	if (st->flate.avail_in == 0)
 	{
 	  // Read more from the file...
-	  if (sizeof(st->cbuffer) > st->remaining)
+	  if (st->cbsize > st->remaining)
 	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->remaining);
 	  else
-	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer));
+	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->cbsize);
 
 	  if (rbytes <= 0)
 	    return (-1);		// End of file...
@@ -1171,10 +1187,10 @@ stream_read(pdfio_stream_t *st,		// I - Stream
 	if (st->flate.avail_in == 0)
 	{
 	  // Read more from the file...
-	  if (sizeof(st->cbuffer) > st->remaining)
+	  if (st->cbsize > st->remaining)
 	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->remaining);
 	  else
-	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, sizeof(st->cbuffer));
+	    rbytes = _pdfioFileRead(st->pdf, st->cbuffer, st->cbsize);
 
 	  if (rbytes <= 0)
 	    return (-1);		// End of file...
@@ -1278,10 +1294,10 @@ stream_write(pdfio_stream_t *st,	// I - Stream
 
   while (st->flate.avail_in > 0)
   {
-    if (st->flate.avail_out < (sizeof(st->cbuffer) / 8))
+    if (st->flate.avail_out < (st->cbsize / 8))
     {
       // Flush the compression buffer...
-      size_t	cbytes = sizeof(st->cbuffer) - st->flate.avail_out,
+      size_t	cbytes = st->cbsize - st->flate.avail_out,
 		outbytes;
 
       if (st->crypto_cb)
@@ -1310,7 +1326,7 @@ stream_write(pdfio_stream_t *st,	// I - Stream
       }
 
       st->flate.next_out  = (Bytef *)st->cbuffer + cbytes;
-      st->flate.avail_out = (uInt)(sizeof(st->cbuffer) - cbytes);
+      st->flate.avail_out = (uInt)(st->cbsize - cbytes);
     }
 
     // Deflate what we can this time...

pdfio.h

@@ -1,7 +1,7 @@
 //
 // Public header file for PDFio.
 //
-// Copyright © 2021-2024 by Michael R Sweet.
+// Copyright © 2021-2025 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -20,10 +20,12 @@ extern "C" {
 
 
 //
-// Version number...
+// Version numbers...
 //
 
-#  define PDFIO_VERSION		"1.4.0"
+#  define PDFIO_VERSION		"1.5.0"
+#  define PDFIO_VERSION_MAJOR	1
+#  define PDFIO_VERSION_MINOR	5
 
 
 //
@@ -201,6 +203,7 @@ extern time_t		pdfioFileGetCreationDate(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern const char	*pdfioFileGetCreator(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern pdfio_array_t	*pdfioFileGetID(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern const char	*pdfioFileGetKeywords(pdfio_file_t *pdf) _PDFIO_PUBLIC;
+extern time_t		pdfioFileGetModificationDate(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern const char	*pdfioFileGetName(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern size_t		pdfioFileGetNumObjs(pdfio_file_t *pdf) _PDFIO_PUBLIC;
 extern size_t		pdfioFileGetNumPages(pdfio_file_t *pdf) _PDFIO_PUBLIC;
@@ -216,6 +219,7 @@ extern void		pdfioFileSetAuthor(pdfio_file_t *pdf, const char *value) _PDFIO_PUB
 extern void		pdfioFileSetCreationDate(pdfio_file_t *pdf, time_t value) _PDFIO_PUBLIC;
 extern void		pdfioFileSetCreator(pdfio_file_t *pdf, const char *value) _PDFIO_PUBLIC;
 extern void		pdfioFileSetKeywords(pdfio_file_t *pdf, const char *value) _PDFIO_PUBLIC;
+extern void		pdfioFileSetModificationDate(pdfio_file_t *pdf, time_t value) _PDFIO_PUBLIC;
 extern bool		pdfioFileSetPermissions(pdfio_file_t *pdf, pdfio_permission_t permissions, pdfio_encryption_t encryption, const char *owner_password, const char *user_password) _PDFIO_PUBLIC;
 extern void		pdfioFileSetSubject(pdfio_file_t *pdf, const char *value) _PDFIO_PUBLIC;
 extern void		pdfioFileSetTitle(pdfio_file_t *pdf, const char *value) _PDFIO_PUBLIC;

pdfio.pc.in

@@ -7,7 +7,7 @@ Name: pdfio
 Description: PDF read/write library
 Version: @PDFIO_VERSION@
 URL: https://www.msweet.org/pdfio
-Requires: @PKGCONFIG_REQUIRES@
+Cflags: @PKGCONFIG_CFLAGS@
 Libs: @PKGCONFIG_LIBS@
 Libs.private: @PKGCONFIG_LIBS_PRIVATE@
-Cflags: @PKGCONFIG_CFLAGS@
+Requires: @PKGCONFIG_REQUIRES@

pdfio.vcxproj

@@ -115,7 +115,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_LIBPNG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -130,7 +130,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_LIBPNG;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -172,6 +172,8 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="packages\libpng_native.redist.1.6.30\build\native\libpng_native.redist.targets" Condition="Exists('packages\libpng_native.redist.1.6.30\build\native\libpng_native.redist.targets')" />
+    <Import Project="packages\libpng_native.1.6.30\build\native\libpng_native.targets" Condition="Exists('packages\libpng_native.1.6.30\build\native\libpng_native.targets')" />
     <Import Project="packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets" Condition="Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" />
     <Import Project="packages\zlib_native.1.2.11\build\native\zlib_native.targets" Condition="Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" />
   </ImportGroup>

pdfio.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -31,6 +31,7 @@
 		27F2F0612710BE92008ECD36 /* pdfio-rc4.c in Sources */ = {isa = PBXBuildFile; fileRef = 27F2F05E2710BE92008ECD36 /* pdfio-rc4.c */; };
 		27F2F0622710BE92008ECD36 /* pdfio-crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 27F2F05F2710BE92008ECD36 /* pdfio-crypto.c */; };
 		27F2F0642711243D008ECD36 /* pdfio-sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = 27F2F0632711243D008ECD36 /* pdfio-sha256.c */; };
+		27FCBDE42D19F9B300485EEE /* pdfio-base-font-widths.h in Headers */ = {isa = PBXBuildFile; fileRef = 27FCBDE32D19F9B300485EEE /* pdfio-base-font-widths.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -89,6 +90,7 @@
 		27F2F05E2710BE92008ECD36 /* pdfio-rc4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "pdfio-rc4.c"; sourceTree = "<group>"; };
 		27F2F05F2710BE92008ECD36 /* pdfio-crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "pdfio-crypto.c"; sourceTree = "<group>"; };
 		27F2F0632711243D008ECD36 /* pdfio-sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "pdfio-sha256.c"; sourceTree = "<group>"; };
+		27FCBDE32D19F9B300485EEE /* pdfio-base-font-widths.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "pdfio-base-font-widths.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -162,6 +164,7 @@
 			children = (
 				27CF90432711DFFE00E50FE4 /* pdfio-aes.c */,
 				273440BA263D727800FBFD63 /* pdfio-array.c */,
+				27FCBDE32D19F9B300485EEE /* pdfio-base-font-widths.h */,
 				273440BB263D727800FBFD63 /* pdfio-common.c */,
 				271EA703265B2B1000ACDD39 /* pdfio-content.c */,
 				27F2F05F2710BE92008ECD36 /* pdfio-crypto.c */,
@@ -205,6 +208,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				27FCBDE42D19F9B300485EEE /* pdfio-base-font-widths.h in Headers */,
 				273440CC263D727800FBFD63 /* pdfio.h in Headers */,
 				271EA706265B2B1000ACDD39 /* pdfio-content.h in Headers */,
 				273440C3263D727800FBFD63 /* pdfio-private.h in Headers */,
@@ -256,7 +260,8 @@
 		273440A8263D6FE200FBFD63 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					273440AF263D6FE200FBFD63 = {
 						CreatedOnToolsVersion = 12.5;
@@ -373,9 +378,11 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1.1.2;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -450,15 +457,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1.1.2;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -486,6 +493,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = RU58A2256H;
 				EXECUTABLE_PREFIX = lib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -497,6 +505,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = RU58A2256H;
 				EXECUTABLE_PREFIX = lib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -509,6 +518,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -525,6 +535,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;

pdfio1.def

@@ -1,73 +1,20 @@
 LIBRARY pdfio1
-VERSION 1.4
+VERSION 1.5
 EXPORTS
-_pdfioArrayDebug
-_pdfioArrayDecrypt
-_pdfioArrayDelete
-_pdfioArrayGetValue
-_pdfioArrayRead
-_pdfioArrayWrite
 _pdfioCryptoAESDecrypt
 _pdfioCryptoAESEncrypt
 _pdfioCryptoAESInit
-_pdfioCryptoLock
 _pdfioCryptoMD5Append
 _pdfioCryptoMD5Finish
 _pdfioCryptoMD5Init
-_pdfioCryptoMakeRandom
-_pdfioCryptoMakeReader
-_pdfioCryptoMakeWriter
 _pdfioCryptoRC4Crypt
 _pdfioCryptoRC4Init
 _pdfioCryptoSHA256Append
 _pdfioCryptoSHA256Finish
 _pdfioCryptoSHA256Init
-_pdfioCryptoUnlock
-_pdfioDictDebug
-_pdfioDictDecrypt
-_pdfioDictDelete
-_pdfioDictGetValue
-_pdfioDictRead
-_pdfioDictSetValue
-_pdfioDictWrite
-_pdfioFileAddMappedObj
-_pdfioFileAddPage
-_pdfioFileConsume
-_pdfioFileCreateObj
-_pdfioFileDefaultError
-_pdfioFileError
-_pdfioFileFindMappedObj
-_pdfioFileFlush
-_pdfioFileGetChar
-_pdfioFileGets
-_pdfioFilePeek
-_pdfioFilePrintf
-_pdfioFilePuts
-_pdfioFileRead
-_pdfioFileSeek
-_pdfioFileTell
-_pdfioFileWrite
-_pdfioObjDelete
-_pdfioObjGetExtension
-_pdfioObjLoad
-_pdfioObjSetExtension
-_pdfioStreamCreate
-_pdfioStreamOpen
-_pdfioStringIsAllocated
-_pdfioTokenClear
-_pdfioTokenFlush
-_pdfioTokenGet
 _pdfioTokenInit
-_pdfioTokenPush
-_pdfioTokenRead
-_pdfioValueCopy
 _pdfioValueDebug
-_pdfioValueDecrypt
-_pdfioValueDelete
 _pdfioValueRead
-_pdfioValueWrite
-_pdfio_strtod
-_pdfio_vsnprintf
 pdfioArrayAppendArray
 pdfioArrayAppendBinary
 pdfioArrayAppendBoolean
@@ -187,6 +134,7 @@ pdfioFileCreate
 pdfioFileCreateArrayObj
 pdfioFileCreateFontObjFromBase
 pdfioFileCreateFontObjFromFile
+pdfioFileCreateICCObjFromData
 pdfioFileCreateICCObjFromFile
 pdfioFileCreateImageObjFromData
 pdfioFileCreateImageObjFromFile
@@ -204,6 +152,7 @@ pdfioFileGetCreationDate
 pdfioFileGetCreator
 pdfioFileGetID
 pdfioFileGetKeywords
+pdfioFileGetModificationDate
 pdfioFileGetName
 pdfioFileGetNumObjs
 pdfioFileGetNumPages
@@ -219,6 +168,7 @@ pdfioFileSetAuthor
 pdfioFileSetCreationDate
 pdfioFileSetCreator
 pdfioFileSetKeywords
+pdfioFileSetModificationDate
 pdfioFileSetPermissions
 pdfioFileSetSubject
 pdfioFileSetTitle

pdfio_native.nuspec

@@ -3,7 +3,7 @@
     <metadata>
         <id>pdfio_native</id>
         <title>PDFio Library for VS2019+</title>
-        <version>1.3.2</version>
+        <version>1.5.0</version>
         <authors>Michael R Sweet</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/michaelrsweet/pappl</projectUrl>
@@ -13,10 +13,11 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>PDFio Library for VS2019+</description>
         <summary>PDFio is a simple C library for reading and writing PDF files. PDFio is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GNU GPL2-only software.</summary>
-        <copyright>Copyright © 2019-2024 by Michael R Sweet</copyright>
+        <copyright>Copyright © 2019-2025 by Michael R Sweet</copyright>
         <tags>pdf file native</tags>
 	<dependencies>
-	    <dependency id="pdfio_native.redist" version="1.3.2" />
+	    <dependency id="pdfio_native.redist" version="1.5.0" />
+	    <dependency id="libpng_native.redist" version="1.6.30" />
 	    <dependency id="zlib_native.redist" version="1.2.11" />
 	</dependencies>
     </metadata>

pdfio_native.redist.nuspec

@@ -3,7 +3,7 @@
     <metadata>
         <id>pdfio_native.redist</id>
         <title>PDFio Library for VS2019+</title>
-        <version>1.3.2</version>
+        <version>1.5.0</version>
         <authors>Michael R Sweet</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/michaelrsweet/pappl</projectUrl>
@@ -13,9 +13,10 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>PDFio Library for VS2019+</description>
         <summary>PDFio is a simple C library for reading and writing PDF files. This package provides the redistributable content for the PDFio library. PDFio is licensed under the Apache License Version 2.0 with an (optional) exception to allow linking against GNU GPL2-only software.</summary>
-        <copyright>Copyright © 2019-2024 by Michael R Sweet</copyright>
+        <copyright>Copyright © 2019-2025 by Michael R Sweet</copyright>
         <tags>pdf file native</tags>
 	<dependencies>
+	    <dependency id="libpng_native.redist" version="1.6.30" />
 	    <dependency id="zlib_native.redist" version="1.2.11" />
 	</dependencies>
     </metadata>

pdfiototext.c

@@ -1,95 +0,0 @@
-//
-// PDF to text program for PDFio.
-//
-// Copyright © 2022 by Michael R Sweet.
-//
-// Licensed under Apache License v2.0.  See the file "LICENSE" for more
-// information.
-//
-// Usage:
-//
-//   ./pdfiototext FILENAME.pdf > FILENAME.txt
-//
-
-#include "pdfio.h"
-#include <string.h>
-
-
-//
-// 'main()' - Main entry.
-//
-
-int					// O - Exit status
-main(int  argc,				// I - Number of command-line arguments
-     char *argv[])			// I - Command-line arguments
-{
-  pdfio_file_t	*file;			// PDF file
-  size_t	i, j,			// Looping vars
-		num_pages,		// Number of pages
-		num_streams;		// Number of streams for page
-  pdfio_obj_t	*obj;			// Current page object
-  pdfio_stream_t *st;			// Current page content stream
-  char		buffer[1024];		// String buffer
-  bool		first;			// First string token?
-
-
-  // Verify command-line arguments...
-  if (argc != 2)
-  {
-    puts("Usage: pdfiototext FILENAME.pdf > FILENAME.txt");
-    return (1);
-  }
-
-  // Open the PDF file...
-  if ((file = pdfioFileOpen(argv[1], NULL, NULL, NULL, NULL)) == NULL)
-    return (1);
-
-//  printf("%s: %u pages\n", argv[1], (unsigned)pdfioFileGetNumPages(file));
-
-  // Try grabbing content from all of the pages...
-  for (i = 0, num_pages = pdfioFileGetNumPages(file); i < num_pages; i ++)
-  {
-    if ((obj = pdfioFileGetPage(file, i)) == NULL)
-      continue;
-
-    num_streams = pdfioPageGetNumStreams(obj);
-
-//    printf("%s: page%u=%p, num_streams=%u\n", argv[1], (unsigned)i, obj, (unsigned)num_streams);
-
-    for (j = 0; j < num_streams; j ++)
-    {
-      if ((st = pdfioPageOpenStream(obj, j, true)) == NULL)
-	continue;
-
-//      printf("%s: page%u st%u=%p\n", argv[1], (unsigned)i, (unsigned)j, st);
-
-      first = true;
-      while (pdfioStreamGetToken(st, buffer, sizeof(buffer)))
-      {
-	if (buffer[0] == '(')
-	{
-	  if (first)
-	    first = false;
-	  else
-	    putchar(' ');
-
-	  fputs(buffer + 1, stdout);
-	}
-	else if (!strcmp(buffer, "Td") || !strcmp(buffer, "TD") || !strcmp(buffer, "T*") || !strcmp(buffer, "\'") || !strcmp(buffer, "\""))
-	{
-	  putchar('\n');
-	  first = true;
-	}
-      }
-
-      if (!first)
-	putchar('\n');
-
-      pdfioStreamClose(st);
-    }
-  }
-
-  pdfioFileClose(file);
-
-  return (0);
-}

runtests.bat

@@ -7,6 +7,8 @@
 
 :: Copy dependent DLLs to the named build directory
 echo Copying DLLs
+copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Debug\*.dll %1
+copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Release\*.dll %1
 copy packages\zlib_native.redist.1.2.11\build\native\bin\x64\Debug\*.dll %1
 copy packages\zlib_native.redist.1.2.11\build\native\bin\x64\Release\*.dll %1
 

testfiles/iso22028-2-romm-rgb.txt

@@ -1,3 +1,7 @@
+https://www.color.org/chardata/rgb/rommrgb.xalter
+
+Copyright © 2006 Hewlett-Packard
+
 Terms of use
 
 This profile is made available by ICC, and may be copied, distributed, embedded, made, used, and sold without restriction. Altered versions of this profile shall have the original identification and copyright information removed and shall not be misrepresented as the original profile.

testfiles/pngsuite-LICENSE.txt

@@ -0,0 +1,9 @@
+PngSuite
+--------
+
+Permission to use, copy, modify and distribute these images for any
+purpose and without fee is hereby granted.
+
+
+(c) Willem van Schaik, 1996, 2011
+