summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-14 22:56:37 +0000
committerKarl Berry <karl@freefriends.org>2018-01-14 22:56:37 +0000
commita48441d5300409ae9a61fa10cd5d6161f0b30c21 (patch)
treed5635a9c83c7f3b09816cf17367cb9f149a91568 /Master/texmf-dist
parentb76d736162f17bd262f927072447a03d44370081 (diff)
gfsdidot
git-svn-id: svn://tug.org/texlive/trunk@46311 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/pixelart/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/pixelart/README.md23
-rw-r--r--Master/texmf-dist/doc/latex/pixelart/pixelart.pdfbin146585 -> 148783 bytes
-rw-r--r--Master/texmf-dist/source/latex/pixelart/pixelart.dtx71
-rw-r--r--Master/texmf-dist/tex/latex/pixelart/pixelart.sty7
5 files changed, 43 insertions, 65 deletions
diff --git a/Master/texmf-dist/doc/latex/pixelart/CHANGELOG.md b/Master/texmf-dist/doc/latex/pixelart/CHANGELOG.md
index b135bbd313d..18a56a43ab4 100644
--- a/Master/texmf-dist/doc/latex/pixelart/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/pixelart/CHANGELOG.md
@@ -1,3 +1,10 @@
+* pixelart 0.1.2 (2018-01-13)
+
+ * Fix bug: First line-break is now automatically ignored.
+ * Minor documentation fixes and improvements.
+
+ -- Louis Paternault <spalax+ctan@gresille.org>
+
* pixelart 0.1.1 (2017-12-08)
* Fix CTAN URLs.
diff --git a/Master/texmf-dist/doc/latex/pixelart/README.md b/Master/texmf-dist/doc/latex/pixelart/README.md
index c84b8c39a11..471df069b24 100644
--- a/Master/texmf-dist/doc/latex/pixelart/README.md
+++ b/Master/texmf-dist/doc/latex/pixelart/README.md
@@ -16,24 +16,23 @@ black-and-white picture.
- Example: The picture above was produced using the following code.
```latex
-\bwpixelart{
- 111111110011001110000011111111
- 110110110011000110000011000011
- 100110010000000110000010000110
- 000110000111000110011000001100
- 000110000011000110110000011000
- 000110000011000111100000110000
- 000110000011000111100001100000
- 000110000011000110110011000001
- 000110000011000110011011000011
- 001111000111100110011011111111
+\bwpixelart[color=red]{
+ 0011001100
+ 0111111110
+ 1111111111
+ 1111111111
+ 1111111111
+ 0111111110
+ 0011111100
+ 0001111000
+ 0000110000
}
```
License
-------
-*Copyright 2017 Louis Paternault*
+*Copyright 2018 Louis Paternault*
This work may be distributed and/or modified under the conditions of the LaTeX
Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/doc/latex/pixelart/pixelart.pdf b/Master/texmf-dist/doc/latex/pixelart/pixelart.pdf
index a853c11d0b2..af4e7eeaba9 100644
--- a/Master/texmf-dist/doc/latex/pixelart/pixelart.pdf
+++ b/Master/texmf-dist/doc/latex/pixelart/pixelart.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/pixelart/pixelart.dtx b/Master/texmf-dist/source/latex/pixelart/pixelart.dtx
index 0b10b5d274e..1f3e7396b85 100644
--- a/Master/texmf-dist/source/latex/pixelart/pixelart.dtx
+++ b/Master/texmf-dist/source/latex/pixelart/pixelart.dtx
@@ -1,5 +1,5 @@
% \iffalse meta-comment
-% Copyright 2017 Louis Paternault
+% Copyright 2017-2018 Louis Paternault
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{pixelart}
%<*package>
- [2017/12/08 v0.1.1 A package to draw pixel-art pictures]
+ [2018/01/13 v0.1.2 A package to draw pixel-art pictures]
%</package>
%
%<*driver>
@@ -148,6 +148,18 @@
% \section{Download and Install}
% \label{sec:install}
%
+% \subsection{\textsc{Gnu}/Linux Distribution}
+%
+% If applicable, the easiest way to get |pixelart| working is by installing it by your distribution package. In Debian (and Ubuntu, and surely other distributions that inherit from Debian) it is packaged in |texlive-pictures| since version \texttt{2017.20180103-1}. So you can install it by running:
+%
+% \begin{quote}
+% |sudo apt install texlive-pictures|
+% \end{quote}
+%
+% \subsection{LaTeX distribution}
+%
+% This package is included both in \TeX{}Live and MiK\TeX{}. It can be installed using their respective package managers.
+%
% \subsection{Manual installation}
%
% \begin{itemize}
@@ -170,7 +182,7 @@
%
% \subsection{Macros}
%
-% This package defines two macros : |\bwpixelart|, used to insert a pixel-art picture, and |\tikzbwpixelart|, which has the same purpose, excepted that it is called from within a |tikzpicture| environment.
+% This package defines two macros : |\bwpixelart|\footnote{\texttt{$\backslash{}$bwpixelart} stands for \emph{b}lack and \emph{w}hite \emph{pixel art}, although \emph{color and transparent pixel art} would be more accurate.}, used to insert a pixel-art picture, and |\tikzbwpixelart|, which has the same purpose, excepted that it is called from within a |tikzpicture| environment.
%
% \subsubsection{\textbackslash\texttt{bwpixelart}}
% \DescribeMacro{\bwpixelart}
@@ -229,7 +241,7 @@
% \fi
% \begin{lstlisting}
\begin{tikzpicture}
- \tikzbwpixelart{0101}
+ \tikzbwpixelart{(0, 0)}{0101}
\end{tikzpicture}
\end{lstlisting}
% \iffalse
@@ -246,7 +258,7 @@
%
% For instance, this heart
%\begin{tikzpicture}[scale=.05, baseline=-1em]
-% \fill[red] (5, -5) circle (6.5);
+% \fill[red] (5, -4) circle (6.5);
% \tikzbwpixelart{(0, 0)}{%
% 0011001100
% 0111111110
@@ -266,7 +278,7 @@
% \fi
% \begin{lstlisting}
\begin{tikzpicture}[scale=.05, baseline=-1em]
- \fill[red] (5, -5) circle (6.5);
+ \fill[red] (5, -4) circle (6.5);
\tikzbwpixelart{(0, 0)}{%
0011001100
0111111110
@@ -458,48 +470,6 @@
%
% This will work (right now), but is an undefined behaviour, and might change in a later version without prior notice.
%
-% \subsection{Leading space}
-%
-% As described in the previous section, spaces are considered as line breaks. A problem is that the \emph{first} space(s) is considered as a line breaks as well. Thus, the first space should be commented out (using \%), to avoid the case described in the following picture, where the cross marks the location of the upper left corner of the picture, as intended (but not as produced).
-%
-% \begin{center}
-%\begin{tikzpicture}[scale=.2]
-% \tikzbwpixelart{(0, 0)}{
-% 10
-% 01
-% }
-% \draw (0, 0) node{$\times$} node[above left]{$(0, 0)$};
-%\end{tikzpicture}
-% \end{center}
-%
-% \iffalse
-%<*example>
-% \fi
-% \begin{lstlisting}
-\begin{tikzpicture}[scale=.2]
- \tikzbwpixelart{(0, 0)}{
- 10
- 01
- }
- \draw (0, 0) node{$\times$} node[above left]{$(0, 0)$};
-\end{tikzpicture}
-\end{lstlisting}
-% \iffalse
-%</example>
-% \fi
-%
-% To circumvent this bug, line 2 should have been written as (note the trailing percent character):
-%
-% \iffalse
-%<*example>
-% \fi
-% \begin{lstlisting}[firstnumber=2]
- \tikzbwpixelart{(0, 0)}{%
-\end{lstlisting}
-% \iffalse
-%</example>
-% \fi
-%
% \subsection{Uneven lines}
%
% Right now, lines do not \emph{have} to have the same number of characters. For instance, the following heart
@@ -638,10 +608,11 @@
\pgfkeys{/PIXELART/TIKZBWPIXELART, #1}
\begin{scope}[shift={#2}]
\begin{scope}[#1]
- \coordinate (@pixelart) at (0, 0);
+ \coordinate (@pixelart) at (0, 1);
\coordinate (@pixelart@startline) at (@pixelart);
- \pgfparserparse{@bwpixelart} #3 @
+ \pgfparserparse{@bwpixelart}
+ #3 @
\end{scope}
\end{scope}
}
diff --git a/Master/texmf-dist/tex/latex/pixelart/pixelart.sty b/Master/texmf-dist/tex/latex/pixelart/pixelart.sty
index cda3b353b53..229866d5146 100644
--- a/Master/texmf-dist/tex/latex/pixelart/pixelart.sty
+++ b/Master/texmf-dist/tex/latex/pixelart/pixelart.sty
@@ -23,7 +23,7 @@
%% and the derived file pixelart.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pixelart}
- [2017/12/08 v0.1.1 A package to draw pixel-art pictures]
+ [2018/01/13 v0.1.2 A package to draw pixel-art pictures]
\RequirePackage{pgf}
\usepgfmodule{parser}
@@ -95,10 +95,11 @@
\pgfkeys{/PIXELART/TIKZBWPIXELART, #1}
\begin{scope}[shift={#2}]
\begin{scope}[#1]
- \coordinate (@pixelart) at (0, 0);
+ \coordinate (@pixelart) at (0, 1);
\coordinate (@pixelart@startline) at (@pixelart);
- \pgfparserparse{@bwpixelart} #3 @
+ \pgfparserparse{@bwpixelart}
+ #3 @
\end{scope}
\end{scope}
}