[geany/geany-plugins] 2ddd10: markdown: Update patch that shows changes made to Discount code

Matthew Brush git-noreply at xxxxx
Sun Aug 26 09:16:30 UTC 2012


Branch:      refs/heads/master
Author:      Matthew Brush <matt at geany.org>
Committer:   Matthew Brush <matt at geany.org>
Date:        Tue, 17 Jul 2012 04:09:33
Commit:      2ddd10f7ea62e039fb2d37e0a80cdad91f18d4e0
             https://github.com/geany/geany-plugins/commit/2ddd10f7ea62e039fb2d37e0a80cdad91f18d4e0

Log Message:
-----------
markdown: Update patch that shows changes made to Discount code

Mostly noisy but still makes it easier to see the changes made.


Modified Paths:
--------------
    markdown/discount/discount-changes.patch

Modified: markdown/discount/discount-changes.patch
1839 files changed, 942 insertions(+), 897 deletions(-)
===================================================================
@@ -2,934 +2,552 @@ Only in discount/: blocktags
 Only in discount/: config.h
 Only in discount-2.1.3/: configure.inc
 Only in discount-2.1.3/: configure.sh
+diff -ru discount-2.1.3/cstring.h discount/cstring.h
+--- discount-2.1.3/cstring.h	2012-01-16 13:08:52.000000000 -0800
++++ discount/cstring.h	2012-07-16 02:46:53.027807216 -0700
+@@ -42,7 +42,7 @@
+ 				 : malloc(sizeof T(t)[0] * ((t).alloc += sz))), \
+ 		    (p), sizeof(T(t)[0])*(sz))
+ 
+-#define PREFIX(t,p,sz)	\
++#define MDPREFIX(t,p,sz)	\
+ 	    RESERVE( (t), (sz) ); \
+ 	    if ( S(t) ) { memmove(T(t)+(sz), T(t), S(t)); } \
+ 	    memcpy( T(t), (p), (sz) ); \
 Only in discount/: .deps
