CVS commit: pkgsrc/textproc/lowdown

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun  6 23:10:27 UTC 2025

Modified Files:
        pkgsrc/textproc/lowdown: Makefile PLIST distinfo
        pkgsrc/textproc/lowdown/patches: patch-Makefile

Log Message:
lowdown: update to 2.0.2.

Version 2.0.2, 2025-02-16

Fix table separators in -tterm. Fix running make regress without
a UTF-8 locale set, which would cause different output for the
-tterm tests.

Version 2.0.0, 2025-01-25

Formalise using semantic versioning ("semver"). The prior version
(1.4.0) introduced API changes that were incompatible: future
versions will follow semver to prevent confusion.

Adds some missing template files to the share directory.

Fix how links in -tterm have their ANSI escapes closed out.

Lastly, to address downstream breakage when using nested Mac OS X
sandboxes, a special argument SANDBOX_INIT_ERROR_IGNORE value may
be passed during the make build sequence. If set to always, errors
from the underlying Mac OS X sandbox are always ignored. If set to
any other value, the user must set the environment variable
SANDBOX_INIT_ERROR_IGNORE to ignore these errors. This is only
relevant to Mac OS X builds with the sandbox feature enabled during
configuration.

Version 1.4.0, 2024-12-25

Deprecate the --nroff argument prefix in favour of --roff, so for
example --nroff-traditional becomes --roff-traditional. The old
prefix is retained and will not be removed. Deprecated old forms
(e.g., --nroff-no-groff) did not get a replacement.

Deprecate --term-nolinks and --term-shortlinks in favour of
--term-no-links and --term-short-links, respectively. The old forms
are retained and will not be removed.

Add --term-hpadding and clarify the roles of --term-cols,
--term-hmargin, and --term-width. Also document auto argument to
-term-hmargin. The default output looks the same as it did before,
but --term-hpadding=0 can now omit any leading characters.

Add --term-no-rellinks to omit only relative links. This is useful
because terminal output doesn't have a concept of a "relative"
link.

Add passing literal strings as initial values to --template.

Document --term-hmargin=auto, previously undocumented as centre.

Use UTF-8 sequences for -tterm lines: horizontal lines, tables,
block vertical lines, etc. Simplify the image link output to look
a little more like pandoc.

API change (hence the minor version bump): lowdown_tree_rndr(3)
now also accepts a pointer to the options. This is to enable
debugging of the parse tree of --template. Now, passing -s --template
to -ttree will produce the template's parse tree alongside the
parsed content of the input.

API change (hence the minor version bump): moving terminal-specific
members of lowdown_opts into lowdown_opts_term.

Version 1.3.2, 2024-12-10

Add --template functionality to -tman, -tms, and -tgemini.

Add not() to the --template functions and document escapelatex().
Recognise a special modifier -- at the end of control statements
(e.g., $endfor--$, which consumes up and and including the end-of-line.
This is necessary for integrating templates with roff-based languages
that are line sensitive.

Add escapegemini and escaperoff modifier families.

Clarify that any empty statement, even with only white-space,
evaluates to the $ literal. This simplifies the parser and reduces
corner cases. (Earlier, an empty statement with white-space was
ignored, but an empty statement without white-space was a literal
$)

Version 1.3.1, 2024-12-05

Add --template functionality to -tlatex.

Add and() and or() as initial values to template expressions. These
allow for ifdef to test for multiple values at once.

Version 1.3.0, 2024-11-30

Specify that characters not complying with the metadata key
specification are replaced with underscores (which are allowed by
the metadata key character restrictions) instead of as curently
with question marks (which are not valid metadata key characters).

Add new --template functionality, initially for -thtml. This is
still experimental, so transformations and syntax might change. It
allows for templating the output HTML file.

Version 1.2.0, 2024-10-24

Output OSC8 hyperlinks in -tterm mode. See OSC8 Adoption for the
gist. This won't affect terminals not supporting links (such as
with OpenBSD's default xterm). As of this change, all links (including
image links) and link titles will be clickable in supporting
terminals unless --term-no-ansi is given.

Conditionally output UR/UE or MT/ME macros for -tman links. This
makes links be "live" in some -tman utilities.

