texlive[58737] trunk: tikztosvg (4apr21)

commits+preining at tug.org commits+preining at tug.org
Sun Apr 4 04:30:38 CEST 2021 

Revision: 58737
          http://tug.org/svn/texlive?view=revision&revision=58737
Author:   preining
Date:     2021-04-04 04:30:37 +0200 (Sun, 04 Apr 2021)
Log Message:
-----------
tikztosvg (4apr21)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/tikztosvg/tikztosvg
    trunk/Master/texmf-dist/doc/man/man1/tikztosvg.1
    trunk/Master/texmf-dist/doc/man/man1/tikztosvg.man1.pdf
    trunk/Master/texmf-dist/doc/support/tikztosvg/Makefile
    trunk/Master/texmf-dist/doc/support/tikztosvg/README.md
    trunk/Master/texmf-dist/doc/support/tikztosvg/example.svg
    trunk/Master/texmf-dist/doc/support/tikztosvg/example.tikz
    trunk/Master/texmf-dist/doc/support/tikztosvg/install.sh
    trunk/Master/texmf-dist/doc/support/tikztosvg/man.adoc
    trunk/Master/texmf-dist/doc/support/tikztosvg/tikztosvg.pdf
    trunk/Master/texmf-dist/scripts/tikztosvg/tikztosvg

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.md

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.adoc

Modified: trunk/Build/source/texk/texlive/linked_scripts/tikztosvg/tikztosvg
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tikztosvg/tikztosvg	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Build/source/texk/texlive/linked_scripts/tikztosvg/tikztosvg	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,4 +1,12 @@
 #!/bin/sh
+#  _   _ _         _ 
+# | |_(_) | __ ___| |_ ___  _____   ____ _ 
+# | __| | |/ /|_  / __/ _ \/ __\ \ / / _` |
+# | |_| |   <  / /| || (_) \__ \\ V / (_| |
+#  \__|_|_|\_\/___|\__\___/|___/ \_/ \__, |
+#                                    |___/
+# 2021 (C) Pablo
+# Free use of this software is granted under the terms of the GPL-3.0 License
 
 puts() 
 {
@@ -34,6 +42,10 @@
   exit 0
 }
 
+# The default list of packages and libraries that should be imported
+PACKAGES="tikz tikz-cd pgfplots amsmath amssymb"
+LIBRARIES=""
+
 if ! [ -x "$(command -v xelatex)" ]
 then
   error "xelatex could not be found"
@@ -45,7 +57,6 @@
 fi
 
 # Parsing the arguments
-PACKAGES=""
 while [ $# -gt 1 ]
 do
   case "$1" in
@@ -70,6 +81,21 @@
           shift
       esac
       ;;
+    -l|--library)
+      case "$2" in
+        "")
+          error "Unnexpected EOF"
+          ;;
+        # Check if the name of the package is valid
+        *" "*) 
+          error "Invalid library name. TikZ library names cannot contain scapes!" 
+          ;;
+        *)
+          LIBRARIES="$LIBRARIES $2"
+          shift
+          shift
+      esac
+      ;;
     -o|--output)
       if [ -n "$OUTPUT" ]
       then
@@ -139,12 +165,17 @@
 # Generate the LaTeX document
 printf "\documentclass[crop,tikz,multi=false]{standalone}\n" > "$TEX_FILE"
 
-for PACKAGE in $PACKAGES
+for PACKAGE in $(echo "$PACKAGES" | tr " " "\n" | sort | uniq)
 do
   printf "\usepackage{%s}\n" "$PACKAGE" >> "$TEX_FILE"
 done
 
-printf "\\\begin{document} \huge\n" >> "$TEX_FILE"
+for LIBRARY in $(echo "$LIBRARIES" | tr " " "\n" | sort | uniq) 
+do
+  printf "\usetikzlibrary{%s}\n" "$LIBRARY" >> "$TEX_FILE"
+done
+
+printf "\\\begin{document}\n" >> "$TEX_FILE"
 cat "$INPUT" >> "$TEX_FILE"
 
 if [ $? -ne 0 ]

Modified: trunk/Master/texmf-dist/doc/man/man1/tikztosvg.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/tikztosvg.1	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/man/man1/tikztosvg.1	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,13 +1,13 @@
 '\" t
-.\"     Title: tikzsvg
+.\"     Title: tikztosvg
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.10
-.\"      Date: 2020-08-16
+.\" Generator: Asciidoctor 2.0.12
+.\"      Date: 2021-03-30
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "TIKZSVG" "1" "2020-08-16" "\ \&" "\ \&"
+.TH "TIKZTOSVG" "1" "2021-03-30" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -28,13 +28,13 @@
 .  LINKSTYLE blue R < >
 .\}
 .SH "NAME"
-tikzsvg \- Render TikZ diagrams to SVG.
+tikztosvg \- Render TikZ diagrams to SVG.
 .SH "SYNOPSIS"
 .sp
-\fBtikzsvg\fP [\fIOPTION\fP]... \fIINPUT_PATH\fP
+\fBtikztosvg\fP [\fIOPTION\fP]... \fIINPUT_PATH\fP
 .SH "DESCRIPTION"
 .sp
-The tikzsvg(1) command renders TikZ diagrams to SVG.
+The tikztosvg(1) command renders TikZ diagrams to SVG.
 .sp
 If \fIINPUT_PATH\fP is set to \fI\-\fP the input will be read from stdin.
 .SH "OPTIONS"
@@ -49,9 +49,15 @@
 .sp
 \fB\-p, \-\-package\fP=+\fIPACKAGE\fP
 .RS 4
