summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-15 22:21:39 +0000
committerKarl Berry <karl@freefriends.org>2011-05-15 22:21:39 +0000
commit758efcfd3fe53e9e087fd703eff4cdaaba4d7103 (patch)
treeeccde3e5c1f9c0d23991261daebf84bc66e0c508 /Master
parent7a026fedd1047f0149c2fe069a7dba7358272320 (diff)
new tikz package bloques (15may11)
git-svn-id: svn://tug.org/texlive/trunk@22490 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/bloques/README13
-rw-r--r--Master/texmf-dist/doc/latex/bloques/example.pdfbin0 -> 130623 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bloques/example.tex305
-rw-r--r--Master/texmf-dist/tex/latex/bloques/bloques.sty202
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/bloques.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/collection-pictures.tlpsrc1
8 files changed, 522 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/bloques/README b/Master/texmf-dist/doc/latex/bloques/README
new file mode 100644
index 00000000000..050c1bc2a2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bloques/README
@@ -0,0 +1,13 @@
+% bloques.sty
+% package based on tikz for control diagrams in power electronics.
+% version 1.0
+% author: Alejandro Garces
+% alejandrogarces@gmail.com
+% License: LPPL
+% 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) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/bloques/example.pdf b/Master/texmf-dist/doc/latex/bloques/example.pdf
new file mode 100644
index 00000000000..4d8d5560454
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bloques/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bloques/example.tex b/Master/texmf-dist/doc/latex/bloques/example.tex
new file mode 100644
index 00000000000..54497472d36
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bloques/example.tex
@@ -0,0 +1,305 @@
+\documentclass[a4paper,onecolumn]{IEEETran}
+\usepackage{bloques}
+\usepackage{verbatim}
+\oddsidemargin=-1.5cm
+
+
+\title{The Bloques Package}
+\author{Alejandro Garces Ruiz \\ alejandrogarces@gmail.com}
+
+\begin{document}
+
+\maketitle
+
+\section{Functions}
+
+
+The \textbf{bloques} package is a very simple set of commands based on \textbf{tikz} to generate control blocks. The only packages required in the definition are:
+
+\begin{verbatim}
+ \usepackage{tikz}
+ \usepackage{bloques}
+\end{verbatim}
+
+The package is very efficient for sequential blocks as follow:
+
+\begin{verbatim}
+\bStart{TEXT}
+\bPlusDown{TEXT}
+\bPlusUp{TEXT}
+\bMinusDown{TEXT}
+\bMinusUp{TEXT}
+\bEnd{TEXT}
+\bGain{TEXT}
+
+\bGainPlus{TEXT1}{TEXT2}
+\bGainMinus{TEXT1}{TEXT2}
+
+
+\end{verbatim}
+
+For Feedback controls, it is required to mark the nodes with the following functions:
+
+\begin{verbatim}
+
+\bMinusF{NODENAME}
+\bPlusF{NODENAME}
+\bFeedBack{TEXT}{NODENAME}
+\bCrossGain{TEXT}{NODENAME1}{NODENAME2}
+\bNewStart{TEXT}{POSITION}
+\bMarkNode{NODENAME}
+\bMarkNodeUp{NODENAME}
+\bMarkNodeDown{NODENAME}
+\end{verbatim}
+
+
+To change colors and distances, the following functions are available
+
+\begin{verbatim}
+ \bShadow{NUMBER} % default = 0
+ \bColorB{COLOR} % default = white
+ \bColorT{COLOR} % default = black
+ \ydistance{NUMBER} % default = 1.2 cm
+\end{verbatim}
+
+\newpage
+
+\section{examples}
+
+\begin{figure}[h!]
+\begin{tikzpicture}
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+ \begin{figure}
+ \begin{tikzpicture}
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \end{tikzpicture}
+ \end{figure}
+ \end{verbatim}
+ };
+
+\end{tikzpicture}
+\caption{Simple Control diagram }
+\end{figure}
+
+
+
+\begin{figure}[h!]
+\begin{tikzpicture}
+ \bShadow
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+ \begin{figure}
+ \begin{tikzpicture}
+ \bShadow
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \end{tikzpicture}
+ \end{figure}
+ \end{verbatim}
+ };
+
+\end{tikzpicture}
+\caption{Control diagram with shadow}
+\end{figure}
+
+
+
+\begin{figure}[h!]
+\begin{tikzpicture}[thick]
+ \draw[fill=blue!20, draw=white] (-0.5,-3) rectangle (8,2);
+ \draw[fill=green!20, dashed,thick] (4,-2) rectangle (7,0.5);
+ \bShadow
+ \bColorB{blue!80!green!50}
+ \bColorT{yellow}
+ \bColorL{white}
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bColorB{blue!30!green!80}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+ \begin{figure}
+ \begin{tikzpicture}[thick]
+ \draw[fill=blue!20, draw=white]
+ (-0.5,-3) rectangle (8,2);
+ \draw[fill=green!20, dashed]
+ (4,-2) rectangle (7,0.5);
+
+ \bShadow
+ \bColorB{blue!50!green!45}
+ \bColorT{yellow}
+ \bColorL{white}
+ \bStart{$X_{ref}$}
+ \bMinusDown{$X$}
+ \bGain{$k_{p}$}
+ \bColorB{blue!30!green!80}
+ \bPlusUp{$Y$}
+ \bGainPlus{$U$}{$\omega L$}
+ \bEnd{$V_{x}$}
+ \end{tikzpicture}
+ \end{figure}
+ \end{verbatim}
+ };
+
+\end{tikzpicture}
+\caption{Control diagram with shadow and different colors}
+\end{figure}
+
+
+
+
+\begin{figure}[h!]
+ \begin{tikzpicture}
+ \bColorB{blue!70!green!20}
+ \bStart{$X_{r}$}
+ \bMinusF{NODEX}
+ \bGain{$k_{p}+\frac{k_{i}}{S}$}
+ \bFeedBack{$k_{x}$}{NODEX}
+ \bEnd{$X$}
+
+ \node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+\begin{figure}
+ \begin{tikzpicture}
+ \bColorB{blue!70!green!20}
+ \bStart{$X_{r}$}
+ \bMinusF{NODEX}
+ \bGain{$k_{p}+\frac{k_{i}}{S}$}
+ \bFeedBack{$k_{x}$}{NODEX}
+ \bEnd{$X$}
+ \end{tikzpicture}
+\end{figure}
+ \end{verbatim}
+ } ;
+
+ \end{tikzpicture}
+ \caption{Control diagram with feedback}
+\end{figure}
+
+
+
+
+\begin{figure}[h!]
+ \begin{tikzpicture}
+ \bColorB{blue!30!green!50}
+ \bColorT{white}
+ \bStart{$X_{r}$}
+ \bMinusF{NODEX}
+ \bGain{$k_{p}+\frac{k_{i}}{S}$}
+ \bGain{$K_{2}$}
+ \bPlusDown{$Y$}
+ \ydistance{2.5cm}
+ \bFeedBack{$k_{x}$}{NODEX}
+ \bEnd{$X$}
+
+\node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+
+\begin{figure}
+ \begin{tikzpicture}
+ \bColorB{blue!30!green!50}
+ \bColorT{white}
+ \bStart{$X_{r}$}
+ \bMinusF{NODEX}
+ \bGain{$k_{p}+\frac{k_{i}}{S}$}
+ \bGain{$K_{2}$}
+ \bPlusDown{$Y$}
+ \ydistance{2.5cm}
+ \bFeedBack{$k_{x}$}{NODEX}
+ \bEnd{$X$}
+ \end{tikzpicture}
+\end{figure}
+
+
+ \end{verbatim}
+ } ;
+
+
+ \end{tikzpicture}
+ \caption{Change the ydistance}
+\end{figure}
+
+
+\begin{figure}[h!]
+ \begin{tikzpicture}
+ \bStart{$I_{d(ref)}=0$}
+ \bMinusDown{$I_{d}$}
+ \bGain{PI1}
+ \bPlusF{NODET}
+ \bEnd{$V_{d}$}
+ \bNewStart{$\omega_{ref}$}{(-2,-4)}
+ \bMinusDown{$\omega_{s}$}
+ \bGain{PI2}
+ \bMinusUp{$I_{q}$}
+ \bMarkNodeUp{NODEX}
+ \bGain{PI3}
+ \bEnd{$V_{q}$}
+ \bCrossGain{$\omega L$} {NODEX} {NODET}
+
+
+ \node[right of = NODO1, text width=8.5cm, node distance = 6.0cm, drop shadow={opacity=1}, fill=blue!20, rounded corners] (C4)
+ {
+ \begin{verbatim}
+
+
+\begin{figure}
+ \begin{tikzpicture}
+ \bStart{$I_{d(ref)}=0$}
+ \bMinusDown{$I_{d}$}
+ \bGain{PI1}
+ \bPlusF{NODET}
+ \bEnd{$V_{d}$}
+ \bNewStart{$\omega_{ref}$}{(-2,-4)}
+ \bMinusDown{$\omega_{s}$}
+ \bGain{PI2}
+ \bMinusUp{$I_{q}$}
+ \bMarkNodeUp{NODEX}
+ \bGain{PI3}
+ \bEnd{$V_{q}$}
+ \bCrossGain{$\omega L$} {NODEX} {NODET}
+ \end{tikzpicture}
+\end{figure}
+
+ \end{verbatim}
+ };
+
+ \end{tikzpicture}
+ \caption{More compex controls}
+\end{figure}
+
+
+\end{document}
+
+
+
+
diff --git a/Master/texmf-dist/tex/latex/bloques/bloques.sty b/Master/texmf-dist/tex/latex/bloques/bloques.sty
new file mode 100644
index 00000000000..949deef40a7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bloques/bloques.sty
@@ -0,0 +1,202 @@
+% bloques.sty
+% package based on tikz for control diagrams in power electronics.
+% version 1.0
+% author: Alejandro Garces
+% alejandrogarces@gmail.com
+% License: LPPL
+% 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) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+
+
+\usepackage{tikz}
+\usepgflibrary{shapes.misc}
+\usetikzlibrary{arrows,decorations.pathmorphing,backgrounds,positioning,fit,shadows}
+
+\newcommand{\xdistancia}{1.5cm}
+\newcommand{\ydistancia}{1.2cm}
+\newcommand{\minaltura}{0.7cm}
+\newcommand{\tamano}{\footnotesize}
+\newcommand{\colorfondo}{white}
+\newcommand{\colortexto}{black}
+\newcommand{\colorlinea}{black}
+\newcommand{\sombra}{0}
+\newcommand{\ancholinea}{thick}
+
+\newcommand{\bShadow}{\renewcommand{\sombra}{1}}
+\newcommand{\bColorB}[1]{\renewcommand{\colorfondo}{#1}}
+\newcommand{\bColorT}[1]{\renewcommand{\colortexto}{#1}}
+\newcommand{\bColorL}[1]{\renewcommand{\colorlinea}{#1}}
+\newcommand{\ydistance}[1]{\renewcommand{\ydistancia}{#1}}
+
+
+
+\newcommand{\bStart}[1]{\node [] (NODO1) {\tamano{#1}};}
+
+\newcommand{\bPlusDown}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [draw=gray!50, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, thin] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \draw [-latex,\colorlinea] (NODO1) -- (SUMA);
+ \node [below of = SUMA, node distance = \ydistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex, \colorlinea] (VARIABLE) -- (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+}
+
+
+\newcommand{\bPlusUp}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [draw=gray!50, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, thin, draw=gray!50] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [above of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (SUMA);
+ \node [above of = SUMA, node distance = \ydistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex, \colorlinea] (VARIABLE) -- (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+}
+
+
+\newcommand{\bMinusDown}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, thin, draw=gray!50] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$-$}};
+ \draw [-latex,\colorlinea] (NODO1) -- (SUMA);
+ \node [below of = SUMA, node distance = \ydistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex,\colorlinea] (VARIABLE) -- (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+
+}
+
+
+\newcommand{\bMinusUp}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [thin, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, draw=gray!50] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [above of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$-$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (SUMA);
+ \node [above of = SUMA, node distance = \ydistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex, \colorlinea] (VARIABLE) -- (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+}
+
+\newcommand{\bEnd}[1]{
+ \node [right of = NODO1, node distance = 1.7cm] (F) {#1};
+ \draw [-latex,\colorlinea] (NODO1) -- (F);
+ \node at (F) [anchor = west] (NODO1) {};
+}
+
+
+\newcommand{\bGain}[1]{
+ \node [draw=\colorlinea, rectangle, right of = NODO1, node distance= \xdistancia, minimum height = \minaltura,
+ \ancholinea, fill=\colorfondo,drop shadow={opacity=\sombra}] (NODO2) { \color{\colortexto}\tamano{#1}};
+ \draw [-latex, \colorlinea] (NODO1)--(NODO2);
+ \node at (NODO2.east) [anchor = east] (NODO1) {};
+
+}
+
+
+\newcommand{\bGainPlus}[2]{
+
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [thin, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, draw=gray!50] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (SUMA);
+
+ \node [draw=\colorlinea, rectangle, below of = SUMA, node distance = \xdistancia,xshift=-0.3cm, minimum height = \minaltura,\ancholinea,
+ fill=\colorfondo,drop shadow={opacity=\sombra}, anchor = east] (NODOG) {\color{\colortexto}\tamano{#2}};
+ \node [left of = NODOG, node distance = \xdistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex, \colorlinea] (VARIABLE) -- (NODOG);
+ \draw [-latex, \colorlinea] (NODOG) -| (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+}
+
+\newcommand{\bGainMinus}[2]{
+
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (SUMA) {};
+ \node [thin, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, draw=gray!50] {};
+ \node [left of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = SUMA, node distance = 0.45em] () { \color{\colortexto}\tiny{$-$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (SUMA);
+
+ \node [draw=\colorlinea, rectangle, below of = SUMA, node distance = \xdistancia,xshift=-0.3cm, minimum height = \minaltura,\ancholinea,
+ fill=\colorfondo,drop shadow={opacity=\sombra}, anchor = east] (NODOG) {\color{\colortexto}\tamano{#2}};
+ \node [left of = NODOG, node distance = \xdistancia] (VARIABLE) {\tamano{#1}};
+ \draw [-latex, \colorlinea] (VARIABLE) -- (NODOG);
+ \draw [-latex, \colorlinea] (NODOG) -| (SUMA);
+ \node at (SUMA) [anchor = west] (NODO1) {};
+}
+
+
+\newcommand{\bMinusF}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (#1) {};
+ \node [draw, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, thin, draw=gray!50] {};
+ \node [left of = #1, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = #1, node distance = 0.45em] () { \color{\colortexto}\tiny{$-$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (#1);
+ \node at (#1) [anchor = west] (NODO1) {};
+
+}
+
+
+\newcommand{\bPlusF}[1]{
+ \node [draw=\colorlinea, circle,minimum size=1.5em, right of=NODO1, node distance= \xdistancia,\ancholinea, fill=\colorfondo,
+ drop shadow={opacity=\sombra}] (#1) {};
+ \node [thin, cross out, minimum size=1.0em, right of=NODO1, node distance= \xdistancia, draw=gray!50] {};
+ \node [left of = #1, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \node [below of = #1, node distance = 0.45em] () { \color{\colortexto}\tiny{$+$}};
+ \draw [-latex, \colorlinea] (NODO1) -- (#1);
+ \node at (#1) [anchor = west] (NODO1) {};
+
+}
+
+
+\newcommand{\bFeedBack}[2]{
+ \node [draw=\colorlinea, rectangle, below left of = NODO1, node distance = \ydistancia, minimum height = \minaltura,\ancholinea,
+ fill=\colorfondo,drop shadow={opacity=\sombra}, anchor = west] (NODOG) {\color{\colortexto}\tamano{#1}};
+ \draw [-latex, \colorlinea] (NODO1) -- +(0.5,0) |- (NODOG);
+ \draw [-latex, \colorlinea] (NODOG) -| (#2);
+}
+
+
+\newcommand{\bCrossGain}[3]{
+ \node [draw=\colorlinea, rectangle, above right of = #2, minimum height = \minaltura,\ancholinea,
+ fill=\colorfondo,drop shadow={opacity=\sombra}, anchor = west] (NODOG) {\color{\colortexto}\tamano{#1}};
+ \draw [-latex, \colorlinea] (#2) |- (NODOG);
+ \draw [-latex, \colorlinea] (NODOG) -| (#3);
+}
+
+
+\newcommand{\bNewStart}[2]{
+ \node at #2 (NODO1) {\tamano{#1}};
+}
+
+
+\newcommand{\bMarkNode}[1]{
+ \node at (NODO1) (#1) {};
+}
+
+
+\newcommand{\bMarkNodeUp}[1]{
+ \node[above of = NODO1, node distance = \ydistancia] (#1) {};
+}
+
+
+\newcommand{\bMarkNodeDown}[1]{
+ \node[below of = NODO1,node distance = \ydistancia] (#1) {};
+}
+
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index a77b10cf3b6..afcb52f26dc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -61,7 +61,7 @@ my @TLP_working = qw(
biblist bibtex bibtopic
bibtopicprefix bibexport bibunits
bidi bigfoot bigints binomexp biocon bizcard
- blacklettert1 blindtext blkarray block blockdraw_mp blowup
+ blacklettert1 blindtext blkarray block blockdraw_mp bloques blowup
bodegraph boisik bold-extra
boites boldtensors bondgraph bookest bookhands booklet
booktabs booktabs-de booktabs-fr boolexpr boondox bophook
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index dad6529bc8a..cdfdc760061 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -146,7 +146,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'bitfield', "die 'skipping, obsolete on CTAN'",
'blanks', "die 'skipping, unknown license (and c.1992)'",
'blockdraw_mp',"&MAKEflatten",
- 'bloques', "die 'skipping, noinfo license (though pd intended, sigh)'",
'blu', "die 'skipping, too old'",
'bnf-plain', "die 'skipping, unknown license (and c.1992)'",
'bookhands', "&MAKEwilson",
diff --git a/Master/tlpkg/tlpsrc/bloques.tlpsrc b/Master/tlpkg/tlpsrc/bloques.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/bloques.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index fd32fd44c70..701f4f83e81 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -4,6 +4,7 @@ depend adjustbox
depend asyfig
depend autoarea
depend bardiag
+depend bloques
depend bodegraph
depend bondgraph
depend cachepic