Add metadata html header, latex header, ms header, and man header
for adding media-specific invocations in the document headers.

Have footnotes in -tms be linked: clicking on a footnote number
will jump to that footnote in the document.

Introduce --nroff-endnotes, which adds a new flag to the public
API (hence the minor number addition). This delays printing of -tms
footnotes until the end of the document, making them endnotes.

Deprecate the --nroff-no-groff flag in favour of --nroff-traditional,
as the changes it effects equally favour mandoc and Heirloom troff.
Does not change the code interface, which uses the same macro name
as before.

Have metadata not be processed by the "smart" typography at all.
This is because some values are links and others are mainlined
directly into output and should not be touched.

Be specific about the behaviour of nested links. This is inconsistent
across the various Markdown implementations (and CommonMark).
Document and stick to a standard.

Version 1.1.2, 2024-09-29

Add documentation for --html-titleblock and slightly change semantics
where it will print regardless if in -s mode.

Add regression code coverage to main website, include make rules
for generating coverage. Many more regression tests to exercise
coverage.

Version 1.1.1, 2024-09-24

Fix UTF8 handling on Mac OS X. Prior to this, some UTF8 characters
(such as smart punctuation) were being garbled on -Tgemini and
-Tterm output. These now render properly thanks to an excellent
pull request contribution (#140).

Hack around more buggy Mac OS X software, specifically their version
of makewhatis(8). While man(7) specifically allows for header macros
(SH) to have their contents on the subsequent line, this breaks
buggy software that erroneously expects headers to have their
content on the same line. This version, thanks to another excellent
pull request (#138), adds a hack for that specific condition.

Version 1.1.0, 2023-11-07

Accept GitHub and MDN-style admonitions. Admonitions are block-quotes
that begin with a bold phrase (e.g., note). The output rendering
is only for -thtml.

Accept GitHub-style superscripts and make them the default.
Previously, lowdown accepted only the traditional Markdown
superscripts; however, pandoc and other tools use GFM syntax by
default, so use this instead and make classical parsing into an
option --parse-super-short.

Add subscript support in the same way as superscript support.
Subscripts overlap with strike-throughs, which are enabled by
default. However, strike-throughs only appear for double-tildes.

Normalise the shared library to version 1, tied to the major number
of the package, and increment the minor number of the package
following the above API changes.

In -tterm mode, don't print metadata unless -s is specified, in
which case print the title, author, and date just like in the other
modes. Provide a --term-all-meta option to print all metadata like
before.

Make some small fixes to -tgemini regarding block quotes and block
code.

Lastly, significantly update lowdown(3) to document the AST generated
by the parser.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/textproc/lowdown/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/lowdown/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/lowdown/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/lowdown/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/lowdown/Makefile
diff -u pkgsrc/textproc/lowdown/Makefile:1.33 pkgsrc/textproc/lowdown/Makefile:1.34
--- pkgsrc/textproc/lowdown/Makefile:1.33       Fri May 26 20:38:47 2023
+++ pkgsrc/textproc/lowdown/Makefile    Fri Jun  6 23:10:26 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2023/05/26 20:38:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.34 2025/06/06 23:10:26 wiz Exp $
 
-DISTNAME=              lowdown-1.0.2
+DISTNAME=              lowdown-2.0.2
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=kristapsdz/}
 GITHUB_TAG=            refs/tags/VERSION_${PKGVERSION_NOREV:S/./_/g}

Index: pkgsrc/textproc/lowdown/PLIST
diff -u pkgsrc/textproc/lowdown/PLIST:1.12 pkgsrc/textproc/lowdown/PLIST:1.13
--- pkgsrc/textproc/lowdown/PLIST:1.12  Fri May 26 20:38:47 2023
+++ pkgsrc/textproc/lowdown/PLIST       Fri Jun  6 23:10:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2023/05/26 20:38:47 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/06/06 23:10:26 wiz Exp $
 bin/lowdown
 bin/lowdown-diff
 include/lowdown.h
@@ -39,4 +39,9 @@ man/man3/lowdown_term_new.3
 man/man3/lowdown_term_rndr.3
 man/man3/lowdown_tree_rndr.3
 man/man5/lowdown.5
+share/lowdown/html/default.html
+share/lowdown/html/sblg.xml
+share/lowdown/latex/default.latex
+share/lowdown/man/default.man
+share/lowdown/ms/default.ms
 share/lowdown/odt/styles.xml

Index: pkgsrc/textproc/lowdown/distinfo
diff -u pkgsrc/textproc/lowdown/distinfo:1.31 pkgsrc/textproc/lowdown/distinfo:1.32
--- pkgsrc/textproc/lowdown/distinfo:1.31       Fri May 26 20:38:47 2023
+++ pkgsrc/textproc/lowdown/distinfo    Fri Jun  6 23:10:26 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2023/05/26 20:38:47 schmonz Exp $
+$NetBSD: distinfo,v 1.32 2025/06/06 23:10:26 wiz Exp $
 
-BLAKE2s (lowdown-1.0.2.tar.gz) = 6af5e137dfe1897371d3326b4be3ca915d81a907b4fe9b9ae05f18b07468091b
-SHA512 (lowdown-1.0.2.tar.gz) = b4e7e7e71bf5dad2ff7f9e15409fa86c82f20ddf2304a1c3678f677adeab2aa3e609410316b7c0a4fd4019de25bb05e2f6cf9823c6d71df5ba5d23490e08de30
-Size (lowdown-1.0.2.tar.gz) = 591591 bytes
-SHA1 (patch-Makefile) = ba5c37257ca7be0b9dd711040ea3494ff6b81c6f
+BLAKE2s (lowdown-2.0.2.tar.gz) = 16519f5b5ded45ccf300fd78a866c072f67064bd1a83cda1ec768bfd51a5e641
+SHA512 (lowdown-2.0.2.tar.gz) = ebd927776f13e78c26e1c001e8586dc43fe1e64d1c537a18cd71bd6a8936c93a9fefcb58c53e94a7c0727b525f6c6a21ab70b924db8c7c105161a6a92d9c96fa
+Size (lowdown-2.0.2.tar.gz) = 676246 bytes
+SHA1 (patch-Makefile) = b7a518172e5401410d75aa755f8e37c4e59242b6

Index: pkgsrc/textproc/lowdown/patches/patch-Makefile
diff -u pkgsrc/textproc/lowdown/patches/patch-Makefile:1.3 pkgsrc/textproc/lowdown/patches/patch-Makefile:1.4
--- pkgsrc/textproc/lowdown/patches/patch-Makefile:1.3  Fri May 26 20:38:47 2023
+++ pkgsrc/textproc/lowdown/patches/patch-Makefile      Fri Jun  6 23:10:26 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile,v 1.3 2023/05/26 20:38:47 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.4 2025/06/06 23:10:26 wiz Exp $
 
 Libtoolize for portable shared libraries.
 
---- Makefile.orig      2023-05-20 19:09:00.000000000 +0000
+--- Makefile.orig      2025-02-16 20:49:33.000000000 +0000
 +++ Makefile
 @@ -1,5 +1,6 @@
- .PHONY: regress regen_regress
- .SUFFIXES: .xml .md .html .pdf .1 .1.html .3 .3.html .5 .5.html .thumb.jpg .png .in.pc .pc .valgrind .old.md .diff-valgrind
+ .PHONY: regress regen_regress valgrind
+ .SUFFIXES: .xml .md .html .pdf .1 .1.html .3 .3.html .5 .5.html .thumb.jpg .png .in.pc .pc .old.md
 +.SUFFIXES: .lo
  
  include Makefile.configure
+ WWWDIR                 = /var/www/vhosts/kristaps.bsd.lv/htdocs/lowdown
+@@ -157,7 +158,11 @@ REGRESS_ARGS      += "--parse-no-deflists"
  
-@@ -125,7 +126,11 @@ REGRESS_ARGS      += "--parse-no-deflists"
- 
- VALGRIND_ARGS  = -q --leak-check=full --leak-resolution=high --show-reachable=yes
+ REGRESS_ENV    = LC_ALL=en_US.UTF-8
  
 -all: bins lowdown.pc liblowdown.so
 +LIBTOOL                = libtool --tag=CC
@@ -23,8 +23,8 @@ Libtoolize for portable shared libraries
 +all: bins lowdown.pc liblowdown.la
  bins: lowdown lowdown-diff
  
- valgrind: $(VALGRINDS) $(VALGRINDDIFFS)
-@@ -173,11 +178,13 @@ installwww: www
+ www: all $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+@@ -170,15 +175,21 @@ installwww: www
        $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
        $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
  
@@ -32,29 +32,28 @@ Libtoolize for portable shared libraries
 -      $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
 +lowdown: liblowdown.la main.lo
 +      $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
- 
--lowdown-diff: lowdown
--      ln -f lowdown lowdown-diff
++
 +# For regress, we build this (just like lowdown) so that its libtool wrapper works.
 +# At install, we'll still just make a hard link to lowdown like upstream.
 +lowdown-diff: liblowdown.la main.lo
 +      $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
  
+-lowdown-diff: lowdown
+-      ln -f lowdown lowdown-diff
+ 
  liblowdown.a: $(OBJS) $(COMPAT_OBJS)
        $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
-@@ -186,14 +193,17 @@ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
-       $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,${LINKER_SONAME},$@.$(LIBVER) $(LDLIBS)
-       ln -sf $@.$(LIBVER) $@
  
 +liblowdown.la: $(LT_OBJS) $(LT_COMPAT_OBJS)
 +      $(LIBTOOL) --mode=link $(CC) -o $@ $(LT_OBJS) $(LT_COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm $(LDLIBS) -version-number $(LIBVER) -rpath $(LIBDIR)
 +
- install: bins
-       mkdir -p $(DESTDIR)$(BINDIR)
-       mkdir -p $(DESTDIR)$(MANDIR)/man1
-       mkdir -p $(DESTDIR)$(MANDIR)/man5
-       mkdir -p $(DESTDIR)$(SHAREDIR)/lowdown/odt
-       $(INSTALL_DATA) share/odt/styles.xml $(DESTDIR)$(SHAREDIR)/lowdown/odt
+ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+       $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,${LINKER_SONAME},$@.$(LIBVER) $(LDLIBS)
+       ln -sf $@.$(LIBVER) $@
+@@ -206,8 +217,8 @@ install: bins
+       $(INSTALL_DATA) share/man/* $(DESTDIR)$(SHAREDIR)/lowdown/man
+       $(INSTALL_DATA) share/ms/* $(DESTDIR)$(SHAREDIR)/lowdown/ms
+       $(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt
 -      $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
 -      $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
 +      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
@@ -62,9 +61,9 @@ Libtoolize for portable shared libraries
        for f in $(MAN1S) $(MAN5S) ; do \
                name=`basename $$f .html` ; \
                section=$${name##*.} ; \
-@@ -212,6 +222,9 @@ install_lib_common: lowdown.pc
-               $(INSTALL_MAN) man/$$name $(DESTDIR)$(MANDIR)/man$$section ; \
-       done
+@@ -238,6 +249,9 @@ install_lib_common: lowdown.pc
+ uninstall_shared: uninstall_lib_common
+       rm -f $(LIBDIR)/liblowdown.so.$(LIBVER) $(LIBDIR)/liblowdown.so
  
 +install_pkgsrc: liblowdown.la install_lib_common
 +      $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) liblowdown.la $(DESTDIR)$(LIBDIR)
@@ -72,7 +71,7 @@ Libtoolize for portable shared libraries
  install_shared: liblowdown.so install_lib_common
        $(INSTALL_LIB) liblowdown.so.$(LIBVER) $(DESTDIR)$(LIBDIR)
        ( cd $(DESTDIR)$(LIBDIR) && ln -sf liblowdown.so.$(LIBVER) liblowdown.so )
-@@ -279,6 +292,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo
+@@ -310,6 +324,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo
  
  $(HTMLS): versions.xml lowdown
  
@@ -82,7 +81,7 @@ Libtoolize for portable shared libraries
  .md.xml: lowdown
        ( echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" ; \
          echo "<article data-sblg-article=\"1\">" ; \
-@@ -313,13 +329,13 @@ lowdown.tar.gz:
+@@ -362,13 +379,13 @@ lowdown.tar.gz:
        ( cd .dist/ && tar zcf ../$@ lowdown-$(VERSION) )
        rm -rf .dist/