-Include \fI\(rsusepackage{PACKAGE}\fP when rendering the diagram.
+  Include \fI\(rsusepackage{PACKAGE}\fP when rendering the diagram. The tikz, tikz\-cd,
+pgfplots, amsmath and amssymb packages are always included by default.
 .RE
 .sp
+\fB\-l, \-\-library\fP=+_LIBRARY
+.RS 4
+Include \fI\(rsusetikzlibrary{LIBRARY}\fP when rendering the diagram.
+.RE
+.sp
 \fB\-q, \-\-quiet\fP
 .RS 4
 Silence application log messages and script warnings.
@@ -68,7 +74,7 @@
 .RE
 .SH "ENVIRONMENT"
 .sp
-\fBtikztosvg\fP requires \fIxetex\fP and \fIpdf2svg\fP to be installed. Make sure
+\fBtikztosvg\fP requires XeTeX and pdf2svg to be installed. Make sure
 any additional LaTeX packages are installed before using them in a diagram.
 .SH "EXIT STATUS"
 .sp
@@ -88,8 +94,7 @@
 .RE
 .SH "AUTHORS"
 .sp
-\fBtikztosvg\fP was written by Pablo Emilio Escobar Gaviria
-<\c
+\fBtikztosvg\fP was written by Pablo <\c
 .MTO "pablo\-escobar\(atriseup.net" "" ">."
 .sp
 \fBpdf2svg\fP was written by David Barton <\c
@@ -99,9 +104,9 @@
 .MTO "matthew.flaschen\(atgatech.edu" "" ">."
 .SH "RESOURCES"
 .sp
-\fBGit source repository on GitLab:\fP \c
-.URL "https://gitlab.com/pablo\-escobar/tikztosvg" "" ""
+\fBGit source repository on sourcehut:\fP \c
+.URL "https://git.sr.ht/~pablo\-pie/tikztosvg" "" ""
 .SH "COPYING"
 .sp
-Copyright (C) 2020 Pablo Emilio Escobar Gaviria.
+Copyright (C) 2021 Pablo.
 Free use of this software is granted under the terms of the GPL\-3.0 License.
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/man/man1/tikztosvg.man1.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.adoc
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.adoc	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.adoc	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,7 +0,0 @@
-== Release 0.1.2
-
-* The script is now posix-complient (it doesn't use bash anymore)
-* Messages in the log output are now color-coded
-* The script now support `stdin` input and `stdout` output
-* The documentation is now rendered to PDF
-* The documentation was updated

Added: trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.md	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.md	2021-04-04 02:30:37 UTC (rev 58737)
@@ -0,0 +1,18 @@
+# CHANGELOG
+
+## Release 0.2.0
+
+* Removed code that added the `\huge` command to the beginning of the document
+* Added an option for importing TikZ libraries (the `-l` option)
+* Made it so that items from the `-p` and `-l` options aren't imported twice
+* Made it so that tikz, tikz-cd, pgfplots, amsmath and amssymb are imported by
+  default
+* Added instructions for installing the application with Git
+
+## Release 0.1.2
+
+* The script is now posix-complient (it doesn't use bash anymore)
+* Messages in the log output are now color-coded
+* The script now support `stdin` input and `stdout` output
+* The documentation is now rendered to PDF
+* The documentation was updated


Property changes on: trunk/Master/texmf-dist/doc/support/tikztosvg/CHANGELOG.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/Makefile	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/Makefile	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,35 +1,30 @@
+.PHONY: package install
+
 # Packages the application for CTAN
-package:
-	# Render the manpage
-	asciidoctor -b manpage -o man/tikztosvg.1 man/man.adoc
+package: tikztosvg.tar.gz
+
+install: man/tikztosvg.1 tikztosvg
+	# Install the executable
+	cp tikztosvg ~/.local/bin/
+	chmod +x ~/.local/bin/tikztosvg
 	 
-	# Render the README as PDF
-	asciidoctor -r asciidoctor-pdf -b pdf -o tikztosvg.pdf README.adoc
+	# Install the manpage
+	install -g 0 -o 0 -m 0644 man/tikztosvg.1 ~/.local/share/man/man1/
+
+man/tikztosvg.1: man/man.adoc
+	asciidoctor -b manpage -o $@ $^
+
+tikztosvg.pdf: README.md 
+	pandoc -s -o $@ $^
+
+example/example.svg: example/example.tikz
+	sh ./tikztosvg -p xfrac -p relsize -o $@ $^
 	
-	# Render the README as Markdown
-	asciidoctor -b docbook -a leveloffset=+1 -o - README.adoc \
-		| pandoc --atx-headers \
-						 --wrap=preserve \
-						 -t markdown_github \
-						 -f docbook - \
-		| comby '![:[name]](:[link])' \
-						'![:[name]](examples/:[link])' \
-						-stdin \
-						-stdout \
-						-m .md \
-		| comby  ':imagesdir: :[[value]]' '' -stdin -stdout -m .md \
-		| comby  ':source-highlighter: :[[value]]' '' -stdin -stdout -m .md \
-		> README.md
-	
-	# Package the repository as a tar file
-	tar -cvO \
-			--directory=.. \
-			--exclude='.*' \
-			--exclude='*.tar.gz' \
-			--exclude='README.adoc' \
-			tikztosvg \
+	# Try to compress the image with svgo
+	svgo --pretty --enable=sortAttrs $@ || exit 0
+
+# Packages the application for CTAN
+tikztosvg.tar.gz: man/tikztosvg.1 tikztosvg.pdf README.md example/example.svg CHANGELOG.md
+	tar -cvO --directory=.. --exclude='.*' --exclude='*.tar.gz' tikztosvg \
 		| gzip -c /dev/stdin > tikztosvg.tar.gz
 
-install:
-	sh install.sh
-

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/README.md	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/README.md	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,12 +1,14 @@
 # tikztosvg(1)
 
-Pablo Emilio Escobar Gaviria <<pablo-escobar at riseup.net>>  
+The `tikztosvg(1)` command renders TikZ diagrams to SVG, using
+[XeTeX](http://xetex.sourceforge.net/) and
+[pdf2svg](https://github.com/dawbarton/pdf2svg).
 
-The `tikztosvg(1)` command renders TikZ diagrams to SVG, using [`xetex`](http://xetex.sourceforge.net/) and [`pdf2svg`](https://github.com/dawbarton/pdf2svg).
-
 ## Usage
 
-    tikztosvg [OPTION]... INPUT_PATH
+``` sh
+$ tikztosvg [OPTION]... INPUT_PATH
+```
 
 If *INPUT\_PATH* is set to *-* the input will be read from stdin.
 
@@ -13,11 +15,17 @@
 ### Options
 
 **-o, --output**=*OUTPUT\_PATH*  
-Write output to file *OUTPUT\_PATH*. If set to *-* the output will be written to stdout. Defaults to the base name of the input file suffixed with the *.svg* extension. The file is resolved relative to the working directory.
+Write output to file *OUTPUT\_PATH*. If set to *-* the output will be written
+to stdout. Defaults to the base name of the input file suffixed with the *.svg*
+extension. The file is resolved relative to the working directory.
 
 **-p, --package**=+*PACKAGE*  
-Include `\usepackage{PACKAGE}` when rendering the diagram.
+Include `\usepackage{PACKAGE}` when rendering the diagram. The tikz, tikz-cd,
+pgfplots, amsmath and amssymb packages are always included by default.
 
+**-l, --library**=+*LIBRARY*
+Include `\usetikzlibrary{LIBRARY}` when rendering the diagram.
+
 **-q, --quiet**  
 Silence application log messages and script warnings.
 
@@ -33,35 +41,49 @@
 
 ``` latex
 \begin{tikzcd}
-    G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
-    \sfrac{G}{\ker \varphi} \arrow[ru, dotted]           &
+     G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
+  \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[ru, dotted] &
 \end{tikzcd}
 ```
 
-You could achieve that by running the following command:
+You could achieve this by running:
+``` sh
+# xfrac and relsize are only there so that we can 
+# call \sfrac and \mathlarger
+$ tikztosvg -p xfrac -p relsize example.tikz
+```
 
-    tikztosvg -p tikz-cd -p xfrac example.tikz
+The results will be stored in the file `example.svg`.
 
-The results will be stored in the file `example.svg`:
+## Installation
 
-![example](examples/example.svg)
+The `tikztosvg(1)` command and it’s man page can be installed in Unix systems
+by running
 
-## Installation
+``` sh
+$ curl -s https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/install.sh | sudo sh
+```
 
-The `tikztosvg(1)` command and it’s man page can be installed in Unix systems by running:
+or it can be installed via Git with
 
-    $ curl -s https://gitlab.com/pablo-escobar/tikztosvg/-/raw/master/install.sh | sudo sh
+``` sh
+$ git clone https://git.sr.ht/~pablo-pie/tikztosvg
+$ cd tikztosvg
+$ sudo make install
+```
 
-The executable is installed in `$HOME/.local/bin/` and the man-page is installed in `$HOME/.local/share/man/man1/`.
+The executable is installed in `$HOME/.local/bin/` and the man-page is
+installed in `$HOME/.local/share/man/man1/`.
 
 ## Authors
 
-**tikztosvg** was written by [Pablo Emilio Escobar Gaviria](mailto:pablo-escobar at riseup.net).
+**tikztosvg** was written by [Pablo](mailto:pablo-escobar at riseup.net).
 
-**pdf2svg** was written by [David Barton](mailto:davebarton at cityinthesky.co.uk) and [Matthew Flaschen](mailto:matthew.flaschen at gatech.edu).
+**pdf2svg** was written by [David Barton](mailto:davebarton at cityinthesky.co.uk)
+and [Matthew Flaschen](mailto:matthew.flaschen at gatech.edu).
 
 ## License
 
-© 2020 Pablo Emilio Escobar Gaviria.
+© 2021 Pablo.
 
 Free use of this software is granted under the terms of the GPL-3.0 License.

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/example.svg
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/example.svg	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/example.svg	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,80 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="154.04pt" height="103.8pt" viewBox="0 0 154.04 103.8" version="1.1">
-<defs>
-<g>
-<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 15.40625 -14.359375 C 15.40625 -14.546875 15.265625 -14.546875 15.21875 -14.546875 C 15.1875 -14.546875 15.09375 -14.546875 14.9375 -14.328125 L 13.515625 -12.625 C 13.40625 -12.78125 13 -13.515625 12.1875 -13.984375 C 11.296875 -14.546875 10.40625 -14.546875 10.09375 -14.546875 C 5.6875 -14.546875 1.03125 -10.03125 1.03125 -5.171875 C 1.03125 -1.75 3.390625 0.4375 6.484375 0.4375 C 7.96875 0.4375 9.859375 -0.0625 10.890625 -1.359375 C 11.109375 -0.578125 11.5625 -0.015625 11.71875 -0.015625 C 11.8125 -0.015625 11.84375 -0.078125 11.859375 -0.078125 C 11.875 -0.125 12.046875 -0.84375 12.140625 -1.21875 L 12.46875 -2.546875 C 12.640625 -3.21875 12.71875 -3.515625 12.875 -4.125 C 13.078125 -4.921875 13.109375 -4.984375 14.25 -5 C 14.328125 -5 14.578125 -5 14.578125 -5.390625 C 14.578125 -5.59375 14.375 -5.59375 14.3125 -5.59375 C 13.96875 -5.59375 13.578125 -5.5625 13.203125 -5.5625 L 12.078125 -5.5625 C 11.21875 -5.5625 10.3125 -5.59375 9.453125 -5.59375 C 9.28125 -5.59375 9.03125 -5.59375 9.03125 -5.21875 C 9.03125 -5.015625 9.1875 -5.015625 9.1875 -5 L 9.703125 -5 C 11.34375 -5 11.34375 -4.828125 11.34375 -4.53125 C 11.34375 -4.5 10.953125 -2.421875 10.5625 -1.796875 C 9.765625 -0.640625 8.140625 -0.171875 6.921875 -0.171875 C 5.328125 -0.171875 2.75 -0.984375 2.75 -4.5625 C 2.75 -5.953125 3.25 -9.109375 5.25 -11.4375 C 6.546875 -12.9375 8.46875 -13.9375 10.28125 -13.9375 C 12.71875 -13.9375 13.59375 -11.859375 13.59375 -9.953125 C 13.59375 -9.625 13.515625 -9.171875 13.515625 -8.875 C 13.515625 -8.703125 13.71875 -8.703125 13.78125 -8.703125 C 14 -8.703125 14.03125 -8.71875 14.109375 -9.09375 Z M 15.40625 -14.359375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 15.453125 -12.59375 C 15.640625 -13.296875 15.671875 -13.515625 17.140625 -13.515625 C 17.515625 -13.515625 17.71875 -13.515625 17.71875 -13.875 C 17.71875 -14.109375 17.53125 -14.109375 17.40625 -14.109375 C 17.046875 -14.109375 16.609375 -14.0625 16.21875 -14.0625 L 13.78125 -14.0625 C 13.390625 -14.0625 12.953125 -14.109375 12.5625 -14.109375 C 12.421875 -14.109375 12.171875 -14.109375 12.171875 -13.71875 C 12.171875 -13.515625 12.3125 -13.515625 12.703125 -13.515625 C 13.9375 -13.515625 13.9375 -13.34375 13.9375 -13.109375 C 13.9375 -13.078125 13.9375 -12.953125 13.859375 -12.640625 L 12.59375 -7.640625 L 6.359375 -7.640625 L 7.59375 -12.59375 C 7.78125 -13.296875 7.828125 -13.515625 9.296875 -13.515625 C 9.671875 -13.515625 9.875 -13.515625 9.875 -13.875 C 9.875 -14.109375 9.6875 -14.109375 9.5625 -14.109375 C 9.1875 -14.109375 8.765625 -14.0625 8.359375 -14.0625 L 5.921875 -14.0625 C 5.53125 -14.0625 5.109375 -14.109375 4.703125 -14.109375 C 4.5625 -14.109375 4.3125 -14.109375 4.3125 -13.71875 C 4.3125 -13.515625 4.46875 -13.515625 4.859375 -13.515625 C 6.09375 -13.515625 6.09375 -13.34375 6.09375 -13.109375 C 6.09375 -13.078125 6.09375 -12.953125 6.015625 -12.640625 L 3.21875 -1.53125 C 3.03125 -0.8125 3 -0.59375 1.5625 -0.59375 C 1.09375 -0.59375 0.953125 -0.59375 0.953125 -0.203125 C 0.953125 0 1.171875 0 1.234375 0 C 1.609375 0 2.046875 -0.046875 2.4375 -0.046875 L 4.875 -0.046875 C 5.265625 -0.046875 5.703125 0 6.09375 0 C 6.265625 0 6.484375 0 6.484375 -0.390625 C 6.484375 -0.59375 6.296875 -0.59375 5.984375 -0.59375 C 4.734375 -0.59375 4.734375 -0.765625 4.734375 -0.96875 C 4.734375 -0.984375 4.734375 -1.140625 4.765625 -1.296875 L 6.203125 -7.046875 L 12.453125 -7.046875 C 12.109375 -5.6875 11.046875 -1.359375 11.015625 -1.234375 C 10.78125 -0.625 10.453125 -0.625 9.234375 -0.59375 C 8.984375 -0.59375 8.796875 -0.59375 8.796875 -0.203125 C 8.796875 0 9.03125 0 9.09375 0 C 9.453125 0 9.890625 -0.046875 10.28125 -0.046875 L 12.71875 -0.046875 C 13.109375 -0.04!
 6875 13.546875 0 13.9375 0 C 14.109375 0 14.328125 0 14.328125 -0.390625 C 14.328125 -0.59375 14.15625 -0.59375 13.84375 -0.59375 C 12.578125 -0.59375 12.578125 -0.765625 12.578125 -0.96875 C 12.578125 -0.984375 12.578125 -1.140625 12.625 -1.296875 Z M 15.453125 -12.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 8.859375 -14.734375 C 8.859375 -14.75 8.984375 -15.0625 8.984375 -15.09375 C 8.984375 -15.34375 8.78125 -15.5 8.609375 -15.5 C 8.515625 -15.5 8.328125 -15.5 8.15625 -15.03125 L 1.234375 4.40625 C 1.234375 4.421875 1.109375 4.734375 1.109375 4.765625 C 1.109375 5.015625 1.328125 5.171875 1.484375 5.171875 C 1.609375 5.171875 1.796875 5.140625 1.9375 4.703125 Z M 8.859375 -14.734375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph1-1">
-<path style="stroke:none;" d="M 10.703125 -9.96875 C 10.703125 -10.09375 10.59375 -10.09375 10.578125 -10.09375 C 10.546875 -10.09375 10.484375 -10.09375 10.375 -9.953125 L 9.375 -8.765625 C 9.3125 -8.875 9.015625 -9.375 8.46875 -9.703125 C 7.84375 -10.09375 7.234375 -10.09375 7.015625 -10.09375 C 3.9375 -10.09375 0.71875 -6.96875 0.71875 -3.578125 C 0.71875 -1.21875 2.359375 0.296875 4.5 0.296875 C 5.53125 0.296875 6.84375 -0.046875 7.5625 -0.953125 C 7.71875 -0.40625 8.03125 -0.015625 8.140625 -0.015625 C 8.203125 -0.015625 8.21875 -0.0625 8.234375 -0.0625 C 8.25 -0.09375 8.359375 -0.59375 8.4375 -0.84375 L 8.65625 -1.765625 C 8.78125 -2.234375 8.828125 -2.4375 8.9375 -2.875 C 9.078125 -3.40625 9.109375 -3.453125 9.890625 -3.46875 C 9.953125 -3.46875 10.125 -3.46875 10.125 -3.75 C 10.125 -3.890625 9.984375 -3.890625 9.9375 -3.890625 C 9.703125 -3.890625 9.421875 -3.859375 9.171875 -3.859375 L 8.390625 -3.859375 C 7.78125 -3.859375 7.15625 -3.890625 6.5625 -3.890625 C 6.4375 -3.890625 6.265625 -3.890625 6.265625 -3.625 C 6.265625 -3.484375 6.390625 -3.484375 6.390625 -3.46875 L 6.734375 -3.46875 C 7.875 -3.46875 7.875 -3.359375 7.875 -3.140625 C 7.875 -3.125 7.609375 -1.671875 7.328125 -1.25 C 6.78125 -0.4375 5.65625 -0.109375 4.8125 -0.109375 C 3.703125 -0.109375 1.90625 -0.6875 1.90625 -3.171875 C 1.90625 -4.125 2.25 -6.328125 3.640625 -7.953125 C 4.546875 -8.984375 5.875 -9.6875 7.140625 -9.6875 C 8.828125 -9.6875 9.4375 -8.234375 9.4375 -6.90625 C 9.4375 -6.6875 9.375 -6.375 9.375 -6.171875 C 9.375 -6.03125 9.53125 -6.03125 9.5625 -6.03125 C 9.71875 -6.03125 9.734375 -6.046875 9.796875 -6.3125 Z M 10.703125 -9.96875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-2">
-<path style="stroke:none;" d="M 4.3125 -0.625 C 4.078125 -0.625 3.859375 -0.625 3.859375 -0.703125 C 3.859375 -0.734375 4.109375 -2.078125 4.1875 -2.390625 C 4.640625 -4.234375 5.734375 -5.546875 6.984375 -5.546875 C 7.921875 -5.546875 8.34375 -4.84375 8.34375 -4.0625 C 8.34375 -2.421875 6.515625 -0.625 4.3125 -0.625 Z M 3.703125 0.109375 C 3.78125 0.125 3.9375 0.140625 4.1875 0.140625 C 6.546875 0.140625 8.703125 -2.125 8.703125 -4.390625 C 8.703125 -5.265625 8.3125 -6.328125 7.109375 -6.328125 C 5.046875 -6.328125 4.171875 -3.40625 3.375 -0.71875 C 1.71875 -1.03125 1.03125 -1.90625 1.03125 -2.875 C 1.03125 -3.25 1.328125 -4.796875 2.171875 -5.828125 C 2.328125 -6.015625 2.328125 -6.03125 2.328125 -6.0625 C 2.328125 -6.1875 2.203125 -6.1875 2.1875 -6.1875 C 1.796875 -6.1875 0.703125 -4.09375 0.703125 -2.71875 C 0.703125 -1.125 1.96875 -0.25 3.125 0.015625 L 2.375 2.4375 C 2.3125 2.65625 2.3125 2.6875 2.3125 2.734375 C 2.3125 3.078125 2.65625 3.09375 2.6875 3.09375 C 2.828125 3.09375 3.078125 3.046875 3.203125 2.75 C 3.234375 2.625 3.640625 0.40625 3.703125 0.109375 Z M 3.703125 0.109375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-3">
-<path style="stroke:none;" d="M 6.734375 -9.609375 C 6.734375 -9.625 6.796875 -9.8125 6.796875 -9.828125 C 6.796875 -9.953125 6.6875 -9.953125 6.640625 -9.953125 C 6.515625 -9.953125 6.5 -9.890625 6.4375 -9.671875 L 4.078125 -0.171875 C 2.890625 -0.3125 2.4375 -0.921875 2.4375 -1.78125 C 2.4375 -2.09375 2.4375 -2.421875 3.109375 -4.203125 C 3.296875 -4.71875 3.375 -4.90625 3.375 -5.15625 C 3.375 -5.8125 2.90625 -6.328125 2.234375 -6.328125 C 0.921875 -6.328125 0.390625 -4.25 0.390625 -4.125 C 0.390625 -4.078125 0.4375 -4 0.546875 -4 C 0.671875 -4 0.6875 -4.0625 0.75 -4.265625 C 1.09375 -5.515625 1.65625 -6.03125 2.1875 -6.03125 C 2.328125 -6.03125 2.5625 -6.03125 2.5625 -5.5625 C 2.5625 -5.515625 2.5625 -5.1875 2.328125 -4.5625 C 1.546875 -2.53125 1.546875 -2.203125 1.546875 -1.875 C 1.546875 -0.5 2.703125 0.03125 3.984375 0.125 C 3.875 0.578125 3.765625 1.03125 3.65625 1.484375 C 3.421875 2.34375 3.328125 2.734375 3.328125 2.796875 C 3.328125 2.921875 3.4375 2.921875 3.484375 2.921875 C 3.515625 2.921875 3.578125 2.921875 3.59375 2.875 C 3.65625 2.8125 4.25 0.40625 4.296875 0.140625 C 4.828125 0.140625 5.96875 0.140625 7.265625 -1.1875 C 7.734375 -1.703125 8.15625 -2.359375 8.40625 -2.984375 C 8.546875 -3.359375 8.890625 -4.640625 8.890625 -5.359375 C 8.890625 -6.21875 8.46875 -6.328125 8.3125 -6.328125 C 7.96875 -6.328125 7.65625 -5.984375 7.65625 -5.6875 C 7.65625 -5.515625 7.765625 -5.421875 7.8125 -5.359375 C 7.953125 -5.234375 8.328125 -4.84375 8.328125 -4.109375 C 8.328125 -3.578125 8.046875 -2.53125 7.125 -1.484375 C 5.921875 -0.140625 4.8125 -0.140625 4.390625 -0.140625 Z M 6.734375 -9.609375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph2-1">
-<path style="stroke:none;" d="M 4.015625 -3.796875 C 4.015625 -3.8125 3.921875 -3.9375 3.921875 -3.9375 C 3.921875 -3.984375 4.8125 -4.765625 4.9375 -4.875 C 5.921875 -5.734375 6.5625 -5.75 6.859375 -5.765625 L 6.859375 -6.1875 C 6.5625 -6.15625 6.203125 -6.15625 5.765625 -6.15625 C 5.390625 -6.15625 4.65625 -6.15625 4.328125 -6.1875 L 4.328125 -5.765625 C 4.578125 -5.75 4.75 -5.625 4.75 -5.390625 C 4.75 -5.109375 4.453125 -4.84375 4.453125 -4.84375 L 2.390625 -3.046875 L 2.390625 -9.953125 L 0.40625 -9.796875 L 0.40625 -9.375 C 1.375 -9.375 1.484375 -9.28125 1.484375 -8.578125 L 1.484375 -1.0625 C 1.484375 -0.421875 1.328125 -0.421875 0.40625 -0.421875 L 0.40625 0 C 0.796875 -0.03125 1.484375 -0.03125 1.921875 -0.03125 C 2.359375 -0.03125 3.046875 -0.03125 3.4375 0 L 3.4375 -0.421875 C 2.53125 -0.421875 2.359375 -0.421875 2.359375 -1.0625 L 2.359375 -2.578125 L 3.265625 -3.390625 L 4.640625 -1.40625 C 4.859375 -1.109375 4.96875 -0.953125 4.96875 -0.75 C 4.96875 -0.484375 4.765625 -0.421875 4.453125 -0.421875 L 4.453125 0 C 4.8125 -0.03125 5.515625 -0.03125 5.90625 -0.03125 C 6.53125 -0.03125 6.5625 -0.03125 7.171875 0 L 7.171875 -0.421875 C 6.78125 -0.421875 6.34375 -0.421875 5.9375 -1 Z M 4.015625 -3.796875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-2">
-<path style="stroke:none;" d="M 5.5 -3.328125 C 5.8125 -3.328125 5.84375 -3.328125 5.84375 -3.59375 C 5.84375 -5.046875 5.0625 -6.390625 3.328125 -6.390625 C 1.6875 -6.390625 0.4375 -4.921875 0.4375 -3.140625 C 0.4375 -1.25 1.890625 0.140625 3.484375 0.140625 C 5.1875 0.140625 5.84375 -1.40625 5.84375 -1.703125 C 5.84375 -1.796875 5.765625 -1.84375 5.6875 -1.84375 C 5.5625 -1.84375 5.53125 -1.78125 5.515625 -1.703125 C 5.140625 -0.5 4.171875 -0.171875 3.578125 -0.171875 C 2.96875 -0.171875 1.515625 -0.578125 1.515625 -3.0625 L 1.515625 -3.328125 Z M 1.53125 -3.59375 C 1.65625 -5.859375 2.90625 -6.109375 3.3125 -6.109375 C 4.84375 -6.109375 4.9375 -4.09375 4.953125 -3.59375 Z M 1.53125 -3.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph2-3">
-<path style="stroke:none;" d="M 2.390625 -3.34375 C 2.390625 -4.734375 2.96875 -6.03125 4.078125 -6.03125 C 4.1875 -6.03125 4.21875 -6.03125 4.28125 -6.03125 C 4.15625 -5.96875 3.9375 -5.875 3.9375 -5.5 C 3.9375 -5.078125 4.265625 -4.921875 4.484375 -4.921875 C 4.78125 -4.921875 5.0625 -5.109375 5.0625 -5.5 C 5.0625 -5.921875 4.671875 -6.328125 4.0625 -6.328125 C 2.84375 -6.328125 2.421875 -5 2.34375 -4.734375 L 2.328125 -4.734375 L 2.328125 -6.328125 L 0.40625 -6.171875 L 0.40625 -5.75 C 1.375 -5.75 1.484375 -5.65625 1.484375 -4.953125 L 1.484375 -1.0625 C 1.484375 -0.421875 1.328125 -0.421875 0.40625 -0.421875 L 0.40625 0 C 0.796875 -0.03125 1.59375 -0.03125 2.015625 -0.03125 C 2.40625 -0.03125 3.421875 -0.03125 3.765625 0 L 3.765625 -0.421875 L 3.46875 -0.421875 C 2.421875 -0.421875 2.390625 -0.578125 2.390625 -1.09375 Z M 2.390625 -3.34375 "/>
-</symbol>
-</g>
-</defs>
-<g id="surface1">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="26.158" y="23.236"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="126.771" y="23.236"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-1" x="8.904" y="86.328"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-3" x="18.837" y="91.065"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph2-1" x="29.048" y="91.065"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph2-2" x="36.074769" y="91.065"/>
-  <use xlink:href="#glyph2-3" x="42.318235" y="91.065"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-2" x="50.168" y="91.065"/>
-</g>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -25.796344 34.602687 L 40.250531 34.602687 " transform="matrix(1,0,0,-1,77.019,52.673)"/>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -2.070883 2.389612 C -1.691976 0.956019 -0.848226 0.280237 -0.00057 -0.0010125 C -0.848226 -0.278356 -1.691976 -0.958044 -2.070883 -2.391638 " transform="matrix(1,0,0,-1,117.46932,18.0693)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-2" x="79.844" y="10.628"/>
-</g>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -42.882281 21.669094 L -42.882281 -14.725438 " transform="matrix(1,0,0,-1,77.019,52.673)"/>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -2.07113 2.389094 C -1.692224 0.9555 -0.848474 0.279719 -0.0008175 -0.00153125 C -0.848474 -0.278875 -1.692224 -0.954656 -2.07113 -2.392156 " transform="matrix(0,1,1,0,34.13825,66.16488)"/>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -2.072096 2.389094 C -1.69319 0.9555 -0.84944 0.279719 -0.00178375 -0.00153125 C -0.84944 -0.278875 -1.69319 -0.954656 -2.072096 -2.392156 " transform="matrix(0,1,1,0,34.13825,67.59944)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="19.839" y="52.988"/>
-</g>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:0.39848,1.99255;stroke-miterlimit:10;" d="M -15.718219 -15.123875 L 40.316937 22.20425 " transform="matrix(1,0,0,-1,77.019,52.673)"/>
-<path style="fill:none;stroke-width:0.39848;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M -2.069957 2.390722 C -1.692511 0.95513 -0.851846 0.278037 0.00166533 -0.000425055 C -0.84952 -0.280472 -1.694105 -0.958063 -2.072863 -2.390639 " transform="matrix(0.83461,-0.55605,-0.55605,-0.83461,117.50228,30.35604)"/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="78.29pt" height="66.92" viewBox="0 0 78.29 50.19">
+    <defs>
+        <symbol id="a" overflow="visible">
+            <path d="M7.578-6.922c0-.031-.016-.11-.11-.11-.03 0-.046.016-.155.126l-.688.765c-.094-.14-.547-.89-1.656-.89C2.734-7.031.5-4.828.5-2.516.5-.922 1.61.22 3.219.22c.437 0 .89-.094 1.25-.235.5-.203.687-.406.86-.609.093.25.359.61.452.61.047 0 .078-.032.078-.032.016-.015.11-.406.157-.61l.187-.765.14-.516c.11-.437.11-.468.688-.468.047 0 .157-.016.157-.203 0-.079-.047-.11-.125-.11-.235 0-.829.031-1.047.031-.313 0-1.094-.03-1.407-.03-.078 0-.203 0-.203.202 0 .11.078.11.297.11.016 0 .297 0 .531.015.266.032.313.063.313.188 0 .094-.11.531-.219.906C5.047-.203 3.766-.094 3.406-.094c-.953 0-2-.562-2-2.094 0-.312.094-1.953 1.14-3.25.548-.671 1.517-1.28 2.5-1.28 1.016 0 1.61.765 1.61 1.921 0 .406-.031.406-.031.516 0 .093.11.093.14.093.126 0 .126-.015.188-.203zm0 0"/>
+        </symbol>
+        <symbol id="b" overflow="visible">
+            <path d="M7.61-6.047c.093-.36.109-.453.827-.453.266 0 .344 0 .344-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.016 0 .204 0 .376.016.187.03.266.03.266.171 0 .032 0 .047-.032.188l-.593 2.422H3.14l.593-2.344c.079-.36.11-.453.829-.453.265 0 .343 0 .343-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.017 0 .204 0 .376.016.172.03.265.03.265.171 0 .032 0 .063-.03.188L1.561-.781c-.093.39-.109.469-.906.469-.172 0-.265 0-.265.203C.39 0 .516 0 .53 0c.281 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.094-.11-.281-.11-.375 0-.64 0-.64-.171 0-.063.015-.11.015-.172l.688-2.735h3.03c-.405 1.657-.64 2.61-.687 2.75-.093.329-.281.329-.906.329-.14 0-.234 0-.234.203 0 .109.125.109.14.109.282 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.093-.11-.281-.11-.36 0-.64 0-.64-.171 0-.063.015-.11.03-.172zm0 0"/>
+        </symbol>
+        <symbol id="d" overflow="visible">
+            <path d="M4.375-7.094c.047-.14.047-.172.047-.187 0-.11-.078-.203-.188-.203-.078 0-.14.03-.171.093l-3.47 9.5c-.046.141-.046.172-.046.188 0 .11.094.203.203.203.125 0 .156-.078.219-.25zm0 0"/>
+        </symbol>
+        <symbol id="c" overflow="visible">
+            <path d="M5.875-4.813c0-.03-.016-.093-.094-.093-.047 0-.062.015-.125.093l-.5.532c-.062-.078-.453-.625-1.312-.625-1.703 0-3.36 1.5-3.36 3.078C.484-.75 1.313.14 2.641.14c.625 0 1.265-.157 1.625-.547.078.14.265.406.343.406.063 0 .079-.031.11-.188l.14-.53c.032-.126.125-.548.157-.626.078-.312.078-.328.5-.328.046 0 .156 0 .156-.14 0-.079-.063-.11-.11-.11-.234 0-.53.031-.765.031-.172 0-.406 0-.578-.015-.172 0-.375-.016-.547-.016-.063 0-.156 0-.156.156 0 .094.078.094.25.094.125 0 .265 0 .406.016.219.015.219.047.219.125 0 .031 0 .047-.047.234-.047.188-.125.5-.157.578-.187.422-.843.61-1.39.61-.688 0-1.61-.344-1.61-1.516 0-.75.36-1.672.875-2.203.72-.703 1.454-.813 1.844-.813.813 0 1.281.579 1.281 1.36 0 .187-.015.25-.015.281 0 .094.094.094.125.094.11 0 .11-.016.14-.156zm0 0"/>
+        </symbol>
+        <symbol id="h" overflow="visible">
+            <path d="M2.203.063h.235c1.25 0 2.406-1.016 2.406-2.126 0-.609-.375-1.015-.907-1.015-.968 0-1.484 1.234-1.671 1.75-.094.266-.25.75-.282.875C1.22-.547.72-.906.72-1.422c0 0 .047-.781.61-1.406.046-.047.062-.063.062-.094C1.39-3 1.297-3 1.28-3c-.062 0-.093 0-.234.156-.39.469-.563 1.203-.563 1.5C.484-.719.938-.187 1.828 0c-.344 1.094-.39 1.219-.39 1.281 0 .188.171.219.234.219.078 0 .219-.047.281-.14.047-.11.11-.47.25-1.298zm.094-.47c.14-.812.187-1.124.531-1.577.313-.422.672-.61 1.031-.61.47 0 .735.313.735.672 0 .703-.875 1.516-2.078 1.516h-.22zm0 0"/>
+        </symbol>
+        <symbol id="i" overflow="visible">
+            <path d="M3.797-4.64c.015-.079.015-.11.015-.11 0-.094-.093-.094-.109-.094-.11 0-.11.032-.14.157L2.421-.141c-.563-.062-.875-.312-.875-.78 0-.11 0-.298.344-1.157.062-.156.109-.281.109-.39 0-.376-.313-.61-.656-.61C.64-3.078.328-2.125.328-2c0 .078.094.078.125.078.094 0 .094-.031.125-.11.156-.562.469-.843.735-.843.125 0 .171.078.171.234 0 .172-.046.297-.125.516-.343.875-.343 1.031-.343 1.156 0 .797.843 1 1.359 1.031a47.669 47.669 0 00-.313 1.266c0 .094.079.094.11.094.094 0 .11-.031.14-.14L2.61.061c.282 0 .922 0 1.657-.718a2.42 2.42 0 00.5-.75C4.859-1.641 5-2.203 5-2.531c0-.547-.328-.547-.344-.547a.403.403 0 00-.375.375c0 .11.063.172.094.187.11.094.281.266.281.579 0 .578-.797 1.812-2 1.812zm0 0"/>
+        </symbol>
+        <symbol id="e" overflow="visible">
+            <path d="M2.25-1.89c.86-.657 1.094-.844 1.563-.86V-3c-.141.016-.329.031-.47.031-.28 0-.562-.015-.827-.031v.25c.078.016.125.063.125.125 0 .11-.141.234-.22.297l-1.03.797v-3.313l-1.047.078v.25c.469 0 .515.063.515.391v3.578C.86-.25.797-.25.344-.25V0c.25-.016.515-.031.765-.031.266 0 .516.015.782.031v-.25c-.454 0-.532 0-.532-.297v-.672l.516-.39.75.953c.078.078.156.187.156.281 0 .11-.125.125-.187.125V0c.094 0 .578-.031.781-.031.203 0 .406.015.61.031v-.25c-.25 0-.407-.016-.61-.266zm0 0"/>
+        </symbol>
+        <symbol id="f" overflow="visible">
+            <path d="M3.063-1.594c.156 0 .203 0 .203-.14 0-.625-.344-1.375-1.391-1.375a1.59 1.59 0 00-1.61 1.578c0 .89.782 1.593 1.704 1.593.937 0 1.297-.75 1.297-.906 0-.015-.016-.094-.125-.094-.094 0-.11.047-.125.11-.22.562-.75.672-1 .672-.329 0-.641-.14-.844-.406-.266-.329-.266-.75-.266-1.032zM.905-1.766c.078-.984.703-1.14.969-1.14.86 0 .89.969.906 1.14zm0 0"/>
+        </symbol>
+        <symbol id="g" overflow="visible">
+            <path d="M1.39-1.594c0-.578.266-1.281.938-1.281a.325.325 0 00-.125.25c0 .234.188.313.313.313.171 0 .328-.11.328-.313 0-.234-.235-.453-.563-.453-.344 0-.734.219-.937.75v-.75L.344-3v.25c.469 0 .515.047.515.39v1.813C.86-.25.797-.25.344-.25V0c.031 0 .5-.031.797-.031.296 0 .593.015.906.031v-.25h-.14c-.516 0-.516-.078-.516-.313zm0 0"/>
+        </symbol>
+    </defs>
+    <use x="14.432" y="11.346" xlink:href="#a"/>
+    <use x="64.904" y="11.346" xlink:href="#b"/>
+    <use x="4.293" y="41.808" xlink:href="#c"/>
+    <use x="9.942" y="44.05" xlink:href="#d"/>
+    <use x="15.177" y="44.05" xlink:href="#e"/>
+    <use x="19.153" y="44.05" xlink:href="#f"/>
+    <use x="22.695" y="44.05" xlink:href="#g"/>
+    <use x="27.165" y="44.05" xlink:href="#h"/>
+    <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width=".398" d="M26.758 8.855h33.254"/>
+    <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M58.14 6.465c.38 1.433 1.223 2.11 2.07 2.39-.847.278-1.69.957-2.07 2.391"/>
+    <use x="40.965" y="5.152" xlink:href="#h"/>
+    <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width=".398" d="M18.348 15.195v17.137"/>
+    <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M20.738 29.023c-1.433.38-2.11 1.223-2.39 2.07-.278-.847-.953-1.69-2.391-2.07"/>
+    <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M20.738 30.457c-1.433.379-2.11 1.223-2.39 2.074-.278-.851-.953-1.695-2.391-2.074"/>
+    <use x="10.481" y="25.705" xlink:href="#i"/>
+    <path fill="none" stroke="#000" stroke-dasharray=".39848,1.99255" stroke-miterlimit="10" stroke-width=".398" d="M32.145 32.73l27.93-17.878"/>
+    <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".39801990000000004" d="M57.207 13.848c1.094 1.004 2.168 1.117 3.035.894-.566.695-.91 1.719-.457 3.133"/>
 </svg>

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/example.tikz
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/example.tikz	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/example.tikz	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,4 +1,4 @@
 \begin{tikzcd}
-G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
-\sfrac{G}{\ker \varphi} \arrow[ru, dotted]           &  
+     G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
+  \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[ru, dotted] &
 \end{tikzcd}

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/install.sh
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/install.sh	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/install.sh	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,4 +1,7 @@
 #!/bin/sh
+# 
+# 2021 (C) Pablo
+# Free use of this software is granted under the terms of the GPL-3.0 License
 
 puts ()
 {
@@ -43,13 +46,13 @@
     rm "$HOME/.local/bin/tikztosvg"
 fi
 
-wget https://gitlab.com/pablo-escobar/tikztosvg/-/raw/master/tikztosvg -P "$HOME/.local/bin/"\
+wget https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/tikztosvg -P "$HOME/.local/bin/"\
     && chmod +x "$HOME/.local/bin/tikztosvg"\
     || exit 1
 
 tmp="$(mktemp -d)"
 message "Installing manual entry for tikztosvg(1)"
-wget https://gitlab.com/pablo-escobar/tikztosvg/-/raw/master/man/tikztosvg.1 -P "$tmp"\
+wget https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/man/tikztosvg.1 -P "$tmp"\
     && install -g 0 -o 0 -m 0644 "$tmp/tikztosvg.1" "$HOME/.local/share/man/man1/"\
     || exit 1
 

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/man.adoc
===================================================================
--- trunk/Master/texmf-dist/doc/support/tikztosvg/man.adoc	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/doc/support/tikztosvg/man.adoc	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,20 +1,20 @@
-= tikzsvg(1)
+= tikztosvg(1)
 :doctype: manpage
 :man-manual: tikztosvg Manual
-:man-source: tikztosvg 0.1.2
+:man-source: tikztosvg 0.2.0
 :page-layout: base
 
 == NAME
 
-tikzsvg - Render TikZ diagrams to SVG.
+tikztosvg - Render TikZ diagrams to SVG.
 
 == SYNOPSIS
 
-*tikzsvg* [_OPTION_]... _INPUT_PATH_
+*tikztosvg* [_OPTION_]... _INPUT_PATH_
 
 == DESCRIPTION
 
-The tikzsvg(1) command renders TikZ diagrams to SVG.
+The tikztosvg(1) command renders TikZ diagrams to SVG.
 
 If _INPUT_PATH_ is set to _-_ the input will be read from stdin.
 
@@ -27,8 +27,12 @@
   extension. The file is resolved relative to the working directory.
 
 *-p, --package*=+_PACKAGE_::
-  Include _\usepackage{PACKAGE}_ when rendering the diagram.
+  Include _\usepackage{PACKAGE}_ when rendering the diagram. The tikz, tikz-cd,
+pgfplots, amsmath and amssymb packages are always included by default.
 
+*-l, --library*=+_LIBRARY::
+  Include _\usetikzlibrary{LIBRARY}_ when rendering the diagram.
+
 *-q, --quiet*::
   Silence application log messages and script warnings.
 
@@ -40,7 +44,7 @@
 
 == ENVIRONMENT
 
-*tikztosvg* requires _xetex_ and _pdf2svg_ to be installed. Make sure 
+*tikztosvg* requires XeTeX and pdf2svg to be installed. Make sure 
 any additional LaTeX packages are installed before using them in a diagram.
 
 == EXIT STATUS
@@ -56,8 +60,7 @@
 
 == AUTHORS
 
-*tikztosvg* was written by Pablo Emilio Escobar Gaviria 
-<pablo-escobar at riseup.net>.
+*tikztosvg* was written by Pablo <pablo-escobar at riseup.net>.
 
 *pdf2svg* was written by David Barton <davebarton at cityinthesky.co.uk> and 
 Matthew Flaschen <matthew.flaschen at gatech.edu>.
@@ -64,10 +67,10 @@
 
 == RESOURCES
 
-*Git source repository on GitLab:* https://gitlab.com/pablo-escobar/tikztosvg
+*Git source repository on sourcehut:* https://git.sr.ht/~pablo-pie/tikztosvg
 
 == COPYING
 
-Copyright \(C) 2020 Pablo Emilio Escobar Gaviria.
+Copyright \(C) 2021 Pablo.
 Free use of this software is granted under the terms of the GPL-3.0 License.
 

Modified: trunk/Master/texmf-dist/doc/support/tikztosvg/tikztosvg.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/tikztosvg/tikztosvg
===================================================================
--- trunk/Master/texmf-dist/scripts/tikztosvg/tikztosvg	2021-04-04 02:28:26 UTC (rev 58736)
+++ trunk/Master/texmf-dist/scripts/tikztosvg/tikztosvg	2021-04-04 02:30:37 UTC (rev 58737)
@@ -1,4 +1,12 @@
 #!/bin/sh
+#  _   _ _         _ 
+# | |_(_) | __ ___| |_ ___  _____   ____ _ 
+# | __| | |/ /|_  / __/ _ \/ __\ \ / / _` |
+# | |_| |   <  / /| || (_) \__ \\ V / (_| |
+#  \__|_|_|\_\/___|\__\___/|___/ \_/ \__, |
+#                                    |___/
+# 2021 (C) Pablo
+# Free use of this software is granted under the terms of the GPL-3.0 License
 
 puts() 
 {
@@ -34,6 +42,10 @@
   exit 0
 }
 
+# The default list of packages and libraries that should be imported
+PACKAGES="tikz tikz-cd pgfplots amsmath amssymb"
+LIBRARIES=""
+
 if ! [ -x "$(command -v xelatex)" ]
 then
   error "xelatex could not be found"
@@ -45,7 +57,6 @@
 fi
 
 # Parsing the arguments
-PACKAGES=""
 while [ $# -gt 1 ]
 do
   case "$1" in
@@ -70,6 +81,21 @@
           shift
       esac
       ;;
+    -l|--library)
+      case "$2" in
+        "")
+          error "Unnexpected EOF"
+          ;;
+        # Check if the name of the package is valid
+        *" "*) 
+          error "Invalid library name. TikZ library names cannot contain scapes!" 
+          ;;
+        *)
+          LIBRARIES="$LIBRARIES $2"
+          shift
+          shift
+      esac
+      ;;
     -o|--output)
       if [ -n "$OUTPUT" ]
       then
@@ -139,12 +165,17 @@
 # Generate the LaTeX document
 printf "\documentclass[crop,tikz,multi=false]{standalone}\n" > "$TEX_FILE"
 
-for PACKAGE in $PACKAGES
+for PACKAGE in $(echo "$PACKAGES" | tr " " "\n" | sort | uniq)
 do
   printf "\usepackage{%s}\n" "$PACKAGE" >> "$TEX_FILE"
 done
 
-printf "\\\begin{document} \huge\n" >> "$TEX_FILE"
+for LIBRARY in $(echo "$LIBRARIES" | tr " " "\n" | sort | uniq) 
+do
+  printf "\usetikzlibrary{%s}\n" "$LIBRARY" >> "$TEX_FILE"
+done
+
+printf "\\\begin{document}\n" >> "$TEX_FILE"
 cat "$INPUT" >> "$TEX_FILE"
 
 if [ $? -ne 0 ]

More information about the tex-live-commits mailing list.