diff -Nru trac-wikiprint-2.0.0+r15603/1.0/wikiprint/wikiprint.py trac-wikiprint-2.0.0+r16816/1.0/wikiprint/wikiprint.py
--- trac-wikiprint-2.0.0+r15603/1.0/wikiprint/wikiprint.py 2016-06-23 19:20:46.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/1.0/wikiprint/wikiprint.py 2017-09-22 22:55:21.000000000 +0000
@@ -164,6 +164,7 @@
httpauth_user = Option('wikiprint', 'httpauth_user')
httpauth_password = Option('wikiprint', 'httpauth_password')
omit_links = BoolOption('wikiprint', 'omit_links')
+ local_anchor = BoolOption('wikiprint', 'local_anchor', False)
omit_macros = ListOption('wikiprint', 'omit_macros')
rebase_links = Option('wikiprint', 'rebase_links')
default_charset = Option('trac', 'default_charset', 'utf-8')
@@ -241,8 +242,20 @@
page = format_to_html(self.env, context, text)
self.env.log.debug('WikiPrint => Wiki to HTML output: %r', page)
- self.env.log.debug('WikiPrint => HTML output for WikiPrint is: %r',
+ # Link to internal sections of document.
+ if self.local_anchor:
+ page = Markup('') + page
+ r = re.compile(re.escape(req.abs_href.wiki()) +
+ r'/([a-zA-Z0-9_/]*)(#?)')
+ page = r.sub('#\g<1>/', page)
+ r1 = re.compile(r'(span class="wikianchor" id=")(.*)(/span)')
+ page = r1.sub('a name="' + page_name + '/\g<2>/a', page)
+ r2 = re.compile(r'(h[0-9] id=")(.*)(">)')
+ page = r2.sub('\g<1>' + page_name + '/\g<2>\g<3>', page)
+ self.env.log.debug("WikiPrint => HTML input to html_to_pdf is: %r",
page)
+
self.env.log.debug('WikiPrint => Finish function wikipage_to_html')
return page
diff -Nru trac-wikiprint-2.0.0+r15603/debian/changelog trac-wikiprint-2.0.0+r16816/debian/changelog
--- trac-wikiprint-2.0.0+r15603/debian/changelog 2016-07-30 21:24:21.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/changelog 2018-02-27 21:45:18.000000000 +0000
@@ -1,3 +1,13 @@
+trac-wikiprint (2.0.0+r16816-1) unstable; urgency=medium
+
+ * New upstream version
+ * Bump standards version and dh compat level
+ * Depend on python-pil (Closes: #866488)
+ * Depend on python-xhtml2pdf
+ * Move git repo to salsa.debian.org
+
+ -- W. Martin Borgert Tue, 27 Feb 2018 21:45:18 +0000
+
trac-wikiprint (2.0.0+r15603-1) unstable; urgency=low
* New upstream version
diff -Nru trac-wikiprint-2.0.0+r15603/debian/compat trac-wikiprint-2.0.0+r16816/debian/compat
--- trac-wikiprint-2.0.0+r15603/debian/compat 2016-07-30 20:54:02.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/compat 2018-02-27 21:39:05.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru trac-wikiprint-2.0.0+r15603/debian/control trac-wikiprint-2.0.0+r16816/debian/control
--- trac-wikiprint-2.0.0+r15603/debian/control 2016-07-30 21:06:59.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/control 2018-02-27 21:43:58.000000000 +0000
@@ -1,17 +1,26 @@
Source: trac-wikiprint
Section: web
Priority: optional
-Build-Depends: python-all (>= 2.6.6-3~), python-setuptools, debhelper (>= 9), dh-python
+Build-Depends: python-all (>= 2.6.6-3~),
+ python-setuptools,
+ debhelper (>= 11),
+ dh-python
Maintainer: Python Applications Packaging Team
Uploaders: W. Martin Borgert
-Standards-Version: 3.9.8
-Vcs-Git: git://anonscm.debian.org/collab-maint/trac-wikiprint.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/trac-wikiprint.git
+Standards-Version: 4.1.3
+Vcs-Git: https://salsa.debian.org/python-team/applications/trac-wikiprint.git
+Vcs-Browser: https://salsa.debian.org/python-team/applications/trac-wikiprint
Homepage: http://trac-hacks.org/wiki/TracWikiPrintPlugin
Package: trac-wikiprint
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, trac, python-pisa, python-imaging, python-html5lib, python-reportlab
+Depends: ${python:Depends},
+ ${misc:Depends},
+ trac,
+ python-xhtml2pdf,
+ python-pil,
+ python-html5lib,
+ python-reportlab
Description: Make Trac wiki pages printable, exporting to PDF or printable HTML
This Trac plugin allows export of one or multiple wiki pages in PDF
or HTML format. It features:
diff -Nru trac-wikiprint-2.0.0+r15603/debian/.git-dpm trac-wikiprint-2.0.0+r16816/debian/.git-dpm
--- trac-wikiprint-2.0.0+r15603/debian/.git-dpm 2016-07-30 20:54:02.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-3f03d4ac2b2841793ac36a298bf0a055332de94e
-3f03d4ac2b2841793ac36a298bf0a055332de94e
-3f03d4ac2b2841793ac36a298bf0a055332de94e
-3f03d4ac2b2841793ac36a298bf0a055332de94e
-trac-wikiprint_2.0.0+r15603.orig.tar.gz
-14ad17c0432f7bd807bcc85d13823c22378c0dde
-22484
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff -Nru trac-wikiprint-2.0.0+r15603/debian/pydist-overrides trac-wikiprint-2.0.0+r16816/debian/pydist-overrides
--- trac-wikiprint-2.0.0+r15603/debian/pydist-overrides 2016-07-30 20:54:02.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/pydist-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-pil python-imaging
\ No newline at end of file
diff -Nru trac-wikiprint-2.0.0+r15603/debian/rules trac-wikiprint-2.0.0+r16816/debian/rules
--- trac-wikiprint-2.0.0+r15603/debian/rules 2016-07-30 20:55:36.000000000 +0000
+++ trac-wikiprint-2.0.0+r16816/debian/rules 2018-02-27 21:45:18.000000000 +0000
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --sourcedir=1.0 --with python2 --buildsystem=python_distutils
+ dh $@ --sourcedir=1.0 --with python2 --buildsystem=pybuild