-Only in discount-2.1.3/: INSTALL
-Only in discount-2.1.3/: main.c
-Only in discount/: Makefile
-Only in discount/: Makefile.am
-diff -u discount-2.1.3/Makefile.in discount/Makefile.in
---- discount-2.1.3/Makefile.in	2012-01-16 13:08:52.000000000 -0800
-+++ discount/Makefile.in	2012-07-14 17:18:03.592754692 -0700
-@@ -1,138 +1,793 @@
--CC=@CC@ -I. -L.
--CFLAGS=@CFLAGS@
--AR=@AR@
--RANLIB=@RANLIB@
--
--BINDIR=@exedir@
--MANDIR=@mandir@
--LIBDIR=@libdir@
--INCDIR=@prefix@/include
--
--PGMS=markdown
--SAMPLE_PGMS=mkd2html makepage
-- at THEME@SAMPLE_PGMS+= theme
--MKDLIB=libmarkdown
--OBJS=mkdio.o markdown.o dumptree.o generate.o \
--     resource.o docheader.o version.o toc.o css.o \
--     xml.o Csio.o xmlpage.o basename.o emmatch.o \
--     setup.o tags.o html5.o flags.o @AMALLOC@
--TESTFRAMEWORK=echo cols
--
--MAN3PAGES=mkd-callbacks.3 mkd-functions.3 markdown.3 mkd-line.3
--
--all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
--
--install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR)
--	@INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)$(BINDIR)
--	./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR)
--	@INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR)
--
--install.everything: install install.samples install.man
--
--install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
--	@INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(DESTDIR)$(BINDIR)
--	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
--	@INSTALL_DATA@ theme.1 makepage.1 mkd2html.1 $(DESTDIR)$(MANDIR)/man1
--
--install.man:
--	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man3
--	@INSTALL_DATA@ $(MAN3PAGES) $(DESTDIR)$(MANDIR)/man3
--	for x in mkd_line mkd_generateline; do \
--	    ( echo '.\"' ; echo ".so man3/mkd-line.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3;\
--	done
--	for x in mkd_in mkd_string; do \
--	    ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3;\
-+# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+# Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = markdown/discount
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/build/bundled/gpgme.m4 \
-+	$(top_srcdir)/build/addons.m4 $(top_srcdir)/build/cflags.m4 \
-+	$(top_srcdir)/build/codenav.m4 $(top_srcdir)/build/common.m4 \
-+	$(top_srcdir)/build/cppcheck.m4 \
-+	$(top_srcdir)/build/debugger.m4 $(top_srcdir)/build/devhelp.m4 \
-+	$(top_srcdir)/build/expansions.m4 $(top_srcdir)/build/geany.m4 \
-+	$(top_srcdir)/build/geanydoc.m4 \
-+	$(top_srcdir)/build/geanyextrasel.m4 \
-+	$(top_srcdir)/build/geanygdb.m4 \
-+	$(top_srcdir)/build/geanygendoc.m4 \
-+	$(top_srcdir)/build/geanyinsertnum.m4 \
-+	$(top_srcdir)/build/geanylatex.m4 \
-+	$(top_srcdir)/build/geanylipsum.m4 \
-+	$(top_srcdir)/build/geanylua.m4 \
-+	$(top_srcdir)/build/geanymacro.m4 \
-+	$(top_srcdir)/build/geanyminiscript.m4 \
-+	$(top_srcdir)/build/geanynumberedbookmarks.m4 \
-+	$(top_srcdir)/build/geanypg.m4 $(top_srcdir)/build/geanyprj.m4 \
-+	$(top_srcdir)/build/geanysendmail.m4 \
-+	$(top_srcdir)/build/geanyvc.m4 \
-+	$(top_srcdir)/build/geniuspaste.m4 \
-+	$(top_srcdir)/build/gproject.m4 $(top_srcdir)/build/i18n.m4 \
-+	$(top_srcdir)/build/markdown.m4 \
-+	$(top_srcdir)/build/multiterm.m4 \
-+	$(top_srcdir)/build/pretty-printer.m4 \
-+	$(top_srcdir)/build/shiftcolumn.m4 \
-+	$(top_srcdir)/build/spellcheck.m4 \
-+	$(top_srcdir)/build/status.m4 \
-+	$(top_srcdir)/build/tableconvert.m4 \
-+	$(top_srcdir)/build/treebrowser.m4 \
-+	$(top_srcdir)/build/unittests.m4 \
-+	$(top_srcdir)/build/updatechecker.m4 \
-+	$(top_srcdir)/build/webhelper.m4 \
-+	$(top_srcdir)/build/xmlsnippets.m4 \
-+	$(top_srcdir)/build/cache/glib-gettext.m4 \
-+	$(top_srcdir)/build/cache/intltool.m4 \
-+	$(top_srcdir)/build/cache/libtool.m4 \
-+	$(top_srcdir)/build/cache/ltoptions.m4 \
-+	$(top_srcdir)/build/cache/ltsugar.m4 \
-+	$(top_srcdir)/build/cache/ltversion.m4 \
-+	$(top_srcdir)/build/cache/lt~obsolete.m4 \
-+	$(top_srcdir)/build/cache/nls.m4 \
-+	$(top_srcdir)/build/cache/pkg.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libdiscount_la_DEPENDENCIES =
-+am_libdiscount_la_OBJECTS = libdiscount_la-amalloc.lo \
-+	libdiscount_la-basename.lo libdiscount_la-Csio.lo \
-+	libdiscount_la-css.lo libdiscount_la-docheader.lo \
-+	libdiscount_la-dumptree.lo libdiscount_la-emmatch.lo \
-+	libdiscount_la-flags.lo libdiscount_la-generate.lo \
-+	libdiscount_la-html5.lo libdiscount_la-markdown.lo \
-+	libdiscount_la-mkdio.lo libdiscount_la-resource.lo \
-+	libdiscount_la-setup.lo libdiscount_la-tags.lo \
-+	libdiscount_la-toc.lo libdiscount_la-version.lo \
-+	libdiscount_la-xml.lo libdiscount_la-xmlpage.lo
-+libdiscount_la_OBJECTS = $(am_libdiscount_la_OBJECTS)
-+AM_V_lt = $(am__v_lt_ at AM_V@)
-+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-+am__v_lt_0 = --silent
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+AM_V_CC = $(am__v_CC_ at AM_V@)
-+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-+am__v_CC_0 = @echo "  CC    " $@;
-+AM_V_at = $(am__v_at_ at AM_V@)
-+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-+am__v_at_0 = @
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
-+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-+am__v_CCLD_0 = @echo "  CCLD  " $@;
-+AM_V_GEN = $(am__v_GEN_ at AM_V@)
-+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo "  GEN   " $@;
-+SOURCES = $(libdiscount_la_SOURCES)
-+DIST_SOURCES = $(libdiscount_la_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALL_LINGUAS = @ALL_LINGUAS@
-+AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CHECK_CFLAGS = @CHECK_CFLAGS@
-+CHECK_LIBS = @CHECK_LIBS@
-+CPP = @CPP@
-+CPPCHECK = @CPPCHECK@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DATADIRNAME = @DATADIRNAME@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DEVHELP_CFLAGS = @DEVHELP_CFLAGS@
-+DEVHELP_LIBS = @DEVHELP_LIBS@
-+DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
-+ENCHANT_LIBS = @ENCHANT_LIBS@
-+EXEEXT = @EXEEXT@
-+FGREP = @FGREP@
-+GEANYGENDOC_CFLAGS = @GEANYGENDOC_CFLAGS@
-+GEANYGENDOC_LIBS = @GEANYGENDOC_LIBS@
-+GEANY_CFLAGS = @GEANY_CFLAGS@
-+GEANY_LIBS = @GEANY_LIBS@
-+GEANY_VERSION = @GEANY_VERSION@
-+GENIUSPASTE_CFLAGS = @GENIUSPASTE_CFLAGS@
-+GENIUSPASTE_LIBS = @GENIUSPASTE_LIBS@
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GIO_CFLAGS = @GIO_CFLAGS@
-+GIO_LIBS = @GIO_LIBS@
-+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-+GLIB_MKENUMS = @GLIB_MKENUMS@
-+GMODULE_CFLAGS = @GMODULE_CFLAGS@
-+GMODULE_LIBS = @GMODULE_LIBS@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+GPGME_CFLAGS = @GPGME_CFLAGS@
-+GPGME_CONFIG = @GPGME_CONFIG@
-+GPGME_LIBS = @GPGME_LIBS@
-+GP_CFLAGS = @GP_CFLAGS@
-+GREP = @GREP@
-+GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
-+GTKSPELL_LIBS = @GTKSPELL_LIBS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLLIBS = @INTLLIBS@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+INTLTOOL_MERGE = @INTLTOOL_MERGE@
-+INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+LD = @LD@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIPO = @LIPO@
-+LN_S = @LN_S@
-+LOCALEDIR = @LOCALEDIR@
-+LTLIBOBJS = @LTLIBOBJS@
-+LUA_CFLAGS = @LUA_CFLAGS@
-+LUA_LIBS = @LUA_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
-+MARKDOWN_CFLAGS = @MARKDOWN_CFLAGS@
-+MARKDOWN_LIBS = @MARKDOWN_LIBS@
-+MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
-+MULTITERM_CFLAGS = @MULTITERM_CFLAGS@
-+MULTITERM_LIBS = @MULTITERM_LIBS@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-+RANLIB = @RANLIB@
-+RST2HTML = @RST2HTML@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+UPDATECHECKER_CFLAGS = @UPDATECHECKER_CFLAGS@
-+UPDATECHECKER_LIBS = @UPDATECHECKER_LIBS@
-+USE_NLS = @USE_NLS@
-+VALAC = @VALAC@
-+VERSION = @VERSION@
-+VTE_CFLAGS = @VTE_CFLAGS@
-+VTE_LIBS = @VTE_LIBS@
-+WEBHELPER_CFLAGS = @WEBHELPER_CFLAGS@
-+WEBHELPER_LIBS = @WEBHELPER_LIBS@
-+XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+geanypluginsdir = @geanypluginsdir@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+intltool__v_merge_options_ = @intltool__v_merge_options_@
-+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+noinst_LTLIBRARIES = libdiscount.la
-+libdiscount_la_SOURCES = \
-+	amalloc.c \
-+	amalloc.h \
-+	basename.c \
-+	config.h \
-+	Csio.c \
-+	css.c \
-+	cstring.h \
-+	docheader.c \
-+	dumptree.c \
-+	emmatch.c \
-+	flags.c \
-+	generate.c \
-+	html5.c \
-+	markdown.c \
-+	markdown.h \
-+	mkdio.c \
-+	mkdio.h \
-+	resource.c \
-+	setup.c \
-+	tags.c \
-+	tags.h \
-+	toc.c \
-+	version.c \
-+	xml.c \
-+	xmlpage.c
-+
-+libdiscount_la_CPPFLAGS = @MARKDOWN_CFLAGS@
-+libdiscount_la_LIBADD = @MARKDOWN_LIBS@
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign markdown/discount/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign markdown/discount/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
- 	done
--	for x in mkd_compile mkd_css mkd_generatecss mkd_generatehtml mkd_cleanup mkd_doc_title mkd_doc_author mkd_doc_date; do \
--	    ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3; \
-+libdiscount.la: $(libdiscount_la_OBJECTS) $(libdiscount_la_DEPENDENCIES) $(EXTRA_libdiscount_la_DEPENDENCIES) 
-+	$(AM_V_CCLD)$(LINK)  $(libdiscount_la_OBJECTS) $(libdiscount_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-Csio.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-amalloc.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-basename.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-css.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-docheader.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-dumptree.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-emmatch.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-flags.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-generate.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-html5.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-markdown.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-mkdio.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-resource.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-setup.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-tags.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-toc.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-version.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-xml.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdiscount_la-xmlpage.Plo at am__quote@
-+
-+.c.o:
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c $<
-+
-+.c.obj:
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
-+
-+libdiscount_la-amalloc.lo: amalloc.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-amalloc.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-amalloc.Tpo -c -o libdiscount_la-amalloc.lo `test -f 'amalloc.c' || echo '$(srcdir)/'`amalloc.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-amalloc.Tpo $(DEPDIR)/libdiscount_la-amalloc.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='amalloc.c' object='libdiscount_la-amalloc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-amalloc.lo `test -f 'amalloc.c' || echo '$(srcdir)/'`amalloc.c
-+
-+libdiscount_la-basename.lo: basename.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-basename.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-basename.Tpo -c -o libdiscount_la-basename.lo `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-basename.Tpo $(DEPDIR)/libdiscount_la-basename.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='basename.c' object='libdiscount_la-basename.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-basename.lo `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
-+
-+libdiscount_la-Csio.lo: Csio.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-Csio.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-Csio.Tpo -c -o libdiscount_la-Csio.lo `test -f 'Csio.c' || echo '$(srcdir)/'`Csio.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-Csio.Tpo $(DEPDIR)/libdiscount_la-Csio.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Csio.c' object='libdiscount_la-Csio.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-Csio.lo `test -f 'Csio.c' || echo '$(srcdir)/'`Csio.c
-+
-+libdiscount_la-css.lo: css.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-css.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-css.Tpo -c -o libdiscount_la-css.lo `test -f 'css.c' || echo '$(srcdir)/'`css.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-css.Tpo $(DEPDIR)/libdiscount_la-css.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='css.c' object='libdiscount_la-css.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-css.lo `test -f 'css.c' || echo '$(srcdir)/'`css.c
-+
-+libdiscount_la-docheader.lo: docheader.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-docheader.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-docheader.Tpo -c -o libdiscount_la-docheader.lo `test -f 'docheader.c' || echo '$(srcdir)/'`docheader.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-docheader.Tpo $(DEPDIR)/libdiscount_la-docheader.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docheader.c' object='libdiscount_la-docheader.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-docheader.lo `test -f 'docheader.c' || echo '$(srcdir)/'`docheader.c
-+
-+libdiscount_la-dumptree.lo: dumptree.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-dumptree.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-dumptree.Tpo -c -o libdiscount_la-dumptree.lo `test -f 'dumptree.c' || echo '$(srcdir)/'`dumptree.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-dumptree.Tpo $(DEPDIR)/libdiscount_la-dumptree.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumptree.c' object='libdiscount_la-dumptree.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-dumptree.lo `test -f 'dumptree.c' || echo '$(srcdir)/'`dumptree.c
-+
-+libdiscount_la-emmatch.lo: emmatch.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-emmatch.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-emmatch.Tpo -c -o libdiscount_la-emmatch.lo `test -f 'emmatch.c' || echo '$(srcdir)/'`emmatch.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-emmatch.Tpo $(DEPDIR)/libdiscount_la-emmatch.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='emmatch.c' object='libdiscount_la-emmatch.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-emmatch.lo `test -f 'emmatch.c' || echo '$(srcdir)/'`emmatch.c
-+
-+libdiscount_la-flags.lo: flags.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-flags.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-flags.Tpo -c -o libdiscount_la-flags.lo `test -f 'flags.c' || echo '$(srcdir)/'`flags.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-flags.Tpo $(DEPDIR)/libdiscount_la-flags.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='flags.c' object='libdiscount_la-flags.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-flags.lo `test -f 'flags.c' || echo '$(srcdir)/'`flags.c
-+
-+libdiscount_la-generate.lo: generate.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-generate.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-generate.Tpo -c -o libdiscount_la-generate.lo `test -f 'generate.c' || echo '$(srcdir)/'`generate.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-generate.Tpo $(DEPDIR)/libdiscount_la-generate.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='generate.c' object='libdiscount_la-generate.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-generate.lo `test -f 'generate.c' || echo '$(srcdir)/'`generate.c
-+
-+libdiscount_la-html5.lo: html5.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-html5.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-html5.Tpo -c -o libdiscount_la-html5.lo `test -f 'html5.c' || echo '$(srcdir)/'`html5.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-html5.Tpo $(DEPDIR)/libdiscount_la-html5.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='html5.c' object='libdiscount_la-html5.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-html5.lo `test -f 'html5.c' || echo '$(srcdir)/'`html5.c
-+
-+libdiscount_la-markdown.lo: markdown.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-markdown.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-markdown.Tpo -c -o libdiscount_la-markdown.lo `test -f 'markdown.c' || echo '$(srcdir)/'`markdown.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-markdown.Tpo $(DEPDIR)/libdiscount_la-markdown.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='markdown.c' object='libdiscount_la-markdown.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-markdown.lo `test -f 'markdown.c' || echo '$(srcdir)/'`markdown.c
-+
-+libdiscount_la-mkdio.lo: mkdio.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-mkdio.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-mkdio.Tpo -c -o libdiscount_la-mkdio.lo `test -f 'mkdio.c' || echo '$(srcdir)/'`mkdio.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-mkdio.Tpo $(DEPDIR)/libdiscount_la-mkdio.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mkdio.c' object='libdiscount_la-mkdio.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-mkdio.lo `test -f 'mkdio.c' || echo '$(srcdir)/'`mkdio.c
-+
-+libdiscount_la-resource.lo: resource.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-resource.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-resource.Tpo -c -o libdiscount_la-resource.lo `test -f 'resource.c' || echo '$(srcdir)/'`resource.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-resource.Tpo $(DEPDIR)/libdiscount_la-resource.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='resource.c' object='libdiscount_la-resource.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-resource.lo `test -f 'resource.c' || echo '$(srcdir)/'`resource.c
-+
-+libdiscount_la-setup.lo: setup.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-setup.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-setup.Tpo -c -o libdiscount_la-setup.lo `test -f 'setup.c' || echo '$(srcdir)/'`setup.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-setup.Tpo $(DEPDIR)/libdiscount_la-setup.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='setup.c' object='libdiscount_la-setup.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-setup.lo `test -f 'setup.c' || echo '$(srcdir)/'`setup.c
-+
-+libdiscount_la-tags.lo: tags.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-tags.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-tags.Tpo -c -o libdiscount_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-tags.Tpo $(DEPDIR)/libdiscount_la-tags.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags.c' object='libdiscount_la-tags.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-tags.lo `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
-+
-+libdiscount_la-toc.lo: toc.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-toc.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-toc.Tpo -c -o libdiscount_la-toc.lo `test -f 'toc.c' || echo '$(srcdir)/'`toc.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-toc.Tpo $(DEPDIR)/libdiscount_la-toc.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='toc.c' object='libdiscount_la-toc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-toc.lo `test -f 'toc.c' || echo '$(srcdir)/'`toc.c
-+
-+libdiscount_la-version.lo: version.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-version.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-version.Tpo -c -o libdiscount_la-version.lo `test -f 'version.c' || echo '$(srcdir)/'`version.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-version.Tpo $(DEPDIR)/libdiscount_la-version.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='version.c' object='libdiscount_la-version.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-version.lo `test -f 'version.c' || echo '$(srcdir)/'`version.c
-+
-+libdiscount_la-xml.lo: xml.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-xml.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-xml.Tpo -c -o libdiscount_la-xml.lo `test -f 'xml.c' || echo '$(srcdir)/'`xml.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-xml.Tpo $(DEPDIR)/libdiscount_la-xml.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xml.c' object='libdiscount_la-xml.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-xml.lo `test -f 'xml.c' || echo '$(srcdir)/'`xml.c
-+
-+libdiscount_la-xmlpage.lo: xmlpage.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdiscount_la-xmlpage.lo -MD -MP -MF $(DEPDIR)/libdiscount_la-xmlpage.Tpo -c -o libdiscount_la-xmlpage.lo `test -f 'xmlpage.c' || echo '$(srcdir)/'`xmlpage.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdiscount_la-xmlpage.Tpo $(DEPDIR)/libdiscount_la-xmlpage.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xmlpage.c' object='libdiscount_la-xmlpage.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdiscount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdiscount_la-xmlpage.lo `test -f 'xmlpage.c' || echo '$(srcdir)/'`xmlpage.c
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
- 	done
--	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7
--	@INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7
--	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
--	@INSTALL_DATA@ markdown.1 $(DESTDIR)$(MANDIR)/man1
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
- 
--install.everything: install install.man
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
--$(DESTDIR)$(BINDIR):
--	@INSTALL_DIR@ $(DESTDIR)$(BINDIR)
-+installcheck: installcheck-am
-+install-strip:
-+	if test -z '$(STRIP)'; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	      install; \
-+	else \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+	fi
-+mostlyclean-generic:
- 
--$(DESTDIR)$(INCDIR):
--	@INSTALL_DIR@ $(DESTDIR)$(INCDIR)
-+clean-generic:
- 
--$(DESTDIR)$(LIBDIR):
--	@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 
--version.o: version.c VERSION
--	$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
- 
--VERSION:
--	@true
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-+	mostlyclean-am
- 
--tags.o: tags.c blocktags
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
- 
--blocktags: mktags
--	./mktags > blocktags
-+dvi: dvi-am
- 
--# example programs
-- at THEME@theme:  theme.o $(MKDLIB) mkdio.h
-- at THEME@	$(CC) -o theme theme.o -lmarkdown @LIBS@
-+dvi-am:
- 
-+html: html-am
- 
--mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
--	$(CC) -o mkd2html mkd2html.o -lmarkdown @LIBS@
-+html-am:
- 
--markdown: main.o pgm_options.o $(MKDLIB)
--	$(CC) $(CFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
--	
--makepage:  makepage.c pgm_options.o $(MKDLIB) mkdio.h
--	$(CC) $(CFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
-+info: info-am
+Only in discount/: discount-changes.patch
+diff -ru discount-2.1.3/emmatch.c discount/emmatch.c
+--- discount-2.1.3/emmatch.c	2012-01-16 13:08:52.000000000 -0800
++++ discount/emmatch.c	2012-07-16 02:46:53.031807216 -0700
+@@ -141,7 +141,7 @@
  
--pgm_options.o: pgm_options.c mkdio.h config.h
--	$(CC) -I. -c pgm_options.c
-+info-am:
+ 	emblock(f, first, e);
  
--main.o: main.c mkdio.h config.h
--	$(CC) -I. -c main.c
-+install-data-am:
+-	PREFIX(start->b_text, emtags[match-1].open, emtags[match-1].size-1);
++	MDPREFIX(start->b_text, emtags[match-1].open, emtags[match-1].size-1);
+ 	SUFFIX(end->b_post, emtags[match-1].close, emtags[match-1].size);
  
--$(MKDLIB): $(OBJS)
--	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
-+install-dvi: install-dvi-am
+ 	emmatch(f, first, last);
+diff -ru discount-2.1.3/generate.c discount/generate.c
+--- discount-2.1.3/generate.c	2012-01-16 13:08:52.000000000 -0800
++++ discount/generate.c	2012-07-16 17:56:36.659229192 -0700
+@@ -115,7 +115,7 @@
+ Qchar(int c, MMIOT *f)
+ {
+     block *cur;
+-    
++
+     if ( S(f->Q) == 0 ) {
+ 	cur = &EXPAND(f->Q);
+ 	memset(cur, 0, sizeof *cur);
+@@ -125,7 +125,7 @@
+ 	cur = &T(f->Q)[S(f->Q)-1];
  
--verify: echo tools/checkbits.sh
--	@./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
-+install-dvi-am:
-+
-+install-exec-am:
+     EXPAND(cur->b_text) = c;
+-    
 +
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
+ }
+ 
+ 
+@@ -188,7 +188,7 @@
+     MMIOT sub;
+ 
+     ___mkd_initmmiot(&sub, f->footnotes);
+-    
++
+     sub.flags = f->flags | flags;
+     sub.cb = f->cb;
+     sub.ref_prefix = f->ref_prefix;
+@@ -196,10 +196,10 @@
+     push(bfr, size, &sub);
+     EXPAND(sub.in) = 0;
+     S(sub.in)--;
+-    
++
+     text(&sub);
+     ___mkd_emblock(&sub);
+-    
++
+     Qwrite(T(sub.out), S(sub.out), f);
+ 
+     ___mkd_freemmiot(&sub, f->footnotes);
+@@ -223,7 +223,7 @@
+ 	    if ( !( ispunct(c) || isspace(c) ) )
+ 		Qchar('\\', f);
+ 	}
+-	
 +
-+install-man:
+ 	if ( c == '&' )
+ 	    Qstring("&", f);
+ 	else if ( c == '<' )
+@@ -355,7 +355,7 @@
+ /* extract a <...>-encased url from the input stream.
+  * (markdown 1.0.2b8 compatibility; older versions
+  * of markdown treated the < and > as syntactic
+- * sugar that didn't have to be there.  1.0.2b8 
++ * sugar that didn't have to be there.  1.0.2b8
+  * requires a closing >, and then falls into the
+  * title or closing )
+  */
+@@ -385,13 +385,13 @@
+ 	good=1;
+     else if ( image && (c == '=') && linkysize(f,p) )
+ 	good=1;
+-    else 
++    else
+ 	good=( c == ')' );
+ 
+     if ( good ) {
+ 	if ( peek(f, 1) == ')' )
+ 	    pull(f);
+-	    
 +
-+install-pdf: install-pdf-am
+ 	___mkd_tidy(&p->link);
+     }
+ 
+@@ -437,12 +437,12 @@
+     }
+     if ( peek(f, 1) == ')' )
+ 	pull(f);
+-	
 +
-+install-pdf-am:
+     ___mkd_tidy(&p->link);
+-    
 +
-+install-ps: install-ps-am
+     if ( mayneedtotrim && (T(p->link)[S(p->link)-1] == '>') )
+ 	--S(p->link);
+-    
 +
-+install-ps-am:
+     return 1;
+ }
+ 
+@@ -453,12 +453,12 @@
+ static struct _protocol {
+     char *name;
+     int   nlen;
+-} protocol[] = { 
++} protocol[] = {
+ #define _aprotocol(x)	{ x, (sizeof x)-1 }
+-    _aprotocol( "https:" ), 
+-    _aprotocol( "http:" ), 
++    _aprotocol( "https:" ),
++    _aprotocol( "http:" ),
+     _aprotocol( "news:" ),
+-    _aprotocol( "ftp:" ), 
++    _aprotocol( "ftp:" ),
+ #undef _aprotocol
+ };
+ #define NRPROTOCOLS	(sizeof protocol / sizeof protocol[0])
+@@ -479,7 +479,7 @@
+ 
+ /*
+  * all the tag types that linkylinky can produce are
+- * defined by this structure. 
++ * defined by this structure.
+  */
+ typedef struct linkytype {
+     char      *pat;
+@@ -538,12 +538,12 @@
+ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
+ {
+     char *edit;
+-    
++
+     if ( f->flags & IS_LABEL )
+ 	return;
+-    
++
+     Qstring(tag->link_pfx, f);
+-	
 +
-+installcheck-am:
+     if ( tag->kind & IS_URL ) {
+ 	if ( f->cb && f->cb->e_url && (edit = (*f->cb->e_url)(link, size, f->cb->e_data)) ) {
+ 	    puturl(edit, strlen(edit), f, 0);
+@@ -583,7 +583,7 @@
+ {
+     if ( ref->flags & REFERENCED )
+ 	return 0;
+-	
 +
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
+     if ( f->flags & IS_LABEL )
+     	___mkd_reparse(T(text), S(text), linkt.flags, f);
+     else {
+@@ -659,7 +659,7 @@
+     int start = mmiottell(f);
+     Cstring name;
+     Footnote key, *ref;
+-		
++
+     int status = 0;
+     int extra_footnote = 0;
+ 
+@@ -677,7 +677,7 @@
+ 
+ 	    if ( isspace(peek(f,1)) )
+ 		pull(f);
+-	    
++
+ 	    if ( peek(f,1) == '[' ) {
+ 		pull(f);	/* consume leading '[' */
+ 		goodlink = linkylabel(f, &key.tag);
+@@ -692,7 +692,7 @@
+ 		if ( (f->flags & MKD_EXTRA_FOOTNOTE) && (!image) && S(name) && T(name)[0] == '^' )
+ 		    extra_footnote = 1;
+ 	    }
+-	    
++
+ 	    if ( goodlink ) {
+ 		if ( !S(key.tag) ) {
+ 		    DELETE(key.tag);
+@@ -737,7 +737,7 @@
+     }
+ }
+ 
+- 
++
+ /*
+  * convert an email address to a string of nonsense
+  */
+@@ -775,7 +775,7 @@
+ {
+     int size, count, c;
+     int subsize=0, subtick=0;
+-    
++
+     *endticks = ticks;
+     for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) {
+ 	if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) {
+@@ -836,7 +836,7 @@
+ 
+     if ( size > 1 && peek(f, size-1) == ' ' ) --size;
+     if ( peek(f,i) == ' ' ) ++i, --size;
+-    
++
+     Qstring("<code>", f);
+     code(f, cursor(f)+(i-1), size);
+     Qstring("</code>", f);
+@@ -873,17 +873,17 @@
+ maybe_address(char *p, int size)
+ {
+     int ok = 0;
+-    
++
+     for ( ;size && (isalnum(*p) || strchr("._-+*", *p)); ++p, --size)
+ 	;
+ 
+     if ( ! (size && *p == '@') )
+ 	return 0;
+-    
 +
-+mostlyclean: mostlyclean-am
+     --size, ++p;
+ 
+     if ( size && *p == '.' ) return 0;
+-    
 +
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
+     for ( ;size && (isalnum(*p) || strchr("._-+", *p)); ++p, --size )
+ 	if ( *p == '.' && size > 1 ) ok = 1;
+ 
+@@ -902,7 +902,7 @@
+     int address= 0;
+     int mailto = 0;
+     char *text = cursor(f);
+-    
 +
-+pdf: pdf-am
+     if ( f->flags & MKD_NOLINKS ) return 0;
+ 
+     if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 ) {
+@@ -912,10 +912,10 @@
+ 	address = 1;
+ 	mailto = 7; 	/* 7 is the length of "mailto:"; we need this */
+     }
+-    else 
++    else
+ 	address = maybe_address(text, size);
+ 
+-    if ( address ) { 
++    if ( address ) {
+ 	Qstring("<a href=\"", f);
+ 	if ( !mailto ) {
+ 	    /* supply a mailto: protocol if one wasn't attached */
+@@ -982,7 +982,7 @@
+ 		    return 0;
+ 		else
+ 		    size++;
+-	    
++
+ 	    if ( forbidden_tag(f) )
+ 		return 0;
+ 
+@@ -996,7 +996,7 @@
+ 	    return 1;
+ 	}
+     }
+-    
++
+     return 0;
+ }
+ 
+@@ -1226,7 +1226,7 @@
+ 		    else
+ 			Qchar(c, f);
+ 		    break;
+-			
++
+ 	case '!':   if ( peek(f,1) == '[' ) {
+ 			pull(f);
+ 			if ( tag_text(f) || !linkylinky(1, f) )
+@@ -1296,7 +1296,7 @@
+ 			Qem(f,c,rep);
+ 		    }
+ 		    break;
+-	
 +
-+pdf-am:
+ 	case '~':   if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || ! tickhandler(f,c,2,0, delspan) )
+ 			Qchar(c, f);
+ 		    break;
+@@ -1317,7 +1317,7 @@
+ 				}
+ 				Qchar(c, f);
+ 				break;
+-				
++
+ 		    case ':': case '|':
+ 				if ( f->flags & MKD_NOTABLES ) {
+ 				    Qchar('\\', f);
+@@ -1326,7 +1326,7 @@
+ 				}
+ 				Qchar(c, f);
+ 				break;
+-				
++
+ 		    case '>': case '#': case '.': case '-':
+ 		    case '+': case '{': case '}': case ']':
+ 		    case '!': case '[': case '*': case '_':
+@@ -1413,7 +1413,7 @@
+     ___mkd_tidy(&p->text);
+     if ( T(p->text)[S(p->text)-1] == '|' )
+ 	--S(p->text);
+-    
++
+     Qstring("<tr>\n", f);
+     while ( idx < S(p->text) ) {
+ 	first = idx;
+@@ -1474,7 +1474,7 @@
+     for (p=T(dash->text), start=dash->dle; start < S(dash->text); ) {
+ 	char first, last;
+ 	int end;
+-	
 +
-+ps: ps-am
+ 	last=first=0;
+ 	for (end=start ; (end < S(dash->text)) && p[end] != '|'; ++ end ) {
+ 	    if ( p[end] == '\\' )
+@@ -1569,10 +1569,10 @@
+ printhtml(Line *t, MMIOT *f)
+ {
+     int blanks;
+-    
++
+     for ( blanks=0; t ; t = t->next )
+ 	if ( S(t->text) ) {
+-	    for ( ; blanks; --blanks ) 
++	    for ( ; blanks; --blanks )
+ 		Qchar('\n', f);
+ 
+ 	    Qwrite(T(t->text), S(t->text), f);
+@@ -1651,7 +1651,7 @@
+ display(Paragraph *p, MMIOT *f)
+ {
+     if ( !p ) return 0;
+-    
++
+     switch ( p->typ ) {
+     case STYLE:
+     case WHITESPACE:
+@@ -1660,15 +1660,15 @@
+     case HTML:
+ 	printhtml(p->text, f);
+ 	break;
+-	
 +
-+ps-am:
+     case CODE:
+ 	printcode(p->text, f);
+ 	break;
+-	
 +
-+uninstall-am:
+     case QUOTE:
+ 	htmlify(p->down, p->ident ? "div" : "blockquote", p->ident, f);
+ 	break;
+-	
 +
-+.MAKE: install-am install-strip
+     case UL:
+     case OL:
+     case AL:
+@@ -1694,7 +1694,7 @@
+     case SOURCE:
+ 	htmlify(p->down, 0, 0, f);
+ 	break;
+-	
 +
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+     default:
+ 	printblock(p, f);
+ 	break;
+@@ -1715,7 +1715,7 @@
+ 	return;
  
--test:	$(PGMS) $(TESTFRAMEWORK) verify
--	@for x in tests/*.t; do \
--	    @LD_LIBRARY_PATH@=`pwd` sh $$x || exit 1; \
--	done
+     Csprintf(&m->out, "\n<div class=\"footnotes\">\n<hr/>\n<ol>\n");
+-    
++
+     for ( i=1; i <= m->reference; i++ ) {
+ 	for ( j=0; j < S(*m->footnotes); j++ ) {
+ 	    t = &T(*m->footnotes)[j];
+@@ -1740,22 +1740,23 @@
+ mkd_document(Document *p, char **res)
+ {
+     int size;
+-    
++
+     if ( p && p->compiled ) {
+-	if ( ! p->html ) {
+-	    htmlify(p->code, 0, 0, p->ctx);
+-	    if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE )
+-		mkd_extra_footnotes(p->ctx);
+-	    p->html = 1;
+-	}
  
--cols:   tools/cols.c config.h
--	$(CC) -o cols tools/cols.c
--echo:   tools/echo.c config.h
--	$(CC) -o echo tools/echo.c
+-	size = S(p->ctx->out);
 -	
--clean:
--	rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o
--	rm -f $(MKDLIB) `./librarian.sh files $(MKDLIB) VERSION`
--
--distclean spotless: clean
--	rm -f @GENERATED_FILES@ @CONFIGURE_FILES@
--
--Csio.o: Csio.c cstring.h amalloc.h config.h markdown.h
--amalloc.o: amalloc.c
--basename.o: basename.c config.h cstring.h amalloc.h markdown.h
--css.o: css.c config.h cstring.h amalloc.h markdown.h
--docheader.o: docheader.c config.h cstring.h amalloc.h markdown.h
--dumptree.o: dumptree.c markdown.h cstring.h amalloc.h config.h
--emmatch.o: emmatch.c config.h cstring.h amalloc.h markdown.h
--generate.o: generate.c config.h cstring.h amalloc.h markdown.h
--main.o: main.c config.h amalloc.h
--pgm_options.o: pgm_options.c pgm_options.h config.h amalloc.h
--makepage.o: makepage.c
--markdown.o: markdown.c config.h cstring.h amalloc.h markdown.h
--mkd2html.o: mkd2html.c config.h mkdio.h cstring.h amalloc.h
--mkdio.o: mkdio.c config.h cstring.h amalloc.h markdown.h
--resource.o: resource.c config.h cstring.h amalloc.h markdown.h
--theme.o: theme.c config.h mkdio.h cstring.h amalloc.h
--toc.o: toc.c config.h cstring.h amalloc.h markdown.h
--version.o: version.c config.h
--xml.o: xml.c config.h cstring.h amalloc.h markdown.h
--xmlpage.o: xmlpage.c config.h cstring.h amalloc.h markdown.h
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
+-	if ( (size == 0) || T(p->ctx->out)[size-1] )
+-	    EXPAND(p->ctx->out) = 0;
+-	
+-	*res = T(p->ctx->out);
+-	return size;
++      if ( ! p->html ) {
++          htmlify(p->code, 0, 0, p->ctx);
++          if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE )
++            mkd_extra_footnotes(p->ctx);
++          p->html = 1;
++      }
++
++      size = S(p->ctx->out);
++
++      if ( (size == 0) || T(p->ctx->out)[size-1] )
++          EXPAND(p->ctx->out) = 0;
++
++      *res = T(p->ctx->out);
++      return size;
+     }
+     return EOF;
+ }
+Only in discount-2.1.3/: INSTALL
+Only in discount-2.1.3/: main.c
+Only in discount-2.1.3/: Makefile.in
 Only in discount-2.1.3/: makepage.1
 Only in discount-2.1.3/: makepage.c
 Only in discount-2.1.3/: markdown.1
 Only in discount-2.1.3/: markdown.3
 Only in discount-2.1.3/: markdown.7
-diff -u discount-2.1.3/markdown.c discount/markdown.c
+diff -ru discount-2.1.3/markdown.c discount/markdown.c
 --- discount-2.1.3/markdown.c	2012-01-16 13:08:52.000000000 -0800
-+++ discount/markdown.c	2012-07-14 17:10:34.896759442 -0700
++++ discount/markdown.c	2012-07-16 19:52:23.619155626 -0700
+@@ -125,11 +125,11 @@
+ 	 * the !-- doesn't need to end in a whitespace
+ 	 */
+ 	return &comment;
+-    
++
+     /* find how long the tag is so we can check to see if
+      * it's a block-level tag
+      */
+-    for ( i=1; i < len && T(p->text)[i] != '>' 
++    for ( i=1; i < len && T(p->text)[i] != '>'
+ 		       && T(p->text)[i] != '/'
+ 		       && !isspace(T(p->text)[i]); ++i )
+ 	;
+@@ -193,7 +193,7 @@
+     l->flags |= CHECKED;
+     l->kind = chk_text;
+     l->count = 0;
+-    
++
+     if (l->dle >= 4) { l->kind=chk_code; return; }
+ 
+     for ( eol = S(l->text); eol > l->dle && isspace(T(l->text)[eol-1]); --eol )
+@@ -261,10 +261,10 @@
+     int i, closing, depth=0;
+ 
+     *unclosed = 0;
+-    
++
+     if ( tag == &comment )
+ 	return commentblock(p, unclosed);
+-    
++
+     if ( tag->selfclose ) {
+ 	ret = f.t->next;
+ 	f.t->next = 0;
+@@ -286,7 +286,7 @@
+ 		    }
+ 		}
+ 	    }
+-	    else { 
++	    else {
+ 		if ( closing = (c == '/') ) c = flogetc(&f);
+ 
+ 		for ( i=0; i < tag->size; c=flogetc(&f) ) {
+@@ -369,7 +369,7 @@
+ issetext(Line *t, int *htyp)
+ {
+     Line *n;
+-    
++
+     /* check for setext-style HEADER
+      *                        ======
+      */
+@@ -407,10 +407,10 @@
+ end_of_block(Line *t)
+ {
+     int dummy;
+-    
++
+     if ( !t )
+ 	return 0;
+-	
++
+     return ( (S(t->text) <= t->dle) || ishr(t) || ishdr(t, &dummy) );
+ }
+ 
+@@ -448,11 +448,11 @@
+ is_extra_dt(Line *t, int *clip)
+ {
+ #if USE_EXTRA_DL
+-    
++
+     if ( t && t->next && T(t->text)[0] != '='
+ 		      && T(t->text)[S(t->text)-1] != '=') {
+ 	Line *x;
+-    
++
+ 	if ( iscode(t) || end_of_block(t) )
+ 	    return 0;
+ 
+@@ -460,7 +460,7 @@
+ 	    *clip = x->dle+2;
+ 	    return t;
+ 	}
+-	
++
+ 	if ( x=is_extra_dt(t->next, clip) )
+ 	    return x;
+     }
+@@ -488,7 +488,7 @@
+ {
+     int i, j;
+     char *q;
+-    
++
+     if ( end_of_block(t) )
+ 	return 0;
+ 
 @@ -514,7 +514,7 @@
  		return AL;
  	    }
@@ -939,11 +557,338 @@ diff -u discount-2.1.3/markdown.c discount/markdown.c
  	    if ( (q > T(t->text)+t->dle) && (q == T(t->text) + (j-1)) ) {
  		j = nextnonblank(t,j);
  		*clip = (j > 4) ? 4 : j;
+@@ -539,7 +539,7 @@
+ 	    /* p->text is header, p->next->text is -'s or ='s
+ 	     */
+ 	    pp->hnumber = (T(p->next->text)[0] == '=') ? 1 : 2;
+-	    
++
+ 	    ret = p->next->next;
+ 	    ___mkd_freeLine(p->next);
+ 	    p->next = 0;
+@@ -614,7 +614,7 @@
+     Paragraph *ret;
+ 
+     first = (*ptr);
+-    
++
+     /* don't allow zero-length code fences
+      */
+     if ( (first->next == 0) || iscodefence(first->next, first->count) )
+@@ -744,7 +744,7 @@
+  * it just takes ^> to start a quote, following lines, if quoted,
+  * assume that the prefix is ``> ''.   This means that code needs
+  * to be indented *5* spaces from the leading '>', but *4* spaces
+- * from the start of the line.   This does not appear to be 
++ * from the start of the line.   This does not appear to be
+  * documented in the reference implementation, but it's the
+  * way the markdown sample web form at Daring Fireball works.
+  */
+@@ -782,14 +782,14 @@
+     if ( isdivmarker(p->text,0,flags) ) {
+ 	char *prefix = "class";
+ 	int i;
+-	
++
+ 	q = p->text;
+ 	p->text = p->text->next;
+ 
+ 	if ( (i = szmarkerclass(1+T(q->text))) == 3 )
+ 	    /* and this would be an "%id:" prefix */
+ 	    prefix="id";
+-	    
++
+ 	if ( p->ident = malloc(4+strlen(prefix)+S(q->text)) )
+ 	    sprintf(p->ident, "%s=\"%.*s\"", prefix, S(q->text)-(i+2),
+ 						     T(q->text)+(i+1) );
+@@ -861,7 +861,7 @@
+ {
+     ParagraphRoot d = { 0, 0 };
+     Paragraph *p;
+-    Line *q = top->text, *text = 0, *labels; 
++    Line *q = top->text, *text = 0, *labels;
+     int z, para;
+ 
+     while (( labels = q )) {
+@@ -874,8 +874,8 @@
+ 
+ 	if (( para = (text != q->next) ))
+ 	    ___mkd_freeLineRange(q, text);
+-	
+-	q->next = 0; 
++
++	q->next = 0;
+ 	if ( kind == 1 /* discount dl */ )
+ 	    for ( q = labels; q; q = q->next ) {
+ 		CLIP(q->text, 0, 1);
+@@ -901,7 +901,7 @@
+ 	    anchor.next = text;
+ 	    ___mkd_freeLineRange(&anchor,q);
+ 	    text = q;
+-	    
++
+ 	}
+ 
+ 	if ( kind == 2 && is_extra_dd(q) )
+@@ -922,7 +922,7 @@
+     int para = 0, z;
+ 
+     while (( text = q )) {
+-	
++
+ 	p = Pp(&d, text, LISTITEM);
+ 	text = listitem(p, clip, f->flags, 0);
+ 
+@@ -973,7 +973,7 @@
+     Line *np = p->next;
+ 
+     Footnote *foot = &EXPAND(*f->footnotes);
+-    
++
+     CREATE(foot->tag);
+     CREATE(foot->link);
+     CREATE(foot->title);
+@@ -1201,14 +1201,14 @@
+     while ( ptr ) {
+ 	if ( iscode(ptr) ) {
+ 	    p = Pp(&d, ptr, CODE);
+-	    
++
+ 	    if ( f->flags & MKD_1_COMPAT) {
+ 		/* HORRIBLE STANDARDS KLUDGE: the first line of every block
+ 		 * has trailing whitespace trimmed off.
+ 		 */
+ 		___mkd_tidy(&p->text->text);
+ 	    }
+-	    
++
+ 	    ptr = codeblock(p);
+ 	}
+ #if WITH_FENCED_CODE
+@@ -1276,10 +1276,10 @@
+ mkd_compile(Document *doc, DWORD flags)
+ {
+     if ( !doc )
+-	return 0;
++      return 0;
+ 
+     if ( doc->compiled )
+-	return 1;
++      return 1;
+ 
+     doc->compiled = 1;
+     memset(doc->ctx, 0, sizeof(MMIOT) );
+@@ -1300,3 +1300,15 @@
+     return 1;
+ }
+ 
++char *mkd_compile_document(const char *s, DWORD flags)
++{
++  char *ptr = NULL;
++  Document *doc;
++
++  doc = mkd_string(s, strlen(s), flags);
++  mkd_compile(doc, 0);
++  mkd_document(doc, &ptr);
++  ptr = mkd_cleanup_return_buffer(doc, NULL);
++
++  return ptr;
++}
+diff -ru discount-2.1.3/markdown.h discount/markdown.h
+--- discount-2.1.3/markdown.h	2012-01-16 13:08:52.000000000 -0800
++++ discount/markdown.h	2012-07-16 19:52:01.611155862 -0700
+@@ -19,7 +19,7 @@
+ } Footnote;
+ 
+ /* each input line is read into a Line, which contains the line,
+- * the offset of the first non-space character [this assumes 
++ * the offset of the first non-space character [this assumes
+  * that all tabs will be expanded to spaces!], and a pointer to
+  * the next line.
+  */
+@@ -144,6 +144,7 @@
+     Callback_data cb;		/* callback functions & private data */
+ } Document;
+ 
++extern char *mkd_compile_document(const char *, DWORD);
+ 
+ extern int  mkd_firstnonblank(Line *);
+ extern int  mkd_compile(Document *, DWORD);
+@@ -155,6 +156,7 @@
+ extern int  mkd_xml(char *, int , char **);
+ extern int  mkd_generatexml(char *, int, FILE *);
+ extern void mkd_cleanup(Document *);
++extern char *mkd_cleanup_return_buffer(Document *, long*);
+ extern int  mkd_line(char *, int, char **, DWORD);
+ extern int  mkd_generateline(char *, int, FILE*, DWORD);
+ #define mkd_text mkd_generateline
+@@ -180,6 +182,7 @@
+ extern void ___mkd_freefootnotes(MMIOT *);
+ extern void ___mkd_initmmiot(MMIOT *, void *);
+ extern void ___mkd_freemmiot(MMIOT *, void *);
++extern char* ___mkd_freemmiot_return_buffer(MMIOT *, void *, long*);
+ extern void ___mkd_freeLineRange(Line *, Line *);
+ extern void ___mkd_xml(char *, int, FILE *);
+ extern void ___mkd_reparse(char *, int, int, MMIOT*);
 Only in discount-2.1.3/: mkd2html.1
 Only in discount-2.1.3/: mkd2html.c
 Only in discount-2.1.3/: mkd-callbacks.3
 Only in discount-2.1.3/: mkd-extensions.7
 Only in discount-2.1.3/: mkd-functions.3
+diff -ru discount-2.1.3/mkdio.c discount/mkdio.c
+--- discount-2.1.3/mkdio.c	2012-01-16 13:08:52.000000000 -0800
++++ discount/mkdio.c	2012-07-16 18:03:40.619224702 -0700
+@@ -24,11 +24,11 @@
+     Document *ret = calloc(sizeof(Document), 1);
+ 
+     if ( ret ) {
+-	if (( ret->ctx = calloc(sizeof(MMIOT), 1) )) {
+-	    ret->magic = VALID_DOCUMENT;
+-	    return ret;
+-	}
+-	free(ret);
++      if (( ret->ctx = calloc(sizeof(MMIOT), 1) )) {
++          ret->magic = VALID_DOCUMENT;
++          return ret;
++      }
++      free(ret);
+     }
+     return 0;
+ }
+@@ -50,22 +50,22 @@
+     ATTACH(a->content, p);
+ 
+     while ( size-- ) {
+-	if ( (c = *str++) == '\t' ) {
+-	    /* expand tabs into ->tabstop spaces.  We use ->tabstop
+-	     * because the ENTIRE FREAKING COMPUTER WORLD uses editors
+-	     * that don't do ^T/^D, but instead use tabs for indentation,
+-	     * and, of course, set their tabs down to 4 spaces 
+-	     */
+-	    do {
+-		EXPAND(p->text) = ' ';
+-	    } while ( ++xp % a->tabstop );
+-	}
+-	else if ( c >= ' ' ) {
+-	    if ( c == '|' )
+-		p->flags |= PIPECHAR;
+-	    EXPAND(p->text) = c;
+-	    ++xp;
+-	}
++      if ( (c = *str++) == '\t' ) {
++          /* expand tabs into ->tabstop spaces.  We use ->tabstop
++           * because the ENTIRE FREAKING COMPUTER WORLD uses editors
++           * that don't do ^T/^D, but instead use tabs for indentation,
++           * and, of course, set their tabs down to 4 spaces
++           */
++          do {
++            EXPAND(p->text) = ' ';
++          } while ( ++xp % a->tabstop );
++      }
++      else if ( c >= ' ' ) {
++        if ( c == '|' )
++          p->flags |= PIPECHAR;
++        EXPAND(p->text) = c;
++        ++xp;
++      }
+     }
+     EXPAND(p->text) = 0;
+     S(p->text)--;
+@@ -102,37 +102,37 @@
+     CREATE(line);
+ 
+     while ( (c = (*getc)(ctx)) != EOF ) {
+-	if ( c == '\n' ) {
+-	    if ( pandoc != EOF && pandoc < 3 ) {
+-		if ( S(line) && (T(line)[0] == '%') )
+-		    pandoc++;
+-		else
+-		    pandoc = EOF;
+-	    }
+-	    queue(a, &line);
+-	    S(line) = 0;
+-	}
+-	else if ( isprint(c) || isspace(c) || (c & 0x80) )
+-	    EXPAND(line) = c;
++      if ( c == '\n' ) {
++          if ( pandoc != EOF && pandoc < 3 ) {
++        if ( S(line) && (T(line)[0] == '%') )
++            pandoc++;
++        else
++            pandoc = EOF;
++          }
++          queue(a, &line);
++          S(line) = 0;
++      }
++      else if ( isprint(c) || isspace(c) || (c & 0x80) )
++        EXPAND(line) = c;
+     }
+ 
+     if ( S(line) )
+-	queue(a, &line);
++      queue(a, &line);
+ 
+     DELETE(line);
+ 
+     if ( (pandoc == 3) && !(flags & (MKD_NOHEADER|MKD_STRICT)) ) {
+-	/* the first three lines started with %, so we have a header.
+-	 * clip the first three lines out of content and hang them
+-	 * off header.
+-	 */
+-	Line *headers = T(a->content);
++      /* the first three lines started with %, so we have a header.
++       * clip the first three lines out of content and hang them
++       * off header.
++       */
++      Line *headers = T(a->content);
++
++      a->title = headers;             header_dle(a->title);
++      a->author= headers->next;       header_dle(a->author);
++      a->date  = headers->next->next; header_dle(a->date);
+ 
+-	a->title = headers;             header_dle(a->title);
+-	a->author= headers->next;       header_dle(a->author);
+-	a->date  = headers->next->next; header_dle(a->date);
+-
+-	T(a->content) = headers->next->next->next;
++      T(a->content) = headers->next->next->next;
+     }
+ 
+     return a;
+@@ -227,7 +227,7 @@
+     char *line;
+ 
+     size = mkd_line(s, len, &line, IS_LABEL);
+-    
++
+     if ( labelformat && (size>0) && !isalpha(line[0]) )
+ 	(*outchar)('L',out);
+     for ( i=0; i < size ; i++ ) {
+@@ -241,7 +241,7 @@
+ 	else
+ 	    (*outchar)(c,out);
+     }
+-	
++
+     if (line)
+ 	free(line);
+ }
+@@ -266,13 +266,13 @@
+ {
+     MMIOT f;
+     int len;
+-    
++
+     mkd_parse_line(bfr, size, &f, flags);
+ 
+     if ( len = S(f.out) ) {
+ 	/* kludge alert;  we know that T(f.out) is malloced memory,
+ 	 * so we can just steal it away.   This is awful -- there
+-	 * should be an opaque method that transparently moves 
++	 * should be an opaque method that transparently moves
+ 	 * the pointer out of the embedded Cstring.
+ 	 */
+ 	EXPAND(f.out) = 0;
 Only in discount/: mkdio.h
 Only in discount-2.1.3/: mkdio.h.in
 Only in discount-2.1.3/: mkd-line.3
@@ -952,6 +897,106 @@ Only in discount-2.1.3/: pgm_options.c
 Only in discount-2.1.3/: pgm_options.h
 Only in discount-2.1.3/: Plan9
 Only in discount-2.1.3/: README
+diff -ru discount-2.1.3/resource.c discount/resource.c
+--- discount-2.1.3/resource.c	2012-01-16 13:08:52.000000000 -0800
++++ discount/resource.c	2012-07-16 18:40:37.947201222 -0700
+@@ -107,14 +107,33 @@
+ void
+ ___mkd_freemmiot(MMIOT *f, void *footnotes)
+ {
+-    if ( f ) {
+-	DELETE(f->in);
+-	DELETE(f->out);
+-	DELETE(f->Q);
+-	if ( f->footnotes != footnotes )
+-	    ___mkd_freefootnotes(f);
+-	memset(f, 0, sizeof *f);
+-    }
++  if ( f ) {
++    DELETE(f->in);
++    DELETE(f->out);
++    DELETE(f->Q);
++    if ( f->footnotes != footnotes )
++      ___mkd_freefootnotes(f);
++    memset(f, 0, sizeof *f);
++  }
++}
++
++/* free the contents of a MMIOT except the output buffer, but leave the
++ * object alone. return the output buffer to the caller. */
++char *
++___mkd_freemmiot_return_buffer(MMIOT *f, void *footnotes, long *out_len)
++{
++  char *ptr = NULL;
++  if ( f ) {
++    DELETE(f->in);
++    ptr = T(f->out);        /* save pointer */
++    if (out_len)
++      *out_len = S(f->out); /* save length */
++    DELETE(f->Q);
++    if ( f->footnotes != footnotes )
++      ___mkd_freefootnotes(f);
++    memset(f, 0, sizeof *f);
++  }
++  return ptr;
+ }
+ 
+ 
+@@ -140,18 +159,41 @@
+ void
+ mkd_cleanup(Document *doc)
+ {
+-    if ( doc && (doc->magic == VALID_DOCUMENT) ) {
+-	if ( doc->ctx ) {
+-	    ___mkd_freemmiot(doc->ctx, 0);
+-	    free(doc->ctx);
+-	}
+-
+-	if ( doc->code) ___mkd_freeParagraph(doc->code);
+-	if ( doc->title) ___mkd_freeLine(doc->title);
+-	if ( doc->author) ___mkd_freeLine(doc->author);
+-	if ( doc->date) ___mkd_freeLine(doc->date);
+-	if ( T(doc->content) ) ___mkd_freeLines(T(doc->content));
+-	memset(doc, 0, sizeof doc[0]);
+-	free(doc);
++  if ( doc && (doc->magic == VALID_DOCUMENT) ) {
++    if ( doc->ctx ) {
++        ___mkd_freemmiot(doc->ctx, 0);
++        free(doc->ctx);
++    }
++
++    if ( doc->code) ___mkd_freeParagraph(doc->code);
++    if ( doc->title) ___mkd_freeLine(doc->title);
++    if ( doc->author) ___mkd_freeLine(doc->author);
++    if ( doc->date) ___mkd_freeLine(doc->date);
++    if ( T(doc->content) ) ___mkd_freeLines(T(doc->content));
++    memset(doc, 0, sizeof doc[0]);
++    free(doc);
++  }
++}
++
++char *
++mkd_cleanup_return_buffer(Document *doc, long *out_len)
++{
++  char *ptr = NULL;
++
++  if ( doc && (doc->magic == VALID_DOCUMENT) ) {
++    if ( doc->ctx ) {
++        ptr = ___mkd_freemmiot_return_buffer(doc->ctx, 0, out_len);
++        free(doc->ctx);
+     }
++
++    if ( doc->code) ___mkd_freeParagraph(doc->code);
++    if ( doc->title) ___mkd_freeLine(doc->title);
++    if ( doc->author) ___mkd_freeLine(doc->author);
++    if ( doc->date) ___mkd_freeLine(doc->date);
++    if ( T(doc->content) ) ___mkd_freeLines(T(doc->content));
++    memset(doc, 0, sizeof doc[0]);
++    free(doc);
++  }
++
++  return ptr;
+ }
 Only in discount-2.1.3/: tests
 Only in discount-2.1.3/: theme.1
 Only in discount-2.1.3/: theme.c


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).



More information about the Plugins-Commits mailing list