gfsdidot

git-svn-id: svn://tug.org/texlive/trunk@46311 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 21 insertions, 50 deletions

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}
 }