diff options
author | Norbert Preining <norbert@preining.info> | 2020-03-22 03:00:48 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-03-22 03:00:48 +0000 |
commit | 75d8dfa80524727ddb7d8ae217ed6463efba84cf (patch) | |
tree | a1a1db248828dd36aecb1697d64d28a2ff813d29 /dviware/dvisvgm/doc | |
parent | 3e43bc594a14e8c4fc21d6a71f22a23dd78fe252 (diff) |
CTAN sync 202003220300
Diffstat (limited to 'dviware/dvisvgm/doc')
-rw-r--r-- | dviware/dvisvgm/doc/Makefile.am | 6 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/Makefile.in | 6 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/conf-dblatex-pdf.xsl | 7 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/dvisvgm.1 | 25 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/dvisvgm.txt.in | 13 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl | 1 | ||||
-rw-r--r-- | dviware/dvisvgm/doc/tweak-dblatex-tex.py | 18 |
7 files changed, 55 insertions, 21 deletions
diff --git a/dviware/dvisvgm/doc/Makefile.am b/dviware/dvisvgm/doc/Makefile.am index fdbc24e1ce..92c7d25efd 100644 --- a/dviware/dvisvgm/doc/Makefile.am +++ b/dviware/dvisvgm/doc/Makefile.am @@ -15,6 +15,7 @@ EXTRA_DIST = $(man_MANS) \ dvisvgm.txt.in \ generate-dvisvgm-sty.xsl \ tweak-dblatex-pdf.xsl \ + tweak-dblatex-tex.py \ tweak-db-refentry.xsl if BUILD_MANPAGE @@ -22,6 +23,7 @@ if BUILD_MANPAGE CONF_DBLATEX_MAN = $(dvisvgm_srcdir)/doc/conf-dblatex-man.xsl CONF_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/conf-dblatex-pdf.xsl TWEAK_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/tweak-dblatex-pdf.xsl +TWEAK_DBLATEX_TEX = $(dvisvgm_srcdir)/doc/tweak-dblatex-tex.py TWEAK_DB_ARTICLE = $(dvisvgm_srcdir)/doc/tweak-db-article.xsl TWEAK_DB_REFENTRY = $(dvisvgm_srcdir)/doc/tweak-db-refentry.xsl GEN_DBLATEX_STY = $(dvisvgm_srcdir)/doc/generate-dvisvgm-sty.xsl @@ -31,10 +33,10 @@ DB_VARS = man.endnotes.list.enabled=0 man.endnotes.are.numbered=0 man.authors.se dvisvgm.1: dvisvgm-man.xml $(CONF_DBLATEX_MAN) xmlto -m $(CONF_DBLATEX_MAN) $(addprefix --stringparam , $(DB_VARS)) man $< -dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF) +dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF) $(TWEAK_DBLATEX_TEX) mv $< $<.tmp xsltproc -o $< $(TWEAK_DBLATEX_PDF) $<.tmp - dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) $< + dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) -r plugin:$(basename $(TWEAK_DBLATEX_TEX)) $< mv $<.tmp $< mv $(basename $<).pdf $@ diff --git a/dviware/dvisvgm/doc/Makefile.in b/dviware/dvisvgm/doc/Makefile.in index 35bceae1d1..8568648c65 100644 --- a/dviware/dvisvgm/doc/Makefile.in +++ b/dviware/dvisvgm/doc/Makefile.in @@ -325,11 +325,13 @@ EXTRA_DIST = $(man_MANS) \ dvisvgm.txt.in \ generate-dvisvgm-sty.xsl \ tweak-dblatex-pdf.xsl \ + tweak-dblatex-tex.py \ tweak-db-refentry.xsl @BUILD_MANPAGE_TRUE@CONF_DBLATEX_MAN = $(dvisvgm_srcdir)/doc/conf-dblatex-man.xsl @BUILD_MANPAGE_TRUE@CONF_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/conf-dblatex-pdf.xsl @BUILD_MANPAGE_TRUE@TWEAK_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/tweak-dblatex-pdf.xsl +@BUILD_MANPAGE_TRUE@TWEAK_DBLATEX_TEX = $(dvisvgm_srcdir)/doc/tweak-dblatex-tex.py @BUILD_MANPAGE_TRUE@TWEAK_DB_ARTICLE = $(dvisvgm_srcdir)/doc/tweak-db-article.xsl @BUILD_MANPAGE_TRUE@TWEAK_DB_REFENTRY = $(dvisvgm_srcdir)/doc/tweak-db-refentry.xsl @BUILD_MANPAGE_TRUE@GEN_DBLATEX_STY = $(dvisvgm_srcdir)/doc/generate-dvisvgm-sty.xsl @@ -583,10 +585,10 @@ uninstall-man: uninstall-man1 @BUILD_MANPAGE_TRUE@dvisvgm.1: dvisvgm-man.xml $(CONF_DBLATEX_MAN) @BUILD_MANPAGE_TRUE@ xmlto -m $(CONF_DBLATEX_MAN) $(addprefix --stringparam , $(DB_VARS)) man $< -@BUILD_MANPAGE_TRUE@dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF) +@BUILD_MANPAGE_TRUE@dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF) $(TWEAK_DBLATEX_TEX) @BUILD_MANPAGE_TRUE@ mv $< $<.tmp @BUILD_MANPAGE_TRUE@ xsltproc -o $< $(TWEAK_DBLATEX_PDF) $<.tmp -@BUILD_MANPAGE_TRUE@ dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) $< +@BUILD_MANPAGE_TRUE@ dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) -r plugin:$(basename $(TWEAK_DBLATEX_TEX)) $< @BUILD_MANPAGE_TRUE@ mv $<.tmp $< @BUILD_MANPAGE_TRUE@ mv $(basename $<).pdf $@ diff --git a/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl b/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl index 321bc0f4fb..bb3bd93b63 100644 --- a/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl +++ b/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl @@ -3,15 +3,16 @@ <!-- Copyright (C) 2015-2020 Martin Gieseking <martin.gieseking@uos.de> --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:param name="xetex.font"> - <xsl:text>\setmainfont{Source Sans Pro} </xsl:text> + <xsl:text>\setmainfont{Source Serif Pro} </xsl:text> <xsl:text>\setsansfont{Source Sans Pro} </xsl:text> - <xsl:text>\setmonofont{Source Code Pro} </xsl:text> + <xsl:text>\setmonofont[Scale=0.9]{Source Code Pro} </xsl:text> </xsl:param> <xsl:param name="doc.toc.show">0</xsl:param> <xsl:param name="refentry.numbered">0</xsl:param> <xsl:param name="figure.caution">caution</xsl:param> <xsl:param name="figure.note">note</xsl:param> + <xsl:param name="literal.layout.options"/> <xsl:param name="table.default.tabstyle">tabular</xsl:param> <xsl:param name="table.in.float">0</xsl:param> <xsl:param name="term.breakline">1</xsl:param> @@ -55,7 +56,7 @@ <xsl:text>\phantomsection\pdfbookmark[3]{</xsl:text> <xsl:choose> <xsl:when test="contains(emphasis, '--')"> - <xsl:value-of select="concat('-{}-', substring-after(emphasis, '--'))"/> + <xsl:value-of select="substring-after(emphasis, '--')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="emphasis"/> diff --git a/dviware/dvisvgm/doc/dvisvgm.1 b/dviware/dvisvgm/doc/dvisvgm.1 index 43fd7e1126..67cc037d26 100644 --- a/dviware/dvisvgm/doc/dvisvgm.1 +++ b/dviware/dvisvgm/doc/dvisvgm.1 @@ -2,12 +2,12 @@ .\" Title: dvisvgm .\" Author: Martin Gieseking <martin.gieseking@uos.de> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2020-03-08 +.\" Date: 2020-03-19 .\" Manual: dvisvgm Manual -.\" Source: dvisvgm 2.9 +.\" Source: dvisvgm 2.9.1 .\" Language: English .\" -.TH "DVISVGM" "1" "2020\-03\-08" "dvisvgm 2\&.9" "dvisvgm Manual" +.TH "DVISVGM" "1" "2020\-03\-19" "dvisvgm 2\&.9\&.1" "dvisvgm Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -329,7 +329,7 @@ or to the font format, e\&.g\&. \fB\-\-font\-format=woff,autohint\fR or -\fB\-\-font\-format=woff,ah\fR\&. +\fB\-\-fwoff,ah\fR\&. .sp Option \fB\-\-font\-format\fR @@ -1177,9 +1177,9 @@ dvisvgm offers its own small set of specials\&. The following list gives a brief \fBdvisvgm:raw\fR \fItext\fR .RS 4 Adds an arbitrary sequence of XML nodes to the page section of the SVG document\&. dvisvgm checks syntax and proper nesting of the inserted elements but does not perform any validation, thus the user has to ensure that the resulting SVG is still valid\&. Opening and closing tags may be distributed among different -\fBraw\fR -specials\&. The tags themselves can also be split but must be continued with the immediatly following -\fBraw\fR +\fIraw\fR +specials\&. The tags themselves can also be split but must be continued with the immediately following +\fIraw\fR special\&. Both syntactically incorrect and wrongly nested tags lead to error messages\&. Parameter \fItext\fR may also contain the expressions @@ -1191,9 +1191,16 @@ that expand to the current \fIx\fR or \fIy\fR -coordinate, the current color, and current transformation matrix, respectively\&. Furthermore, +coordinate, the current color, and current transformation matrix, respectively\&. Character sequence \fB{?nl}\fR -expands to a newline character\&. +expands to a newline character\&. Finally, constructions of the form +\fB{?(\fR\fB\fIexpr\fR\fR\fB)}\fR +enable the evaluation of mathematical expressions which may consist of basic arithmetic operations including modulo\&. Like above, the variables +\fIx\fR +and +\fIy\fR +represent the current coordinates\&. Example: +\fB{?(\-10*(x+2y)\-5)}\fR\&. .RE .PP \fBdvisvgm:rawdef\fR \fItext\fR diff --git a/dviware/dvisvgm/doc/dvisvgm.txt.in b/dviware/dvisvgm/doc/dvisvgm.txt.in index 7afc9138b9..2b51b57c32 100644 --- a/dviware/dvisvgm/doc/dvisvgm.txt.in +++ b/dviware/dvisvgm/doc/dvisvgm.txt.in @@ -22,7 +22,7 @@ Martin Gieseking <@PACKAGE_BUGREPORT@> :man source: dvisvgm :man version: @VERSION@ :man manual: dvisvgm Manual -:revdate: 2020-03-08 09:20 +0100 +:revdate: 2020-03-19 22:06 +0100 Name ---- @@ -224,7 +224,7 @@ version 1 and 2). By default, dvisvgm creates unhinted fonts that might look bad on low-resolution devices. In order to improve the display quality, the generated TrueType, WOFF, or WOFF2 fonts can be autohinted. The autohinter is enabled by appending +,autohint+ or +,ah+ to the font format, -e.g. +--font-format=woff,autohint+ or +--font-format=woff,ah+. +e.g. +--font-format=woff,autohint+ or +--fwoff,ah+. + Option *--font-format* is only available if dvisvgm was built with WOFF support enabled. @@ -722,12 +722,15 @@ dvisvgm offers its own small set of specials. The following list gives a brief o *dvisvgm:raw* 'text';; Adds an arbitrary sequence of XML nodes to the page section of the SVG document. dvisvgm checks syntax and proper nesting of the inserted elements but does not perform any validation, thus the user has to ensure - that the resulting SVG is still valid. Opening and closing tags may be distributed among different +raw+ - specials. The tags themselves can also be split but must be continued with the immediatly following +raw+ + that the resulting SVG is still valid. Opening and closing tags may be distributed among different 'raw' + specials. The tags themselves can also be split but must be continued with the immediately following 'raw' special. Both syntactically incorrect and wrongly nested tags lead to error messages. Parameter 'text' may also contain the expressions *{?x}*, *{?y}*, *{?color}*, and *{?matrix}* that expand to the current 'x' or 'y' coordinate, the current color, and current transformation matrix, respectively. - Furthermore, *{?nl}* expands to a newline character. + Character sequence *{?nl}* expands to a newline character. Finally, constructions of the form *{?(__expr__)}* + enable the evaluation of mathematical expressions which may consist of basic arithmetic operations including + modulo. Like above, the variables 'x' and 'y' represent the current coordinates. + Example: +{?(-10*(x+2y)-5)}+. *dvisvgm:rawdef* 'text';; This command is similar to *dvisvgm:raw*, but puts the XML nodes into the <defs> section of the SVG document diff --git a/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl b/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl index bdb279da99..7a3ae6a770 100644 --- a/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl +++ b/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl @@ -7,6 +7,7 @@ \ProvidesPackage{dvisvgm}[2015/02/04 dvisvgm DocBook style] \RequirePackageWithOptions{docbook} \RequirePackage[english]{babel} +\RequirePackage[shortcuts]{extdash} \RequirePackage{underscore} \renewcommand*{\arraystretch}{-0.4} \AtBeginDocument{% diff --git a/dviware/dvisvgm/doc/tweak-dblatex-tex.py b/dviware/dvisvgm/doc/tweak-dblatex-tex.py new file mode 100644 index 0000000000..3f34d94e65 --- /dev/null +++ b/dviware/dvisvgm/doc/tweak-dblatex-tex.py @@ -0,0 +1,18 @@ +import re +import os + +def main (latex_file, stdout): + latex_file_old = latex_file+"-old" + os.rename(latex_file, latex_file_old) + os.remove(os.path.splitext(latex_file)[0]+".pdf") + with open(latex_file, "w") as outfile: + with open(latex_file_old) as infile: + lines = infile.readlines() + for line in lines: + if re.match(r'(.*\\def)|(.*\\href)', line) == None: + line = re.sub(r'([a-zA-Z0-9]+)/', r'\1\slash{}', line) + line = re.sub(r'-{}-{}', r'\=/\=/', line) + line = re.sub(r'([^a-zA-Z0-9])-{}', r'\1\=/', line) + print >>outfile, line.rstrip() + os.remove(latex_file_old) + return 0 |