summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-07 00:38:17 +0000
committerKarl Berry <karl@freefriends.org>2010-09-07 00:38:17 +0000
commit50f3494b12ada52be9b302aa865453dcbbf5119c (patch)
tree3d1d31b4d3e4f92b3ac8a61e11730e789526ec3e /Master
parenta79aae44637de232d489b3396e917453d37746cd (diff)
knitting 2 (30aug10)
git-svn-id: svn://tug.org/texlive/trunk@19595 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitexamples.tex85
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitkey.tex112
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdfbin314878 -> 424098 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex944
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm259
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm259
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitgg.afm14
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm18
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitgp.afm10
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm149
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm149
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitnl.afm22
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm20
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm12
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm24
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_in.afm259
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_out.afm259
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitwg.afm14
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm18
-rw-r--r--Master/texmf-dist/fonts/afm/public/knitting/knitwp.afm10
-rw-r--r--Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map7
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf16
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knit_grid_cables.mf24
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knit_nogrid_cables.mf64
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf428
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf25
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf25
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitgg.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitgn.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitgp.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitn_sc_in.mf24
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitn_sc_out.mf24
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitnl.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitnn.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitnp.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitnr.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitw_sc_in.mf25
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitw_sc_out.mf25
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitwg.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitwn.mf3
-rw-r--r--Master/texmf-dist/fonts/source/public/knitting/knitwp.mf3
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfmbin0 -> 1224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfmbin0 -> 1224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfmbin2120 -> 2128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfmbin2120 -> 2128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfmbin2120 -> 2128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfmbin0 -> 728 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfmbin0 -> 724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfmbin996 -> 988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfmbin996 -> 988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfmbin732 -> 724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfmbin996 -> 988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_in.tfmbin0 -> 1220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_out.tfmbin0 -> 1220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfmbin2092 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfmbin2092 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfmbin2092 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfbbin0 -> 54832 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfbbin0 -> 55606 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfbbin42700 -> 42082 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfbbin39245 -> 40816 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfbbin20686 -> 20968 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfbbin0 -> 45909 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfbbin0 -> 46933 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfbbin38288 -> 39994 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfbbin38328 -> 40156 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfbbin14730 -> 14900 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfbbin38439 -> 40204 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_in.pfbbin0 -> 53895 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_out.pfbbin0 -> 54855 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfbbin40931 -> 38570 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfbbin39470 -> 41064 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfbbin19691 -> 19973 bytes
-rw-r--r--Master/texmf-dist/tex/latex/knitting/knitting.sty1054
-rw-r--r--Master/texmf-dist/tex/latex/knitting/uknit.fd16
-rw-r--r--Master/texmf-dist/tex/plain/knitting/knitting.tex1121
76 files changed, 4104 insertions, 1441 deletions
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
index 81c2d30fd2d..6b98fcfbae8 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
@@ -24,14 +24,17 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-% Date: 2010/01/17
-
+% Date: 2010/08/29
+%
+% Version: 2
-\documentclass{article}
+\documentclass[draft]{article}
\usepackage[chartsonly]{knitting}
-\textwidth = 3in
+\usepackage{calc}
+
+%\textwidth = 3in
\begin{document}
@@ -79,12 +82,10 @@
\ifchartsonly \else Even-number ribbed braid \fi
\knitnogrid
-\rnevenonly
\newdimen\knitlinewd
\setlength{\knitlinewd}{1.2pt}
% Zigzagging lines will look better if we make them a little wider
-
-\chart[right]{
+\chart[oddleft]{
=--==\!==----==\!==--=
\-{18}
=--==\!==CCkk==\!==--=
@@ -106,10 +107,13 @@
\knitnogrid
\definecolor{knitlinecolor}{rgb}{0,0,0.8}
+\definecolor{rncolor}{rgb}{0,0,0.8}
+\definecolor{rnarrowcolor}{rgb}{0,0,0.6}
-\chart[evenright]{
+\rnevenonly
+\stitchcountchart[right]{
===,,,,,,===--===,,,,,,===
-===,,,,,,===--==,,,A,,,===
+===,,,,,,===--==,,,\>3,,,===
===,,,,,,===--==,,---,,===
===,,,,,,===--==,,>-<,,===
===,,,,,,===--==,-----,===
@@ -117,16 +121,15 @@
===,,,,,,===--==-------===
===,,,,,,===--==--O-O--===
===,,,,,,===--==,-----,===
-===,,,A,,,==--==,-O-O-,===
-\overline{%
-===,,---,,==--==,,---,,===}
+\overline{===,,,\>3,,,==--==,-O-O-,===}
+===,,---,,==--==,,---,,===
===,,>-<,,==--==,,O-O,,===
===,-----,==--==-,,,,,,===
===,>---<,==--=pK,,,,,,===
===-------==--=-=,,,,,,===
===--O-O--==--pK=,,,,,,===
===,-----,==---==,,,,,,===
-===,-O-O-,==-kK=,,,A,,,===
+===,-O-O-,==-kK=,,,\>3,,,===
===,,---,,==--==,,---,,===
===,,O-O,,==--==,,>-<,,===
===,,,,,,-==--==,-----,===
@@ -134,9 +137,9 @@
===,,,,,,=-=--==-------===
===,,,,,,=Kp--==--O-O--===
===,,,,,,==---==,-----,===
-===,,,,,,==Kk-==,-O-O-,===
\overline{%
-===,,,,,,===--==,,---,,===}
+===,,,,,,==Kk-==,-O-O-,===}
+===,,,,,,===--==,,---,,===
===,,,,,,===--==,,O-O,,===
===,,,,,,===--==-,,,,,,===
===,,,,,,===--=pK,,,,,,===
@@ -146,19 +149,11 @@
===,,,,,,===-kK==,,,,,,===
===,,,,,,===--===,,,,,,===
}
+\rnnormal
-\ifchartsonly \else The letter Z\fi
-
-\chart{
-,=========,
-=;+++++-==,
-======pK==,
-=====pK===,
-====pK====,
-===pK=====,
-==pK======,
-==s+++++O==
-==,=====,==}
+\definecolor{knitlinecolor}{rgb}{0.7,0,0}
+\definecolor{rncolor}{rgb}{0.6,0,0}
+\definecolor{rnarrowcolor}{rgb}{0.45,0,0}
\ifchartsonly \else Print o' the Wave \fi
@@ -195,7 +190,6 @@
\definecolor{green}{rgb}{0,0.6,0.1}
\definecolor{lightgreen}{rgb}{0.5,1,0.5}
\definecolor{yellow}{rgb}{1,1,0.35}
-\definecolor{knitlinecolor}{rgb}{0.8,0,0}
\catcode `\^=\active
% Since we aren't using math, we turn ^ into an active character
@@ -230,4 +224,39 @@
-|--------------|
}}
+\renewcommand{\printrightrownumber}[1]{%
+ \knitleftarrowhead
+ \textnormal{\color{rncolor}%
+ #1 (\thestitchcountout\ sts)}}
+
+\newcommand\threepartrow[3]{%
+ % Count the stitches, counting the middle stitches 4 times
+ \mainpass{\countstitches{#1 #2#2#2#2 #3}}%
+ % Print the row
+ #1\|#2\|#3
+ % Print a bar if we have a stitch count mismatch
+ \mainpass{\stitchcountwarningbar}}
+
+\knitgrid
+\resetrnfalse
+\setcounter{rownumber}{12}
+\setcounter{rownumberskip}{2}
+
+% Setting stitchcountin to any number less than -99 suppresses the
+% warning bar on the first row.
+\setcounter{stitchcountin}{-100}
+
+\chart[right]{
+ ~~~~~~~~\hskip\knitlinewd %
+ \mainpass{\makebox[18\stitchwd][c]{\color{rncolor}\textnormal{%
+ Repeat 4 times}}} \nonumber ``
+ % The `` is necessary for proper vertical alignment
+ \threepartrow{-O------}{..-----OAO-----..-}{-----O-}
+ ~\threepartrow{-O-----}{..----O>-<O----..-}{----O-}
+ ~~\threepartrow{-O----}{..<--O>OAO<O-->..-}{---O-}
+ ~~~\threepartrow{-O---}{.<--O>O>-<O<O-->.-}{--O-}
+ ~~~~\threepartrow{-O--}{<--O>O>---<O<O-->-}{-O-}
+ ~~~~~\threepartrow{-O-}{..------\narrowincrease{7}------..-}{O-}
+ }
+
\end{document}
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
index 01da46a6aa3..046dbdd054e 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
@@ -25,16 +25,25 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-% Date: 2010/01/17
+% Date: 2010/08/29
+%
+% Version: 2
\documentclass{article}
\usepackage{knitting}
+\usepackage[colorlinks]{hyperref}
% Choose your chart symbol font
\knitnogrid
\knitwide
\knitgrid
+% \ifdesigner lets me easily hide all my comments to the designer and
+% just write a stitch key.
+\newif \ifdesigner
+\designertrue
+% \designerfalse
+
% The commands to draw chart rows
% (I'm just not happy with {tabular})
@@ -43,6 +52,7 @@
\newlength{\doublecolwidth}
\newcommand{\setcolwidths}[1]{
\setlength{\symbolcolwidth}{#1}
+ \addtolength{\symbolcolwidth}{1pt}
\setlength{\doublecolwidth}{\textwidth}
\addtolength{\doublecolwidth}{-4\tabcolsep}
\addtolength{\doublecolwidth}{-1.2pt} % Width of 3 rules
@@ -74,11 +84,12 @@
\raisebox{1pt}{\strut}#2\raisebox{-1pt}{\strut}\end{minipage}%
\hfill\vrule
\par\nointerlineskip}
-
+
\begin{document}
\begin{fullpages}
+\ifdesigner
Any knitting chart should have a key. This file provides a key of
suggested definitions for most of the symbols. If you find it
convenient, you have permission to simply copy and paste the relevant
@@ -92,6 +103,10 @@ exact definition should vary from pattern to pattern.
\textknit{H}
\textknit{v}
\textknit{V}
+\textknit{6}
+\textknit{7}
+\textknit{8}
+\textknit{9}
\textknit{\narrowincrease{3}}
\textknit{\pnarrowincrease{3}}
\textknit{\wideincrease{3}}
@@ -106,11 +121,35 @@ exact definition should vary from pattern to pattern.
\textknit{\knitbox{etc.}{2}}
\end{quote}
+\definecolor{darkgrey}{gray}{0.3}
+
+The Craft Yarn Council of America suggests a \href{http://www.craftyarncouncil.com/chart_knit.html}{slightly different set of symbols}. In particular, they want to use
+\begin{itemize}
+\item \textknit{)} and \textknit{(} for single decreases (where I have \textknit{>} and \textknit{<})
+\item \textknit{v} and \textknit{6} for slipped stitches (where I have \textknit{s} and \textknit{\purlbackground{s}})
+\item Solid black dots \textknit{\knitbox{{$\bullet$}}{1}} for bobbles
+\item Solid dark squares \textknit{{\purlpass{\color{darkgrey}}\mainpass[=]{``}}} for no-stitch boxes
+\item
+\textknit{\rlap{\raisebox{-1pt}{\hskip1.3pt \footnotesize\textnormal{\textsf{3}}}}%
+\mainpass[(]{\hskip1pt\rule[-\stitchdp]{0pt}{\stitchht}\raisebox{1pt}[0pt][0pt]{(}\hskip-1pt}}
+and \textknit{\mainpass[)]{\hskip-1pt\rule[-\stitchdp]{0pt}{\stitchht}\raisebox{1pt}[0pt][0pt]{)}\hskip1pt}%
+\llap{\raisebox{-1pt}{\footnotesize\textnormal{\textsf{3}}\hskip1.3pt}}}
+for double decreases (and
+\textknit{\rlap{\raisebox{-1pt}{\hskip1.3pt \footnotesize\textnormal{\textsf{4}}}}%
+\mainpass[(]{\hskip1pt\rule[-\stitchdp]{0pt}{\stitchht}\raisebox{1pt}[0pt][0pt]{(}\hskip-1pt}}
+and \textknit{\mainpass[)]{\hskip-1pt\rule[-\stitchdp]{0pt}{\stitchht}\raisebox{1pt}[0pt][0pt]{)}\hskip1pt}%
+\llap{\raisebox{-1pt}{\footnotesize\textnormal{\textsf{4}}\hskip1.3pt}}}
+for triple decreases)
+\item \textknit{7}, \textknit{8}, and \textknit{9} instead of \textknit{y}, \textknit{u}, and \textknit{z}.
+\end{itemize}
+\textknit{{\purlpass{\color{darkgrey}}\mainpass[=]{``}}}
+is harder to get out of \TeX\ than the grid symbol {\knitgrid\textknit{,}} and is less clear than the nongrid symbol {\knitnogrid\textknit{,}}. The rest of my symbols are different because I think they are clearer, prettier, or allow for more different stitches to be indicated. (\textknit{v} looks like an increase to me, and the CYCA doesn't distinguish between \textknit{l} and \textknit{L}). \fi
+
\section{General symbols}
+\ifdesigner
If you do not use twisted make-1 increases (or if you use \textknit{m}
for them) you may wish to substitute \textknit{t} for \textknit{b}.
-
If you do use \textknit{t} or \textknit{x}, and you don't care about the
distinction between \textknit{b} and \textknit{q}, you may wish to
substitute \textknit{\knitbox{B}{1}} for \textknit{b}.
@@ -119,23 +158,32 @@ substitute \textknit{\knitbox{B}{1}} for \textknit{b}.
\medskip
+\fi
+
\settowidth{\dimen0}{\textknit{s} or \textknit{S}}
\setcolwidths{\dimen0} % The argument is the width of the widest thing in the left column
\keyrow{Symbol}{Right side instructions}{Wrong side instructions}
\keyrow{\textknit{-}}{Knit}{Purl}
\keyrow{\textknit{=}}{Purl}{Knit}
+\dblkeyrow{\textknit{\knitbox{12}{3}}}{Knit (RS) or purl (WS) the number of stitches listed in the center of the box.}
+\dblkeyrow{\textknit{\purlbox{12}{3}}}{Purl (RS) or knit (WS) the number of stitches listed in the center of the box.}
\keyrow{\textknit{)} or \textknit{(}}{Knit}{Purl}
\keyrow{\textknit{b}}{Knit through back loop}{Purl through back loop}
\keyrow{\textknit{B}}{Purl through back loop}{Knit through back loop}
\dblkeyrow{\textknit{q}}{Slip 1 as if to knit, return to right needle, and knit (RS) or purl (WS) through front loop. This twists the stitch, but in the opposite direction from \textknit{b}.}
\dblkeyrow{\textknit{Q}}{As for \textknit{q}, but this time purl on WS and knit on RS.}
\keyrow{\textknit{\bobble{3}}}
-{(Knit 1, yo, knit 1) in next stitch, turn, purl 3, turn, slip 1 knitwise, knit 1, pass slipped stitch over}
-{(Purl 1, yo, purl 1) in next stitch, turn, knit 3, turn, slip 1 purlwise, p2tog or ssp tbl, pass slipped stitch over}
+{(Knit 1, yarn over, knit 1) in next stitch, turn, purl 3, turn, slip 1 knitwise, knit 2 together, pass slipped stitch over}
+{(Purl 1, yarn over, purl 1) in next stitch, turn, knit 3, turn, purl 3 together or slip 1 purlwise, ssp tbl, pass slipped stitch over}
+
+\ifdesigner\hrule\medskip
+If you use bobbles, be sure to define ssp tbl somewhere.
+\clearpage\fi
+
\keyrow{\textknit{\bobble{5}}}
-{(Knit 1, yo, knit 1, yo, knit 1) in next stitch, turn, purl 5, turn, knit 5, turn, purl 5, turn, quadruple decrease}
-{(Purl 1, yo, purl 1, yo, purl 1) in next stitch, turn, knit 5, turn, purl 5, turn, knit 5, turn, quadruple decrease}
+{(Knit 1, yarn over, knit 1, yarn over, knit 1) in next stitch. Turn, purl 5, turn, knit 5, turn, purl 5, turn. Quadruple decrease: slip 2 as if to knit, knit 3 together, pass slipped sts over}
+{(Purl 1, yarn over, purl 1, yarn over, purl 1) in next stitch. Turn, knit 5, turn, purl 5, turn, knit 5, turn. Quadruple decrease: purl 5 together or slip 2 as if to purl, sssp tbl, pass 2 slipped sts over}
\dblkeyrow{\textknit{s} or \textknit{S}}{Slip one as if to purl with yarn held to the wrong side.}
\dblkeyrow{\textknit{\purlbackground{s}} or \textknit{\purlbackground{S}}}
{Slip one as if to purl with yarn held to the right side.}
@@ -144,7 +192,7 @@ substitute \textknit{\knitbox{B}{1}} for \textknit{b}.
\dblkeyrow{\textknit{"} or \textknit{""}}{Wrap and turn: Move yarn between needles to right side of work, slip 1 stitch as if to purl, move yarn to wrong side of work (wrapping it around the slipped stitch), slip stitch back to the left needle, and turn work.}
\ifgrid\dblkeyrow{\textknit{,} or \textknit{.}}{No stitch; ignore these squares} \fi
\dblkeyrow{\textknit{@}}{Beaded stitch}
-\dblkeyrow{\textknit{h}}{Drop next stitch from needle}
+\dblkeyrow{\textknit{h}}{Drop stitch from needle}
\keyrow{\textknit{\gridpass[``*``]{\knitbox{}{3}}}}{Purl 3 together but do not remove from left needle. Knit same 3 stitches together. Then purl same 3 stitches together and remove from left needle.}{Knit 3 together but do not remove from left needle. Purl same 3 stitches together. Then knit same 3 stitches together and remove from left needle.}
\hrule
@@ -167,6 +215,8 @@ substitute \textknit{\knitbox{B}{1}} for \textknit{b}.
\medskip
+\ifdesigner
+
A horizontal cable should (usually) be preceded by a yarn over and followed by a decrease. You may wish to write the yarn over or decrease as part of the instructions for a horizontal cable:
\medskip
@@ -175,18 +225,26 @@ A horizontal cable should (usually) be preceded by a yarn over and followed by a
{\knitgrid
\keyrow{\textknit{\char21}}
-{Yarn over. Slip 1 as to knit. Insert left needle through last 2 stitches on right needle from right to left and remove right needle. Slip 1 as if to purl.}
-{Yarn over. Slip 1 from right needle to left needle. Slip 2 as if to knit 2 together. Slip 1 from right needle back to left needle.}
+{Yarn over. Slip 1 as to knit. Insert left needle through last 2 stitches on right needle from right to left and remove right needle. Slip 1 as if to purl.}{Purl 2 together}
\keyrow{\textknit{\char20}}
{Knit 1. Slip 1 as to knit. Insert left needle through last 2 stitches on right needle from right to left and remove right needle. Slip 1 as if to purl.}
{Purl 1. Slip 1 from right needle to left needle. Slip 2 as if to knit 2 together. Slip 1 from right needle back to left needle.}
-\keyrow{\textknit{+}}{SSK or SKP}{Purl 2 together}}
+\keyrow{\textknit{+}}{SSK or SKP}{Yarn over. Slip 1 from right needle to left needle. Slip 2 as if to knit 2 together. Slip 1 from right needle back to left needle.}
+}
\hrule
+\fi
+
\clearpage
\section{Increases}
+\ifdesigner Some charts work better if a double increase \textknit{W} takes up three squares instead of one. In the grid font, the best-looking way to do this is to use \verb|\mainpass|: {\verb|\mainpass[\purlbox{}{3}]{``W``}| \knitgrid \textknit{\mainpass[\purlbox{}{3}]{``W``}}}.
+
+\medskip
+
+\fi
+
\setcolwidths{\stitchwd}
\dblkeyrow{\textknit{O}}{Yarn over}
\dblkeyrow{\textknit{U}}{Cast on}
@@ -216,6 +274,7 @@ A horizontal cable should (usually) be preceded by a yarn over and followed by a
\section{Decreases}
+\ifdesigner
Purl decreases produce strong diagonal lines on the wrong side. You
may wish to use \textknit{;} for p2tog and \textknit{:} for SSP tbl if
you wish to clearly indicate which way these diagonal lines slant.
@@ -225,6 +284,7 @@ You may also think that \textknit{4} and \textknit{5} look better in your patter
\nopagebreak
\medskip
+\fi
\setcolwidths{\stitchwd}
\keyrow{\textknit{>}}{Knit 2 together}{Purl 2 together or slip 1, purl 1, pass slipped stitch over}
@@ -258,11 +318,15 @@ first stitch, return first stitch on right needle to left needle.* Repeat from *
\section{Cable Symbols}
+\ifdesigner
+
This is a comprehensive list of the cable symbols available in the grid
-fonts; more non-grid cable symbols are possible.
+fonts; more non-grid cable symbols are possible. (A few examples are at the end of this document.
\medskip
+\fi
+
% There are three different symbols for most of the cable crossings,
% and two different symbols for most of the twist crossings.
@@ -285,8 +349,8 @@ fonts; more non-grid cable symbols are possible.
\setcolwidths{8.5\stitchwd}
\dblkeyrow{\cableset{kK}{kN}{kD}}{Slip 2 as if to knit 2 together. Return to left needle, then knit 2 (RS) or purl 2 (WS), (\textbf{not} together!) through back loop.}
\dblkeyrow{\cableset{Kk}{Kn}{Kd}}{Slip 2 as if to SSK. Insert left needle through both slipped stitches from right to left, as if to k2tog. Remove right needle, then knit 2 (RS) or purl 2 (WS) through front loop.}
-\dblkeyrow{\twistset{pK}{pN}}{Slip 2 as if to knit 2 together. Return to left needle, then knit 1 through back loop, purl 1 through back loop.}
-\dblkeyrow{\twistset{Kp}{Ko}}{Slip 2 as if to SSK. Insert left needle through both slipped stitches from right to left, as if to k2tog. Remove right needle, then purl 1, knit 1.}
+\dblkeyrow{\twistset{pK}{pN}}{Slip 2 as if to knit 2 together. Return to left needle, then knit 1 through back loop, purl 1 through back loop. Or: Slip 1 to cable neeble and hold in back; knit 1; purl 1 from cable needle.}
+\dblkeyrow{\twistset{Kp}{Ko}}{Slip 2 as if to SSK. Insert left needle through both slipped stitches from right to left, as if to k2tog. Remove right needle, then purl 1, knit 1. Or: Slip 1 to cable neeble and hold in front; knit 1; purl 1 from cable needle.}
\dblkeyrow{\textknit{pP}}{Slip 2 as if to knit 2 together. Return to left needle, then purl 2 (RS) or knit 2 (WS) through back loop.}
\dblkeyrow{\textknit{Pp}}{Slip 2 as if to SSK. Insert left needle through both slipped stitches from right to left, as if to k2tog. Remove right needle, then purl 2 (RS) or knit 2 (WS) through front loop.}
%
@@ -330,6 +394,7 @@ fonts; more non-grid cable symbols are possible.
\keyrow{\twistset{KKKpp}{KKKpo}}{{Slip 3 to cable needle and hold in front; purl 2; knit 3 from cable needle}}{{Slip 2 to cable needle and hold in front; purl 3; knit 2 from cable needle}}
\keyrow{\textknit{ppPPP}}{{Slip 2 to cable needle and hold in back; purl 3; purl 2 from cable needle}}{{Slip 3 to cable needle and hold in back; knit 2; knit 3 from cable needle}}
\keyrow{\textknit{PPPpp}}{{Slip 3 to cable needle and hold in front; purl 2; knit 3 from cable needle}}{{Slip 2 to cable needle and hold in front; knit 3; knit 2 from cable needle}}
+%
\hrule
\clearpage
@@ -349,12 +414,14 @@ fonts; more non-grid cable symbols are possible.
\keyrow{\textknit{pppPP}}{{Slip 3 to cable needle and hold in back; purl 2; purl 3 from cable needle}}{{Slip 2 to cable needle and hold in back; knit 3; knit 2 from cable needle}}
\keyrow{\textknit{PPppp}}{{Slip 2 to cable needle and hold in front; purl 3; knit 2 from cable needle}}{{Slip 3 to cable needle and hold in front; knit 2; knit 3 from cable needle}}
%
+\ifdim \stitchwd > \stitchht \else
\keyrow{\cableset{kkkKKK}{kkkKKN}{kkkKKD}}{{Slip 3 to cable needle and hold in back; knit 3; knit 3 from cable needle}}{{Slip 3 to cable needle and hold in back; purl 3; purl 3 from cable needle}}
\keyrow{\cableset{KKKkkk}{KKKkkn}{KKKkkd}}{{Slip 3 to cable needle and hold in front; knit 3; knit 3 from cable needle}}{{Slip 3 to cable needle and hold in front; purl 3; purl 3 from cable needle}}
\dblkeyrow{\twistset{pppKKK}{pppKKN}}{Slip 3 to cable needle and hold in back; knit 3; purl 3 from cable needle}
\dblkeyrow{\twistset{KKKppp}{KKKppo}}{Slip 3 to cable needle and hold in front; purl 3; knit 3 from cable needle}
\keyrow{\textknit{pppPPP}}{{Slip 3 to cable needle and hold in back; purl 3; purl 3 from cable needle}}{{Slip 3 to cable needle and hold in back; knit 3; knit 3 from cable needle}}
\keyrow{\textknit{PPPppp}}{{Slip 3 to cable needle and hold in front; purl 3; purl 3 from cable needle}}{{Slip 3 to cable needle and hold in front; knit 3; knit 3 from cable needle}}
+\fi
\hrule
\clearpage
@@ -383,6 +450,7 @@ Knit 2, purl 1 from the second (back) CN, then knit 2 from the first (front) CN.
\emph{Better-looking method}:
Slip 3 to CN and hold to front. Purl 2. Slip leftmost stitch from CN back to left needle and move CN to the back.
Knit 1 from left needle, then purl 2 from CN.}
+\ifdim \stitchwd > \stitchht \else
\keyrow{\cablepair{KKppkk}{KKppkd}}
{\emph{Easy method}: Slip 2 to cable needle and hold in front, knit 2, purl 2, and then knit 2 from cable needle. \par
\emph{Better-looking method}:
@@ -393,6 +461,7 @@ Knit 2, purl 2 from the second (back) CN, then knit 2 from the first (front) CN.
\emph{Better-looking method}:
Slip 4 to CN and hold to front. Purl 2. Slip leftmost 2 stitches from CN back to left needle and move CN to the back.
Knit 2 from left needle, then purl 2 from CN.}
+\fi
\keyrow{\cablepair{kpK}{kpD}}
{\emph{Easy method}: Slip 2 to CN and hold in back, knit 1, then purl 1, knit 1 from CN. \par
\emph{Better-looking method}: Slip 2 to CN and hold in back, knit 1.
@@ -412,7 +481,8 @@ Purl 1 from left needle, then knit 2 from CN.}
{\emph{Easy method}: Slip 2 to CN and hold in back, purl 2, knit 1, then purl 2 from CN. \par
\emph{Better-looking method}: Slip 2 to CN and hold in back. Slip 1 to a second CN and hold in front.
Purl 2 from left needle, knit 1 from second (front) CN, then purl 2 from first (back) CN.}
-\keyrow{\cablepair{kkpp}{kkppKD}}
+\ifdim \stitchwd > \stitchht \else
+\keyrow{\cablepair{kkppKK}{kkppKD}}
{\emph{Easy method}: Slip 4 to CN and hold in back, knit 2, then purl 2, knit 2 from CN. \par
\emph{Better-looking method}:
Slip 4 to CN and hold in back, knit 2.
@@ -421,6 +491,18 @@ Purl 2 from left needle, then knit 2 from CN.}
{\emph{Easy method}: Slip 2 to CN and hold in back, purl 2, knit 2, then purl 2 from CN. \par
\emph{Better-looking method}: Slip 2 to CN and hold in back. Slip 2 to a second CN and hold in front.
Purl 2 from left needle, knit 2 from second (front) CN, then purl 2 from first (back) CN.}
+\fi
+\hrule
+
+\clearpage
+
+\knitnogrid
+
+\keyrow{\textknit{peKK}}{{Slip 1 to cable needle and hold in back; knit 2; make 1 purlwise (by picking up any strand of yarn which is convenient); purl 1 from cable needle}}{{Slip 2 to cable needle and hold in back; knit 1; make 1 knitwise; purl 2 from cable needle}}
+
+\keyrow{\textknit{pkKK}}{{Slip 2 to cable needle and hold in back; knit 2; knit 1 from cable needle, purl 1 from cable needle}}{{Slip 2 to cable needle and hold in back; knit 1; purl 1; purl 2 from cable needle}}
+\keyrow{\textknit{kpKK}}{{Slip 2 to cable needle and hold in back; knit 2; purl 1 from cable needle, knit 1 from cable needle}}{{Slip 2 to cable needle and hold in back; purl 1; knit 1; purl 2 from cable needle}}
+
\hrule
\end{fullpages}
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
index 8c593980bc3..f8d154687dd 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
index e5095ae5652..bf6d09ab5bc 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
@@ -20,9 +20,13 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and later in this file.
%
-% Date: 2010/01/17
+% Date: 2010/08/29
+%
+% Version: 2
-\documentclass{amsart}
+\documentclass[draft]{amsart}
+% Do not remove the [draft] option; we need it to explain something
+% in Section 5.
\usepackage{knitting}
@@ -34,12 +38,15 @@
\usepackage{color,verbatim}
\hyphenation{auto-number-chart}
-\usepackage[draft=false]{hyperref}
+\usepackage[draft=false,pdfborder={0 0 0}]{hyperref}
\title{The \textsf{knitting} package}
\author{Ariel Barton}
+\renewcommand\sectionautorefname{Section}
+\renewcommand\subsectionautorefname{Section}
+
\begin{document}
\maketitle
@@ -85,7 +92,7 @@ later sections of this document.
\section{License}
This work (the \textsf{knitting} package) consists of all files listed
-in Section~\ref{se:manifest}. It is copyright Ariel Barton, 2010.
+in \autoref{se:manifest}. It is copyright Ariel Barton, 2010.
This work may be distributed and/or modified under the
conditions of the \LaTeX\ Project Public License, either
@@ -103,7 +110,7 @@ This work has the LPPL maintenance status ``author-maintained''.
The \LaTeX\ project license above gives the conditions under which you
may redistribute or modify the fonts and files listed in
-Section~\ref{se:manifest}. This license (loosely speaking) allows you to
+\autoref{se:manifest}. This license (loosely speaking) allows you to
pass around copies of the package provided you redistribute it in its
entirety. In addition, any part, no matter how large, of the files
\texttt{knitkey.tex} and \texttt{knitexamples.tex}, \emph{and these two
@@ -188,10 +195,11 @@ or the lines
\verb|\pdfmapline{+knitgg\space <knitgg.pfb}|\\
\verb|\pdfmapline{+knitwg\space <knitwg.pfb}|
\end{quote}
-These map lines can go in \texttt{t1knit.fd},
+These map lines can go in \texttt{uknit.fd},
\texttt{knitting.sty}, or the file that uses the package.
-%You may need to downoad the file \texttt{T1-WGL4.enc}. I got this file from
+%You may need to downoad the file \texttt{T1-WGL4.enc}. I got this file
+% from
%\begin{quote}\raggedright
%\href{http://ctan.binkerton.com/info/german/MiKTeX-WinEdt-TrueType-Anleitung/T1-WGL4.enc}
%{\texttt{http://ctan.binkerton.com/info/german/MiKTeX-WinEdt-\allowbreak TrueType-Anleitung\slash T1-WGL4.enc}}
@@ -217,6 +225,8 @@ With MiK\TeX, I need to say
\texttt{initexmf -{}-edit-config-file updmap}
and then add the line \texttt{Map knitfont.map} to the file which opens, then run \texttt{updmap} from the command line.
+Something similar should work with most distributions; it is always wise to check and see what your distribution's documentation says about \texttt{updmap} before using it.
+
\section{Using the package}
In your document, type \verb|\usepackage{knitting}| (\LaTeX) or \verb|\input knitting| (plain \TeX). This will define the following macros:
@@ -229,12 +239,14 @@ In your document, type \verb|\usepackage{knitting}| (\LaTeX) or \verb|\input kni
\end{itemize}
-Inside a chart, you mostly just type letters and punctuation, and \textsf{knitting} converts them to appropriate knitting symbols. See Section~\ref{se:normal} for a translation key.
+Inside a chart, you mostly just type letters and punctuation, and \textsf{knitting} converts them to appropriate knitting symbols. See \autoref{se:normal} for a translation key.
However, there are commands that change overall appearance of the charts, or produce fancier symbols. Many of these commands (indicated with $\star$s and not bullets) only work inside of a knitting chart, to avoid conflicts: \verb|\overline|, for example, already has a meaning $\overline{xy}$ in math mode.
These redefined commands do \emph{not} work in concert with \verb|\textknit|.
+\subsection{Commands affecting overall appearance}
+
\begin{itemize}
\item \verb|\knitgrid|, \verb|\knitnogrid|, \verb|\knitwide|. These macros let you switch which font you're using: the normal grid font, the normal nogrid font, or the grid font with rectangular (wide) grid cells. These commands should be used outside the chart they are to affect.
@@ -243,9 +255,9 @@ These redefined commands do \emph{not} work in concert with \verb|\textknit|.
In plain \TeX, use the command \verb|\changeknitsize|, which takes one argument (the desired size). After \verb|\changeknitsize{10pt}| (the default size), five lines of a knitting chart will take up as much vertical space as five lines of 10-point text. This means that chart cells are 12 (not 10) points tall.
-\item The package option \verb|[chartsonly]| (\LaTeX) or the command \verb|\chartsonly| (plain \TeX) causes charts to be typeset in small PDF files which can be easily included in other documents, or converted to image files for use on a webpage.
+\item The package option \verb|chartsonly| (\LaTeX) or the command \verb|\chartsonly| (plain \TeX) causes charts to be typeset in small PDF files which can be easily included in other documents, or converted to image files for use on a webpage.
-If you would also like to bundle your chart key into a little PDF, you can do it with the environment \verb|{smallpage}| (\LaTeX) or \verb|\smallpage| and \verb|\endsmallpage| (plain \TeX).
+If you would also like to bundle your chart key into a little PDF, you can do it with the environment \verb|smallpage| (\LaTeX) or \verb|\smallpage| and \verb|\endsmallpage| (plain \TeX).
The charts will automatically be the right width. The pages you generate with \verb|smallpage| will be the natural width of their contents; this is usually \verb|\textwidth| (\LaTeX) or \verb|\hsize| (plain \TeX).
@@ -253,18 +265,90 @@ For some reason, \verb|smallpage| won't work if your small page only has one lin
This command doesn't work with dvi-\TeX; this is a pdf\/\TeX\ command only.
-\item \texttt{fullpages}. Changing page dimensions mid-document in \LaTeX\ is hard, but a knitting pattern writer might want several pages of instructions with classically large \LaTeX\ margins followed by several pages of charts with smaller margins. The environment \texttt{fullpages} does this. (Changing margins in plain \TeX\ is easy enough that \texttt{knitting.tex} has no special commands for it.)
+\item \texttt{fullpages}. Changing page dimensions mid-document in \LaTeX\ is hard, but a knitting pattern writer might want several pages of instructions with the usual large \LaTeX\ margins followed by several pages of charts with smaller margins. The environment \texttt{fullpages} does this. (Changing margins in plain \TeX\ is easy enough that \texttt{knitting.tex} has no special commands for it.)
+
+\end{itemize}
+
+\subsection{Counting stitches and rows}
+
+\begin{figure}
+\caption{Counting examples}\label{fig:countex}
+
+\advance\hsize 60pt
+\noindent \hskip -30pt
+\begin{minipage}[b]{3.2in}
+\obeylines
+\verb?\chart{?
+\verb? ======\rnright?
+\verb? \rnleft======\addtocounter{rownumber}{-1}?
+\verb? ======\rnright?
+\verb? \addtocounter{rownumber}{-5}}?
+\end{minipage}%
+\hfill
+\begin{minipage}[b]{1.33in}
+\knitnogrid
+\quad\verb|\knitnogrid|\\
+\chart{
+======\rnright
+\rnleft======\addtocounter{rownumber}{-1}
+======\rnright
+\addtocounter{rownumber}{-5}
+``\nonumber}
+\end{minipage}%
+\hfill
+\hfill
+\begin{minipage}[b]{1.33in}
+\knitgrid
+\qquad\verb|\knitgrid|\\
+\chart{
+ ======\rnright
+\rnleft======\addtocounter{rownumber}{-1}
+ ======\rnright
+\addtocounter{rownumber}{-5}
+``\nonumber}
+\end{minipage}
+\par\medskip\par
+\noindent \hskip -30pt
+\begin{minipage}[b]{3.2in}
+\obeylines
+\verb?\chart[right]{?
+\verb? ======?
+\verb? ====== \nonumber ?
+\verb? ======?
+\verb? ======?
+\verb? \numberrow{6}{2}{2}}?
+\end{minipage}%
+\hfill
+\begin{minipage}[b]{1.33in}
+\knitnogrid
+\hskip\stitchwd\chart[right]{
+======
+====== \nonumber
+======
+======
+\numberrow{6}{2}{2}
+}
+\end{minipage}%
+\hfill
+\hfill
+\begin{minipage}[b]{1.33in}
+\knitgrid
+\hskip\stitchwd\chart[right]{
+======
+====== \nonumber
+======
+======
+\numberrow{6}{2}{2}
+}
+\end{minipage}
+\end{figure}
-% Row number stuff
+\begin{itemize}
\item[$\star$] \verb|\rn| prints out the value of the counter
\verb|rownumber|, then decreases it by the value of the counter
-\texttt{rownumberskip}.\footnote{\texttt{\char`\\ rn} puts the number
-in a box of width \texttt{\char`\\ rownumberwd}. You can change the
-width by saying \texttt{\char`\\
-renewcommand\allowbreak\char`\{\char`\\
-rownumberwd\char`\}\char`\{1em\char`\}}.} For slightly better-looking
-results, use \verb|\rnleft| on the left edge and \verb|\rnright| on
+\texttt{rownumberskip}.
+For better results, use \verb|\rnleft| on the left edge and \verb|\rnright| on
the right edge.
If you want to skip a few row numbers, you can say
@@ -281,9 +365,9 @@ down from there.
This may be necessary if you have very long charts, since charts do not break across pages. (You may need to put a \verb|\par\nointerlineskip\par| between the pieces of charts.)
-\item \verb|\chart| has an optional first argument that places row numbers automatically. It should be one of the six words \texttt{left}, \texttt{right}, \texttt{oddleft}, \texttt{oddright}, \texttt{evenleft}, or \texttt{evenright}. This will automatically place numbers down the left edge, the right edge, or put the odd numbers on one side and the even numbers on the other side.
+\item \verb|\chart| has an optional first argument that places row numbers automatically. It should be one of the seven words \texttt{left}, \texttt{right}, \texttt{oddleft}, \texttt{oddright}, \texttt{evenleft}, \texttt{evenright}, or \texttt{both}. This will automatically place numbers down the left edge, the right edge, or put the odd numbers on one side and the even numbers on the other side.
-If you want to show only even or only odd numbers, you can do it with the commands \verb|\rnoddonly| or \verb|\rnevenonly|, and can restore normal behavior with the command \verb|\rnnormal|.
+If you want to show only even or only odd numbers, you can do it with the commands \verb|\rnoddonly| or \verb|\rnevenonly|, and can restore normal behavior with the command \verb|\rnnormal|. Alternatively, you can redefine \verb|\printrightrownumber| to only print if the counter \texttt{rownumber} is odd; effects like this are why the \texttt{[both]} option exists.
I suggest using \verb|\setcounter{rownumberskip}{2}| \verb|\chart[right]| for charts which show only right-side rows. For charts which show all rows, I suggest using \verb|[right]| for charts which are meant to be worked in the round, \verb|[oddright]| or \verb|[oddleft]| for charts which are meant to be worked flat (back and forth), and \verb|\rnevenonly| or \verb|\rnoddonly| with \verb|[right]| for charts which may be used either flat or in the round.
@@ -293,268 +377,273 @@ I suggest using \verb|\setcounter{rownumberskip}{2}| \verb|\chart[right]| for ch
\item[$\star$] If you don't like any of my automatic countdown options, you can use \verb|\rnbox{8}|, \verb|\rnboxleft{12}|, \verb|\rnboxright{3}| to do your own row-number boxes.
-% Colored stuff: purl background, knit lines
+\item Two commands exist to let you get \TeX\ to count stitches for you: \texttt{\char`\\stitch\-count\-chart} and \verb|\countstitches|. The command \texttt{\char`\\ adjust\-stitch\-count} is also useful here. See \autoref{se:counting} for more details.
-\item \verb|\purlbackground|. I use a gray background to indicate simple purls, and also the purl version of more complicated stitches: \textknit{<} for slip, slip, knit, and \textknit{;} for purl 2 together. You can get \textknit{3} instead of \textknit{A} by typing~\texttt{3} instead of~\texttt{A}, but I didn't have space to provide a purl version of every symbol; so the only way to get \textknit{\purlbackground{r}} is with \verb|\purlbackground{r}|.
+\end{itemize}
-\item[$\star$] \verb|\overline| and \verb|\underline| take one argument and typeset it, then put a colored bar over or under it. This is designed to provide a way to outline pattern repeats.
+You can adjust the appearance of the row numbers in a few ways. \texttt{\char`\\ rn} puts the number
+in a box of width \texttt{\char`\\ rownumberwd}; you can change the
+width by saying
+\texttt{\char`\\renewcommand\allowbreak
+ \char`\{\char`\\rownumberwd\char`\}\char`\{1em\char`\}}.
+You can change the appearance of the rownumbers by renewing the commands \texttt{\char`\\ printrownumber}, \texttt{\char`\\ printleftrownumber} and \texttt{\char`\\ printrightrownumber}; the default values (in \LaTeX) are
+\begin{quote}
+\verb|{{\color{rncolor}\textnormal{#1}}}|,\\
+\verb|{\knitleftarrowhead{\color{rncolor}\textnormal{#1}}}| and\\
+\verb|{{\color{rncolor}\textnormal{#1}}\knitrightarrowhead}|.
+\end{quote}
-\item[$\star$] The character \texttt{|} and the command \verb?\|? produce a vertical line suitable for outlining pattern repeats.
+\verb|\printrownumber| controls the appearance of both \verb|\rn| and \verb|\rnbox|. You can also change the appearance of \verb|\rn|, but not \verb|\rnbox|, by redefining \verb|\therownumber|. \verb|\roman{rownumber}| (\LaTeX) or \verb|\romannumeral| \verb|\rownumber| (plain \TeX), for example, will number rows with Roman numerals.
-\item[$\star$] Occasionally, you may need to outline a pattern repeat with lines that bend.
+\subsection{Repeat outlines}
-The command \verb?\!? produces a vertical line which will overlap the adjacent cells to avoid disrupting the alignment of columns. You can get short horizontal lines to go with \verb?\!? by using \verb|\_|; it should be positioned using tildes~\texttt{\char`\~}.
+\begin{figure}
+\caption{Outline examples}\label{fig:outlineex}
-If you want to use short horizontal lines with just \verb?|?, then you should use the command \verb|\=|, which takes an argument (the width of the overlining in stitches). You should have one instance of \verb|\=| per column of \verb?|?s. It is strongly recommended that you not mix short overlines with \verb?|?s in the grid font; it will look odd.
+\advance\hsize 60pt
+\noindent \hskip -30pt
+\begin{minipage}[b]{3in}
+\obeylines
+\verb?\definecolor{knitlinecolor}{rgb}{0,0,0.8}?
+\verb?\setcounter{rownumberskip}{2}?
+\verb?\chart{?
+\verb? ---|---|- ?
+\verb? -\overline{--|---|-}?
+\verb?~\={2}~\={2}~ \\ -|---|--- ?
+\verb?~\={2}~\={2}~ \\ ---|---|- ?
+\verb?\vspace{12pt}?
+\verb? ---\!---\!-?
+\verb? -\overline*{--\!---\!-}?
+\verb?~\_\_~\_\_~ \\ -\!---\!--- ?
+\verb?~\_\_~\_\_~ \\ ---\!---\!- ?
+\vspace{0pt}
+\verb?}?
+\end{minipage}%
+\hfill
+\begin{minipage}[b]{105pt}
+\knitnogrid
+\definecolor{knitlinecolor}{rgb}{0,0,0.8}
+\setcounter{rownumberskip}{2}
+\chart{
+ ---|---|-
+ -\overline{--|---|-}
+~\={2}~\={2}~ \\ -|---|---
+~\={2}~\={2}~ \\ ---|---|-
+\vspace{12pt} ---\!---\!-
+ -\overline*{--\!---\!-}
+~\_\_~\_\_~ \\ -\!---\!---
+~\_\_~\_\_~ \\ ---\!---\!-
+\nonumber``}
+\vspace{0pt}
+\end{minipage}%
+\hfill
+\begin{minipage}[b]{110pt}
+\knitgrid
+\definecolor{knitlinecolor}{rgb}{0,0,0.8}
+\setcounter{rownumberskip}{2}
+\chart{ ---|---|-
+ -\overline{--|---|-}
+~\={2}~\={2}~ \\ -|---|---
+~\={2}~\={2}~ \\ ---|---|-
+\vspace{12pt} ---\!---\!-
+ -\overline*{--\!---\!-}
+~\_\_~\_\_~ \\ -\!---\!---
+~\_\_~\_\_~ \\ ---\!---\!-
+\nonumber``}
+\vspace{0pt}
+\end{minipage}
+\end{figure}
-If you want your horizontal lines to reach the edge of the chart, you should use \verb|\-|, which like \verb|\=| takes an argument.
-\item \verb|\purlpass|, \verb|\gridpass|, \verb|\mainpass|. \verb|\chart| and \verb|\textknit| compile their argument twice: once in gray, using the purl background font, and then once in black using the foreground font. They then put them on top of each other. (The grid font does a third pass, in the middle, for just the grid; this lets us have grid lines that are gray rather than black.) \verb|\purlpass| takes one mandatory argument (something to do only during the purl pass) and one optional first argument (something to do during the other two passes.)
+\begin{itemize}
-% Colors to redefine
+\item[$\star$] \verb|\overline| and \verb|\underline| take one argument and typeset it, then put a colored bar over or under it. This is designed to provide a way to outline vertical pattern repeats.
-\item \verb|\color{purlgray}| (\LaTeX) or \verb|\purlgray| (plain \TeX) are used by \verb|\chart|, \verb|\textknit| and \verb|\purlbackground| to change the color to gray.
+These commands have starred and unstarred forms. \verb|\overline| spreads the chart rows to make room for the line; it should be used for lines that go all the way across the chart. \verb|\overline*| does not (the lines overlap the chart a bit) and so should be used for lines that go only partway across the chart.
-The \LaTeX\ package \texttt{knitting.sty} loads the \textsf{color} package and uses it to define the color. If you want a different purl color, you can use \textsf{color}'s \verb|\definecolor| syntax to change \verb|{purlgray}|. This is especially useful if you want to write two-color colorwork charts.
+\item[$\star$] The character \texttt{|} and the command \verb?\|? produce a vertical line suitable for outlining horizontal pattern repeats. The command \verb?\!? produces a slightly different vertical line: like \verb|\overline*|, it will overlap the adjacent cells to avoid disrupting the alignment of columns. Thus, \texttt{|} and \verb?\|? should be used with \verb|\overline|, while \verb|\!| should be used with \verb|\overline*|.
-\texttt{knitting.tex} defines \verb|\purlgray| itself, using syntax that works for pdf\/\TeX\ and \textsf{dvips}, but possibly not other drivers; if you insist on using plain \TeX\ and another driver, you are assumed to know enough to edit \texttt{knitting.tex} to compensate.
+\item[$\star$] You may prefer to specify horizontal lines on their own, without interleaving them with the chart symbols using \verb|\overline|. This may be done, but implementation is complicated.
-\item The colors \texttt{knitlinecolor} and \texttt{gridcolor} are defined and may be changed similarly. \texttt{knitlinecolor} controls the lines produced by \verb?\!?,~\verb?|?, \verb|\=|, \verb|\_|, \verb|\-|, \verb|\overline|, and \verb|\underline|; \texttt{gridcolor} controls the grid.
+You can get short horizontal lines to go with \verb?\!? by using \verb|\_|; it should be positioned using tildes~\texttt{\char`\~}.
-% Special stitches
+If you want to use short horizontal lines with \verb?\|? or~\verb?|?, then you should use the command \verb|\=|, which takes an argument (the width of the overlining in stitches). You should have one instance of \verb|\=| per column of \verb?|?s.
-\item \verb|\knit| and \verb|\purl|. These macros take one argument each and type out that many plain knit or plain purl symbols.
+If you use your horizontal lines on the edge of the chart, you should use \verb|\-|, which like \verb|\=| takes an argument.
-\item \verb|\Knit|, \verb|\Purl|, \verb|\knitbox|, \verb|\purlbox|. These macros were designed to produce appropriate shorthand for ``Knit or purl 12 stitches, regardless of how many are actually shown''. They also provide ways to get lots and lots of bizarre symbols if necessary. The first argument is text to appear inside the box; the second is the desired width of the box (in units of one stitch).
+\end{itemize}
-\item \verb|\wideincrease| and \verb|\widedecrease|. These macros take one argument each (the width, in stitches).
-\sloppy
+\subsection{Colors}
-\item \verb|\bobble|, \verb|\narrowincrease|, \verb|\narrowdecrease|, \verb|\pnarrow|\-\verb|increase|, and \verb|\pnarrow|\-\verb|decrease|. These macros take one argument each; that argument is typeset in small letters over some symbol I thought was appropriate~\textknit{\bobble{5}}.
+\begin{itemize}
-\item[$\star$] Inside a knitting chart (but not after \verb|\textknit|), the shorter commands \verb|\@|, \verb|\<|, \verb|\>|, \verb|\[|, and \verb|\]| are available.
+\item \verb|\color{purlgray}| (\LaTeX) or \verb|\purlgray| (plain \TeX) are used by \verb|\chart|, \verb|\textknit| and \verb|\purlbackground| to change the color to gray.
-\item \verb|\cableleft| and \verb|\cableright| will produce the most general possible cable symbols. While there are simple methods to get {\knitnogrid \textknit{kkKK}} (see Section~\ref{se:cables}), these let you get such obscure symbols as \textknit{\cableright{*}{-Q-}} or even (in concert with \verb|\bobble| and \verb|\knitbox|) \textknit{\cableleft{\narrowincrease{3}\knitbox{knit}{2}}{\purlbox{purl}{2}\bobble{3}}}.
+The \LaTeX\ package \texttt{knitting.sty} loads the \textsf{color} package and uses it to define the color. If you want a different purl color, you can use \textsf{color}'s \verb|\definecolor| syntax to change \verb|{purlgray}|. This is especially useful if you want to write two-color colorwork charts.
-% Dimensions, booleans, sans serif text
+\texttt{knitting.tex} defines \verb|\purlgray| itself, using syntax that works for pdf\/\TeX\ and \textsf{dvips}, but possibly not other drivers; if you insist on using plain \TeX\ and another driver, you are assumed to know enough to edit \texttt{knitting.tex} to compensate.
-\item \verb|\knitlinewd|, \verb|\gridwidth|, \verb|\stitchwd|, \verb|\stitchht|, and \verb|\stitchdp| store most of the dimensional information about the knitting fonts.\footnote{Grid cells are designed to be 12pt (or 16.3pt) by 12pt, and extend slightly below the baseline to work gracefully with numbers or other normal text. In \LaTeX, \texttt{\char`\\ stitchht} is 12pt. In plain \TeX, \texttt{\char`\\ stitchht} is 12pt$-$\texttt{\char`\\ stitchdp}. This is because the plain \TeX\ \texttt{\char`\\ raise} macro and the \LaTeX\ \texttt{\char`\\ raisebox} macro work differently.}
+\item The colors \texttt{knitlinecolor} and \texttt{gridcolor} are defined and may be changed similarly. \texttt{knitlinecolor} controls the lines produced by \verb?\!?,~\verb?|?, \verb|\=|, \verb|\_|, \verb|\-|, \verb|\overline|, and \verb|\underline|; \texttt{gridcolor} controls the grid.
-It is inadvisable to change any of these (except \verb|\knitlinewd|); a 0.4pt grid is built into the fonts, and changing \verb|\gridwidth| won't change it, just mess up any code that relies on \verb|\gridwidth|.
+\item Finally, the color \texttt{rncolor} is used by \verb|\printrownumber| (and \texttt{\char`\\print\-stitch\-count}) so that the row numbers and stitch counts cannot be mistaken for parts of the chart proper. (The color \texttt{rnarrowcolor} is used for just the small arrows in left and right row numbers.)
-You can change \verb|\knitlinewd| with \verb|\setlength|; however, \verb|\knitlinewd| is defined by \textsf{knitting} in a complicated way so as to change gracefully with changing knit sizes, and so it is probably best to say \verb|\newdimen| \verb|\knitlinewd| (not \verb|\newlength|\allowbreak\verb|{\knitlinewd}|) first.
+\end{itemize}
-If you use one of these parameters outside of a \verb|\chart| or \verb|\textknit|, you may get error messages about undefined fonts. To fix them, use \verb|\knitgrid|, \verb|\knitnogrid| or \verb|\knitwide| again.
+\subsection{Stitch symbols produced or modified with commands}
-\item The boolean variables \verb|\ifgrid| and \verb|\ifchartsonly| are standard \TeX\ conditionals: they may be used as
-\begin{center}\verb|\ifgrid| Grid code \verb|\else| Nongrid code \verb|\fi|
-\end{center}
+\begin{itemize}
-They are useful if you haven't decided yet how you want to format your document, or if you want to compile it several times with slightly different results.
+\item \verb|\wideincrease| and \verb|\widedecrease|. These macros take one argument each (the width, in stitches) and produce wide symbols:
+\begin{quote}
+\verb|\textknit{\wideincrease{3}}| \textknit{\wideincrease{3}}
+\end{quote}
-\item In \LaTeX, you get sans serif text (the font inside the knit boxes) with the usual command \verb|\textsf|. In plain \TeX, you can get sans serif text with \verb|\knitsf|.
+\item \verb|\bobble|, \verb|\narrowincrease|, \verb|\narrowdecrease|, \verb|\pnarrow|\-\verb|increase|, and \verb|\pnarrow|\-\verb|decrease|. These macros take one argument each. That argument is typeset in small letters over some symbol I thought was appropriate:
+\begin{quote}
+\verb|\textknit{\bobble{5}}|~\textknit{\bobble{5}}.
+\end{quote}
-\end{itemize}
+\item[$\star$] Inside a knitting chart (but not after \verb|\textknit|), the shorter commands \verb|\@|, \verb|\<|, \verb|\>|, \verb|\[|, and \verb|\]| are available.
-\begin{figure}
-\caption{Examples}
+\item \verb|\cableleft| and \verb|\cableright| will produce the most general possible cable symbols. While there are simple methods to get {\knitnogrid \textknit{kkKK}} (see \autoref{se:cables}), these let you get such obscure symbols as \textknit{\cableright{*}{-Q-}} or even (in concert with \verb|\bobble| and \verb|\knitbox|) \textknit{\cableleft{\narrowincrease{3}\knitbox{knit}{2}}{\purlbox{purl}{2}\bobble{3}}}.
-\advance\hsize 60pt
-\noindent \hskip -30pt
-\begin{minipage}[b]{3in}
-\obeylines
-\verb?\chart[oddleft]{?
-\verb?\nonumber?
-\verb?\overline{~~~~~\hspace{2\knitlinewd}}?
-\verb?\nonumber-|\widedecrease{3}|-?
-\verb?-|\knitbox{8}{3}|-?
-\verb?\@3|\purlbox{8}{3}|=?
-\vspace{1pt}
-\verb?\overline{-|\knit{3}|-}?
-\verb?\underline{-|\Knit{8}{3}|=}?
-\vspace{1pt}
-\verb?-|-{\purlpass{\color{blue}} pK}|-?
-\verb?-|\Purl{12}{3}|=?
-\verb?-|\purlbackground{\wideincrease{3}}|-?
-\verb?\addtocounter{rownumber}{-2}}}?
-\end{minipage}%
-\hfill
-\begin{minipage}[b]{1.5in}
-\knitnogrid
-\qquad\verb|\knitnogrid|\\
-\chart[oddleft]{
-\nonumber
-\overline{~~~~~\hspace{2\knitlinewd}}
-\nonumber-|\widedecrease{3}|-
--|\knitbox{8}{3}|-
-\@3|\purlbox{8}{3}|=
-\overline{-|\knit{3}|-}
-\underline{-|\Knit{8}{3}|=}
--|-{\purlpass{\color{blue}} pK}|-
--|\Purl{12}{3}|=
--|\purlbackground{\wideincrease{3}}|-
-\nonumber\addtocounter{rownumber}{-2}`}
-\end{minipage}%
-\hfill
-\begin{minipage}[b]{1.5in}
+\item \verb|\purlbackground|. I use a gray background to indicate simple purls, and also the purl version of more complicated stitches: \textknit{<} for slip, slip, knit, and \textknit{;} for purl 2 together. You can get \textknit{3} instead of \textknit{A} by typing~\texttt{3} instead of~\texttt{A}, but I didn't have space to provide a purl version of every symbol; so the only way to get \textknit{\purlbackground{r}} is with \verb|\purlbackground{r}|.
+
+\item \verb|\knit| and \verb|\purl|. These macros take one argument each and type out that many plain knit or plain purl symbols.
+
+\item \verb|\Knit|, \verb|\Purl|, \verb|\knitbox|, \verb|\purlbox|. These macros were designed to produce appropriate shorthand for ``Knit or purl 12 stitches, regardless of how many are actually shown''. They also provide ways to get lots and lots of bizarre symbols if necessary. The first argument is text to appear inside the box; the second is the desired width of the box (in units of one stitch).
+
+They look like this:
+\begin{quote}\raggedright
\knitgrid
-\qquad\verb|\knitgrid|\\
-\chart[oddleft]{
-\nonumber
-\overline{~~~~~\hspace{2\knitlinewd}}
-\nonumber-|\widedecrease{3}|-
--|\knitbox{8}{3}|-
-\@3|\purlbox{8}{3}|=
-\overline{-|\knit{3}|-}
-\underline{-|\Knit{8}{3}|=}
--|-{\purlpass{\color{blue}} pK}|-
--|\Purl{12}{3}|=
--|\purlbackground{\wideincrease{3}}|-
-\nonumber\addtocounter{rownumber}{-2}`}
-\end{minipage}
+\verb|\Knit{12}{5}| \textknit{\Knit{12}{5}}
+\verb|\knitbox{12}{5}| \textknit{\knitbox{12}{5}}\\
+\verb|\Purl{12}{5}| \textknit{\Purl{12}{5}}
+\verb|\purlbox{12}{5}| \textknit{\purlbox{12}{5}}
+\knitnogrid
+\verb|\Knit{12}{5}| \textknit{\Knit{12}{5}}
+\verb|\knitbox{12}{5}| \textknit{\knitbox{12}{5}}\\
+\verb|\Purl{12}{5}| \textknit{\Purl{12}{5}}
+\verb|\purlbox{12}{5}| \textknit{\purlbox{12}{5}}
+\end{quote}
-\bigskip
+Normally, the first argument is centered inside the box. However, you can offset the label with an optional first argument. This is the displacement to the right in half-stitches; to get a displacement to the left, use negative numbers.
-\noindent \hskip -30pt
-\begin{minipage}[b]{3in}
-\obeylines
-\verb?\definecolor{knitlinecolor}{rgb}{0,0,0.8}?
-\verb?\setcounter{rownumberskip}{2}?
-\verb?\chart{?
-\verb? \overline{--|--|-}\rnright?
-\verb?~\={1}~\={1}~\\-|--|-- \rnright?
-\verb?~\={1}~\={1}~\\--|--|- \rnright?
-\verb?\vspace{24pt}?
-\verb?\-{5}?
-\verb?--\!--\!- \rnright \\ ~\_~\_~?
-\verb?-\!--\!-- \rnright \\ ~\_~\_~?
-\verb?--\!--\!- \rnright?
-\vspace{0pt}
-\verb?}?
-\end{minipage}%
-\hfill
-\begin{minipage}[b]{85pt}
+If you want to make these characters more obvious, you can change the colors for the knit and purl boxes (and the generated {\knitnogrid \textknit{=}s and \textknit{-}s}) by redefining the commands \verb|\knitboxforeground|, \verb|\purlboxforeground|, \verb|\knitboxbackground|, \verb|\purlboxbackground|; by default, they are blank and \verb|\color{purlgray}| (or \verb|\purlgray|).
+
+\begin{quote}\raggedright
\knitnogrid
-\definecolor{knitlinecolor}{rgb}{0,0,0.8}
-\setcounter{rownumberskip}{2}
-\chart{
- \overline{--|--|-}\rnright
-~\={1}~\={1}~\\-|--|-- \rnright
-~\={1}~\={1}~\\--|--|-\rnright
-\vspace{24pt}
-\-{5}
---\!--\!- \rnright \\ ~\_~\_~
--\!--\!-- \rnright \\ ~\_~\_~
---\!--\!- \rnright
-\nonumber``}
-\vspace{0pt}
-\end{minipage}%
-\hfill
-\begin{minipage}[b]{90pt}
-\knitgrid
-\definecolor{knitlinecolor}{rgb}{0,0,0.8}
-\setcounter{rownumberskip}{2}
-\chart{
- \overline{--|--|-}\rnright
-~\={1}~\={1}~\\-|--|-- \rnright
-~\={1}~\={1}~\\--|--|-\rnright
-\vspace{24pt}
-\-{5}
---\!--\!- \rnright \\ ~\_~\_~
--\!--\!-- \rnright \\ ~\_~\_~
---\!--\!- \rnright
-\nonumber``}
-\vspace{0pt}
-\end{minipage}
-\end{figure}
+\verb?\definecolor{purlboxbg}{gray}{0.57}?\\
+\verb?\definecolor{purlboxfg}{gray}{0.2}?\\
+\verb?\renewcommand\purlboxbackground{\color{purlboxbg}}?\\
+\verb?\renewcommand\purlboxforeground{\color{purlboxfg}}?\\
+\verb?\textknit{Kp\Purl[-1]{12}{6}}?
+\definecolor{purlboxbg}{gray}{0.57}
+\definecolor{purlboxfg}{gray}{0.2}
+\renewcommand\purlboxbackground{\color{purlboxbg}}
+\renewcommand\purlboxforeground{\color{purlboxfg}}
+\textknit{Kp\Purl[-1]{12}{6}}
+\end{quote}
-\section{What goes in the charts}
+\end{itemize}
-After careful consideration, I decided to depart from \TeX\ tradition and set the fonts up so that your input would also look more or less like a chart (rather than defining new commands like \verb|\ssk|).
+\subsection{Miscellaneous commands}
-So here's what you type:
+\begin{itemize}
-\subsection{Space in the input}
+\item \verb|\purlpass|, \verb|\gridpass|, \verb|\mainpass|. \verb|\chart| and \verb|\textknit| compile their argument twice: once in gray, for the purl background, and then once in black for the foreground. They then put them on top of each other. (The grid font does a third pass, in the middle, for just the grid; this lets us have grid lines that are gray rather than black.) \verb|\purlpass| takes one mandatory argument (something to do only during the purl pass) and one optional first argument (something to do during the other two passes.) These let you produce a variety of effects:
+\begin{quote}
+\verb|\purlpass{\color{blue}} pK| \textknit{\purlpass{\color{blue}} pK}
+\end{quote}
-A normal space in the source code in a knit grid, like a space in math mode, is ignored.
-In a knitting chart, unlike in normal text, you want to prescribe all your line breaks. For convenience, knitting charts have the macro \verb|\obeylines| built in, so that a single $\langle$return$\rangle$ produces a new paragraph (and therefore a new line), like a double $\langle$return$\rangle$ usually does.
+\item \verb|\knitlinewd|, \verb|\gridwidth|, \verb|\stitchwd|, \verb|\stitchht|, and \verb|\stitchdp| store most of the dimensional information about the knitting fonts.\footnote{Grid cells are designed to be 12pt (or 16.3pt) by 12pt, and extend slightly below the baseline to work gracefully with numbers or other normal text. In \LaTeX, \texttt{\char`\\ stitchht} is 12pt. In plain \TeX, \texttt{\char`\\ stitchht} is 12pt$-$\texttt{\char`\\ stitchdp}. This is because the plain \TeX\ \texttt{\char`\\ raise} macro and the \LaTeX\ \texttt{\char`\\ raisebox} macro work differently.}
-If you want two or more lines in the source code to produce one line on the chart, end all but the last with the comment character~\verb|%|.
+It is inadvisable to change any of these (except \verb|\knitlinewd|); a \the\gridwidth\ grid is built into the fonts, and changing \verb|\gridwidth| won't change it, just mess up any code that relies on \verb|\gridwidth|.
-Unfortunately, the trick I use to make $\langle$return$\rangle$s trigger new lines is delicate; specifically, if you put your chart inside another command, it stops working. (It works fine inside environments.) (The bar \verb?|? also stops working; it produces a plain black bar whose width will not change if you redefine \verb|\knitlinewd|.)
+You can change \verb|\knitlinewd| with \verb|\setlength|; however, \verb|\knitlinewd| is defined by \textsf{knitting} in a complicated way so as to change gracefully with changing knit sizes, and so it is probably best to say \verb|\newdimen| \verb|\knitlinewd| (not \verb|\newlength|\allowbreak\verb|{\knitlinewd}|) first.
-So if you want to embed your chart inside another command, you have to end each line with a \verb|\par|, \verb|\\|, or a double $\langle$return$\rangle$ (blank line).
+If you use one of these parameters outside of a \verb|\chart| or \verb|\textknit|, you may get error messages about undefined fonts. To fix them, use \verb|\knitgrid|, \verb|\knitnogrid| or \verb|\knitwide| again.
-\begin{figure}
-\caption{The effects of embedding charts in commands and environments}
-\par\bigskip\par
-\begin{minipage}[b]{2.5in}
-\begin{verbatim}
-\newdimen\knitlinewd
-\setlength{\knitlinewd}{4pt}
-\parbox{77pt}{
-\chart{
-tt|
-AA\|%
---\\
-==|==\\}
-}
-\end{verbatim}
-\end{minipage}%
-\hskip -108pt
-\begin{minipage}[b]{80pt}
-\newdimen\knitlinewd
-\setlength{\knitlinewd}{4pt}
-\parbox{80pt}{
-\chart{
-tt|
-AA\|%
---\\
-==|==\\}}
-\vspace{24pt}
-\end{minipage}%
-\hskip 12pt
-\begin{minipage}[b]{2.5in}
-\begin{verbatim}
-\newdimen\knitlinewd
-\setlength{\knitlinewd}{4pt}
-\begin{center}
-\chart{
-tt|
-AA\|%
---\\
-==|==\\}
-\end{center}
-\end{verbatim}
-\end{minipage}%
-\hskip -84pt
-\begin{minipage}[b]{55pt}
-\newdimen\knitlinewd
-\setlength{\knitlinewd}{4pt}
-\begin{center}
-\chart{
-tt|
-AA\|%
---\\
-==|==\\}
+\item The boolean variables \verb|\ifgrid| and \verb|\ifchartsonly| are standard \TeX\ conditionals: they may be used as
+\begin{center}\verb|\ifgrid| Grid code \verb|\else| Nongrid code \verb|\fi|
\end{center}
-\vspace{24pt}
-\end{minipage}
-\end{figure}
-\subsection{Space in the output}
+They are useful if you haven't decided yet how you want to format your document, or if you want to compile it several times with slightly different results.
-A tilde $\sim$ produces a gap the width of one stitch. This is meant to be used in charts with ragged edges. It's been designed so that automatically placed rownumbers show up {after} the gaps left by $\sim$, not before. If you really want them to show up earlier, you can use single quotes instead of $\sim$s as spacers.
+\item In \LaTeX, you get sans serif text (the font inside the knit boxes) and roman text (the row number/stitch count font) with the usual commands \verb|\textsf| and \verb|\textnormal|. In plain \TeX, you can get these fonts with \verb|\knitsf| and \verb|\knitrm|.
-The single quotes \texttt{`} and \texttt{'} produce spaces that are {half} the width of a normal box (white or gray). If for some reason you need an empty, borderless box in the grid font, you can use~\texttt{``} or~\texttt{''}. It is inadvisable to use $\sim$s alone on their own line; \texttt{``}s are much better behaved.
+\end{itemize}
-In the nongrid font, \fbox{\texttt{\vphantom{I}.}}\ and~\fbox{\texttt{\vphantom{I},}} both produce empty boxes. (Of different colors; \fbox{\texttt{\vphantom{I}.}}~produces white, \fbox{\texttt{\vphantom{I},}}~produces gray.) These are meant to be no-stitch markers which are as unobtrusive and non-misleading as possible, and are in fact why the nongrid font has no grid.
+%\begin{figure}
+%\caption{Examples}\label{fig:examples}
+%\advance\hsize 60pt
+%\noindent \hskip -30pt
+%\begin{minipage}[b]{3in}
+%\obeylines
+%\verb?\chart[oddleft]{?
+%\verb?\nonumber?
+%\verb?\overline{~~~~~\hspace{2\knitlinewd}}?
+%\verb?\nonumber-|\widedecrease{3}|-?
+%\verb?-|\knitbox[-1]{8}{3}|-?
+%\verb?\@3|\purlbox[1]{8}{3}|=?
+%\vspace{1pt}
+%\verb?\overline{-|\knit{3}|-}?
+%\verb?\underline{-|\Knit{8}{3}|=}?
+%\vspace{1pt}
+%\verb?-|-{\purlpass{\color{blue}} pK}|-?
+%\verb?-|\Purl{12}{3}|=?
+%\verb?-|\purlbackground{\wideincrease{3}}|-?
+%\verb?\addtocounter{rownumber}{-2}}}?
+%\end{minipage}%
+%\hfill
+%\begin{minipage}[b]{1.5in}
+%\knitnogrid
+%\quad\verb|\knitnogrid|\\
+%\chart[oddleft]{
+%\nonumber
+%\overline{~~~~~\hspace{2\knitlinewd}}
+%\nonumber-|\widedecrease{3}|-
+%-|\knitbox[-1]{8}{3}|-
+%\@3|\purlbox[1]{8}{3}|=
+%\overline{-|\knit{3}|-}
+%\underline{-|\Knit{8}{3}|=}
+%-|-{\purlpass{\color{blue}} pK}|-
+%-|\Purl{12}{3}|=
+%-|\purlbackground{\wideincrease{3}}|-
+%\nonumber\addtocounter{rownumber}{-2}`}
+%\end{minipage}%
+%\hfill
+%\begin{minipage}[b]{1.5in}
+%\knitgrid
+%\qquad\verb|\knitgrid|\\
+%\chart[oddleft]{
+%\nonumber
+%\overline{~~~~~\hspace{2\knitlinewd}}
+%\nonumber-|\widedecrease{3}|-
+%-|\knitbox[-1]{8}{3}|-
+%\@3|\purlbox[1]{8}{3}|=
+%\overline{-|\knit{3}|-}
+%\underline{-|\Knit{8}{3}|=}
+%-|-{\purlpass{\color{blue}} pK}|-
+%-|\Purl{12}{3}|=
+%-|\purlbackground{\wideincrease{3}}|-
+%\nonumber\addtocounter{rownumber}{-2}`}
+%\end{minipage}
+%\end{figure}
+
+\section{What goes in the charts}
+After careful consideration, I decided to depart from \TeX\ tradition and set the fonts up so that your input would also look more or less like a chart (rather than defining new commands like \verb|\ssk|).
\subsection{Normal symbols}\label{se:normal}
The normal symbols are in \autoref{fig:symbols}. The file \texttt{knitkey.tex} contains my suggested meanings for all the available symbols.
+\makeatletter
+\let \barknit \bar@knit
+\let \barthinknit \barthin@knit
+\makeatother
+
\begin{figure}
\caption{The normal symbols}\label{fig:symbols}
\newcommand\knitrow[1]{\texttt{#1}&\knitgrid\textknit{#1}&\knitnogrid\textknit{#1}\\}
@@ -579,6 +668,7 @@ The normal symbols are in \autoref{fig:symbols}. The file \texttt{knitkey.tex} c
\knitrow{m}
\knitrow{M}
\knitrow{O}
+\knitrow{9}
\hline
\end{tabular}
\hfill
@@ -602,6 +692,8 @@ The normal symbols are in \autoref{fig:symbols}. The file \texttt{knitkey.tex} c
\knitrow{W}
\knitrow{E}
\knitrow{Y}
+\knitrow{6}
+%\knitrow{0}
\hline
\end{tabular}
\hfill
@@ -624,12 +716,14 @@ The normal symbols are in \autoref{fig:symbols}. The file \texttt{knitkey.tex} c
\knitrow{U}
\knitrow{f}
\knitrow{F}
-\knitrow{@}
+\knitrow{7}
+\knitrow{8}
\hline
\end{tabular}
\hfill
\begin{tabular}[t]{|ccc|}
\hline
+\knitrow{@}
\knitrow{"}
\knitrow{""}
\knitrow{*}
@@ -644,15 +738,96 @@ The normal symbols are in \autoref{fig:symbols}. The file \texttt{knitkey.tex} c
\knitrow{???}
\knitrow{+++}
\knitrow{+/+}
-\knitrow{|}
-\displaypair{|}{\char`\\!}
+\displaypair{\barknit}{\char`\\|}
+\displaypair{\barthinknit}{\char`\\!}
\displaypair{\wideincrease{4}}{}
\displaypair{\widedecrease{4}}{}
\hline
\end{tabular}
\end{figure}
-If these symbols (and the cable symbols in the next section) do not suffice, then you can generate new symbols with \verb|\knitbox|: \textknit{\knitbox{a}{1}} \textknit{\knitbox{Cable 6 left}{6}}. This is the best way to indicate very wide cables in the grid font, since very wide cable symbols do not exist in that font, and if they did, they would slant too steeply to be easily read. A great many strange symbols are available by using math symbols: \verb|\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}| \chart{\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}}. However, these may look a little incongruous with the rest of the font, so use with care.
+If these symbols (and the cable symbols in \autoref{se:cables}) do not suffice, then you can generate new symbols with \verb|\knitbox|: \textknit{\knitbox{a}{1}} \textknit{\knitbox{Cable 6 left}{6}}. This is the best way to indicate very wide cables in the grid font, since very wide cable symbols do not exist in that font, and if they did, they would slant too steeply to be easily read. A great many strange symbols are available by using math symbols: \verb|\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}| \chart{\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}}. However, these may look a little incongruous with the rest of the font, so use with care.
+
+\subsection{Space in the input}
+
+A normal space in the source code in a knitting chart, like a space in math mode, is ignored.
+In a knitting chart, unlike in normal text, you want to prescribe all your line breaks. For convenience, knitting charts have the macro \verb|\obeylines| built in, so that a single $\langle$return$\rangle$ produces a new paragraph (and therefore a new line), like a double $\langle$return$\rangle$ usually does.
+
+If you want two or more lines in the source code to produce one line on the chart, end all but the last with the comment character~\verb|%|.
+
+Unfortunately, the trick I use to make $\langle$return$\rangle$s trigger new lines is delicate; specifically, if you put your chart inside another command, it stops working. (It works fine inside environments.) (The bar \verb?|? also stops working; it produces a plain black bar whose width will not change if you redefine \verb|\knitlinewd|.)
+
+So if you want to embed your chart inside another command, you have to end each line with a \verb|\par|, \verb|\\|, or a double $\langle$return$\rangle$ (blank line).
+
+\let \saveknitlinewd \knitlinewd
+
+\begin{figure}
+\caption{The effects of embedding charts in commands and environments}
+\par\bigskip\par
+\begin{minipage}[b]{2.5in}
+\begin{verbatim}
+\newdimen\knitlinewd
+\setlength{\knitlinewd}{4pt}
+\parbox{77pt}{
+\chart{
+tt|
+AA\|%
+--\\
+==|==\\}
+}
+\end{verbatim}
+\end{minipage}%
+\hskip -108pt
+\begin{minipage}[b]{80pt}
+\newdimen\knitlinewd
+\setlength{\knitlinewd}{4pt}
+\parbox{80pt}{
+\chart{
+tt|
+AA\|%
+--\\
+==|==\\}}
+\vspace{24pt}
+\end{minipage}%
+\hskip 12pt
+\begin{minipage}[b]{2.5in}
+\begin{verbatim}
+\newdimen\knitlinewd
+\setlength{\knitlinewd}{4pt}
+\begin{center}
+\chart{
+tt|
+AA\|%
+--\\
+==|==\\}
+\end{center}
+\end{verbatim}
+\end{minipage}%
+\hskip -84pt
+\begin{minipage}[b]{55pt}
+\newdimen\knitlinewd
+\setlength{\knitlinewd}{4pt}
+\begin{center}
+\chart{
+tt|
+AA\|%
+--\\
+==|==\\}
+\end{center}
+\vspace{24pt}
+\end{minipage}
+\end{figure}
+
+\let \knitlinewd \saveknitlinewd
+
+\subsection{Space in the output}
+
+A tilde $\sim$ produces a gap the width of one stitch. This is meant to be used in charts with ragged edges. It's been designed so that automatically placed rownumbers show up {after} the gaps left by $\sim$, not before. If you really want them to show up earlier, you can use single quotes instead of $\sim$s as spacers.
+
+The single quotes \texttt{`} and \texttt{'} produce spaces that are {half} the width of a normal box (white or gray). If for some reason you need an empty, borderless box in the grid font, you can use~\texttt{``} or~\texttt{''}. It is inadvisable to use $\sim$s alone on their own line; \texttt{``}s are much better behaved.
+
+In the nongrid font, \fbox{\texttt{\vphantom{I}.}}\ and~\fbox{\texttt{\vphantom{I},}} both produce empty boxes. (Of different colors; \fbox{\texttt{\vphantom{I}.}}~produces white, \fbox{\texttt{\vphantom{I},}}~produces gray.) These are meant to be no-stitch markers which are as unobtrusive and non-misleading as possible, and are in fact why the nongrid font has no grid.
+
\subsection{Ligatures and cables}
\label{se:cables}
@@ -727,7 +902,7 @@ Twelve special cable symbols are also possible:
\textknit{kpK~Kpk~kkpKK~KKpkk~kkppKK~KKppkk}\\
\textknit{kpD~Kpd~kkpKD~KKpkd~kkppKD~KKppkd}\\
\end{center}
-You get these by putting \texttt{p}s (not \texttt{g}s) between the \texttt{k}s and \texttt{K}s/\texttt{D}s.\footnote{{The rules for these cables are actually more complicated. The only way to get \knitnogrid\textknit{kkpKK}, the nogrid equivalent of \knitgrid\textknit{kkpKK}, is by typing \texttt{kkpKK} or some equivalent with \texttt{c}s and~\texttt{g}s. In the grid font, you can't use \texttt{g} for the middle purl stitch. More importantly, the fonts don't check to make sure you typed exactly \texttt{kkpKK}. The only grid cable that can start with \texttt{kkp} is \textknit{kkp}; so \texttt{kkp} followed by any number of \texttt{K}s will produce \textknit{kkpKKKKK}.}}
+You get these by putting \texttt{p}s (not \texttt{g}s) between the \texttt{k}s and \texttt{K}s.\footnote{{The rules for these cables are actually more complicated. The only way to get \knitnogrid\textknit{kkpKK}, the nogrid equivalent of \knitgrid\textknit{kkpKK}, is by typing \texttt{kkpKK} or some equivalent with \texttt{c}s and~\texttt{g}s. In the grid font, you can't use \texttt{g} for the middle purl stitch. More importantly, the fonts don't check to make sure you typed exactly \texttt{kkpKK}. The only grid cable that can start with \texttt{kkp} is \textknit{kkp}; so \texttt{kkp} followed by any number of \texttt{K}s will produce \textknit{kkpKKKKK}.}}
In the wide-cell grid font, for technical reasons no symbols more than five cells wide are available; so while \knitwide\textknit{pK} is available, a wider version of \knitgrid\textknit{kkppKK} is not.
@@ -750,15 +925,19 @@ KKdd~KKnn~KKoo
\end{center}
\texttt{e} and \texttt{o} have the same effect.
-
-Some special effects are possible. You can get fancy with the colors of these symbols:
+Some special effects are possible. You can get fancy with the colors of these symbols:\footnote{If you use \texttt{\char`\\colorbox} with \texttt{\char`\\textknit} insteat of \texttt{\char`\\chart}, you will need to say \texttt{\char`\\setlength\allowbreak\char`\{\char`\\fboxsep\char`\}\char`\{0pt\char`\}} at some point to make this work; this statement is built into \texttt{\char`\\chart}.}
\bigskip
-\verb?\setlength{\fboxsep}{0pt}?\hfill{\setlength{\fboxsep}{0pt}
-\textknit{\purlpass[Kk]{\colorbox{lightblue}{\color{blue}{kK}}}}}
+\noindent{\setlength{\fboxsep}{0pt}
+\verb|\colorbox{lightblue}{A}|
+\hfill\textknit{`\colorbox{lightblue}{A}`}}
+
+\smallskip
-\verb?\textknit{\purlpass[Kk]{\colorbox{lightblue}{\color{blue}{kK}}}?
+\noindent{\setlength{\fboxsep}{0pt}
+\verb|\purlpass[Kk]{\colorbox{lightblue}{\color{blue}kK}}|
+\hfill\textknit{\purlpass[Kk]{\colorbox{lightblue}{\color{blue}kK}}}}
\bigskip
@@ -781,93 +960,278 @@ ppKK}
This is enough for most cable patterns.
+\section{Counting stitches}
+\label{se:counting}
+
+\setcounter{rownumberskip}{1}
+
+When knitting a complicated pattern, it can be helpful if the chart indicates the expected stitch count after each row. When writing a complicated chart, and especially when designing a new stitch pattern, it can be very helpful to have some way of checking to see that each row uses exactly as many stitches as the previous row generated. \textsf{knitting} provides a mechanism for counting stitches and for comparing them from row to row.
+
+If used inside a knitting chart, the command \verb|\countstitches| takes one argument and sets the counters \texttt{stitchcountout} and \texttt{stitchcountin} to reflect how many stitches that sequence of stitches would produce or consume, assuming that all the symbols have the meanings given in \textsf{knitkey.tex}.
+
+So, for example:
+
+\bigskip
+
+\noindent\begin{minipage}[t]{224pt}
+\obeylines\parindent=0pt\tt
+\verb?\chart{\countstitches{->-}}?
+\verb?stitchcountout: \thestitchcountout?
+\verb?stitchcountin: \thestitchcountin?
+\end{minipage}
+\quad
+\begin{minipage}[t]{108pt} \obeylines
+\chart{\countstitches{->-}}
+stitchcountout: \thestitchcountout
+stitchcountin: \thestitchcountin
+\end{minipage}
+
+\bigskip
+
+This can be used to automatically label each row with its stitch count.
+
+\bigskip
+
+\noindent\begin{minipage}[b]{350pt}
+\obeylines\parindent=0pt\tt
+\verb?\newcommand{\mystitchcount}[1]{\countstitches{#1}#1?
+\verb? \mainpass{{\color{rncolor}%?
+\verb? \textnormal{ (\thestitchcountout\ sts)}}}}?
+\verb?\chart{?
+\verb? \mystitchcount{~-A-~}?
+\verb? \mystitchcount{-----}?
+\verb? \mystitchcount{~-w-~}}?
+\end{minipage}
+\hskip -108pt
+\begin{minipage}[b]{108pt}
+\newcommand{\mystitchcount}[1]{\countstitches{#1}#1
+ \mainpass{{\color{rncolor}%
+ \textnormal{ (\thestitchcountout\ sts)}}}}
+\chart{
+ \mystitchcount{~-A-~}
+ \mystitchcount{-----}
+ \mystitchcount{~-w-~}}
+\end{minipage}
+
+\bigskip
+
+(A more complicated example is in \texttt{knitexamples.tex}. Repeated patterns affect stitch count in strange ways; that example should show you how to cope.)
+
+You can adjust the stitch count using the command \verb|\adjuststitchcount|. It takes a mandatory argument (how many stitches to add) and an optional argument (a different number of stitches to add to the incount.)
+
+By using the command \verb|\stitchcountwarningbar|, we can check to see that stitch counts are consistent from row to row:
+
+\bigskip
+
+\noindent\begin{minipage}[b]{\textwidth}
+\obeylines\parindent=0pt\tt
+\verb?\newcommand{\mystitchcount}[1]{\countstitches{#1}#1%?
+\verb? \textnormal{\color{rncolor}?
+\verb? \mainpass{ (\thestitchcountout\ sts)\stitchcountwarningbar}}?
+\end{minipage}
+
+\noindent\begin{minipage}[b]{350pt}
+\obeylines\parindent=0pt\tt
+\verb?\chart{?
+\verb? \setcounter{stitchcountin}{-100}?
+\verb? \mystitchcount{~-A-~}?
+\verb? \mystitchcount{-----}?
+\verb? \mystitchcount{-->--}?
+\verb? \mystitchcount{-----}?
+\verb? \mystitchcount{~-w-~}}?
+\end{minipage}
+\hskip -108pt
+\begin{minipage}[b]{108pt}
+\newcommand{\mystitchcount}[1]{%
+ \countstitches{#1}#1%
+ \textnormal{\color{rncolor}
+ \mainpass{ (\thestitchcountout\ sts)\stitchcountwarningbar}}}
+\chart{
+ \setcounter{stitchcountin}{-100}
+ \mystitchcount{~-A-~}
+ \mystitchcount{-----}
+ \mystitchcount{-->--}
+ \mystitchcount{-----}
+ \mystitchcount{~-w-~}}
+\end{minipage}
+
+\bigskip
+
+The heavy bar beside Row 2 indicates that Row~3 uses six stitches, but Row~2 produces only five. \verb|\stitchcountwarningbar| is built using the same code as \TeX's usual overfull rules; thus, it will only appear (in \LaTeX) if the \texttt{draft} document option is enabled.
+
+The initial \verb?\setcounter{stitchcountin}{-100}? prevents a warning bar from showing up on the very first row. A \verb?\setcounter{stitchcountin}{3}? would work in this case as well, since the top row produces 3 stitches.
+
+All of this gives you a lot of control over the stitch-counting mechanism in your chart. However, it requires a lot of work to set up. \textsf{knitting} has a quick command for generating charts with stitch counts:
+
+\bigskip
+
+\noindent\begin{minipage}[b]{350pt}
+\obeylines\parindent=0pt\tt
+\verb?\rnoddonly?
+\verb?\stitchcountchart[right]{?
+\verb? -----?
+\verb? ---\adjuststitchcount{2}?
+\verb? ---"\adjuststitchcount{2}?
+\verb? -----?
+\verb? }?
+\end{minipage}
+\hskip -108pt
+\begin{minipage}[b]{108pt}
+\rnoddonly
+\stitchcountchart[right]{
+ -----
+ ---\adjuststitchcount{2}
+ ---"\adjuststitchcount{2}
+ -----
+ }
+\par\strut
+\end{minipage}
+\bigskip
+
+The only way to customize this is the optional argument (which places row numbers as usual) and by redefining the commands \texttt{\char`\\ printleftstitchcount} and \texttt{\char`\\ printrightstitchcount}. The default (\LaTeX) values are
+\begin{quote}
+\verb?\newcommand{\printleftstitchcount}{{\color{rncolor}%?\\
+\verb? \textnormal{(\thestitchcountout\ sts) }}}?\\
+\verb?\newcommand{\printrightstitchcount}{}?
+\end{quote}
+
+\subsection*{Warnings} The stitch-counting machinery cannot, of course, actually know what meanings you assign to symbols. It is designed for the meanings in \textsf{knitkey.tex}. If you deviate from these, it will get the wrong answer.
+
+In particular, \verb|\Knit|, \verb|\Purl|, \verb|\knitbox| and \verb|\purlbox| count out as many stitches as their printed chart width. So \verb|\Knit{Knit 12}{7}| \textknit{\Knit{Knit 12}{7}} will be counted as 7 stitches. The best way to deal with this is probably to define a \verb|\myknit| command:
+\begin{quote}
+\verb?\newcommand{\myknit}[2]{\Knit{Knit #1}{#2}%?\\
+\verb? \adjuststitchcount{-#2}\adjuststitchcount{#1}}?
+\end{quote}
+
+Also, \verb|\stitchcountchart| is delicate; it must not be used inside commands, the closing~\verb|}| must be on its own line, and it often has trouble if strange things are put at the start of a line. (You can fix this by starting the line with a \verb|\noindent| or \verb|\leavevmode| or \verb|\mbox{}|.)
+
+\section{Revision history}
+
+\subsection*{August 2010}
+
+I've added the symbols \textknit{(}, \textknit{)}, \textknit{6}, \textknit{7}, \textknit{8}, and~\textknit{9} to the fonts for the benefit of people who want to use the symbols suggested by the Craft Yarn Council of America, and updated \texttt{knitkey.tex} to include these symbols (and a few others that can be generated by judicious use of \verb|\knitbox| and \verb|\purlpass|).
+
+I've added the commands \texttt{\char`\\ print\-rightrownumber}, \texttt{\char`\\ printleftrownumber} and \texttt{\char`\\ print\-row\-number} to make row numbers easier to customize. I've redefined the left and right row number macros to include little arrows.
+
+I've added the starred forms of \verb|\overline| and \verb|\underline| and the optional argument to \verb|\Knit|, \verb|\Purl|, \verb|\knitbox| and \verb|\purlbox| to offset the labels, and have rewritten those commands to use \verb|\knitboxbackground| and \verb|\purlboxbackground| in order to make them easier to customize.
+
+\catcode`\_=12
+
+I've added the stitch-counting mechanism. This has entailed minor revisions to a number of existing commands, writing the stitch-counting macros themselves, and also creating the supporting fonts \texttt{knitn_sc_in}, \texttt{knitn_sc_out}, \texttt{knitg_sc_in}, \texttt{knitg_sc_out}, \texttt{knitw_sc_in}, and \texttt{knitw_sc_out}.
+
\section{List of files that are considered part of this package}
\label{se:manifest}
This package should have come with all the following files, organized into the directories listed.
-\begingroup \ttfamily
+\medskip
+
+\begingroup \ttfamily
\noindent knitting/docs
\begin{itemize}
- \item knitexamples.tex
- \item knitkey.tex
- \item knitting-doc.pdf
- \item knitting-doc.tex
+ \item knitexamples.tex
+ \item knitkey.tex
+ \item knitting-doc.pdf
+ \item knitting-doc.tex
\end{itemize}
\noindent knitting/fonts/afm
\begin{itemize}
- \item knitgg.afm
- \item knitgn.afm
- \item knitgp.afm
- \item knitnl.afm
- \item knitnn.afm
- \item knitnp.afm
- \item knitnr.afm
- \item knitwg.afm
- \item knitwn.afm
- \item knitwp.afm
+ \item knitg_sc_in.afm
+ \item knitg_sc_out.afm
+ \item knitgg.afm
+ \item knitgn.afm
+ \item knitgp.afm
+ \item knitn_sc_in.afm
+ \item knitn_sc_out.afm
+ \item knitnl.afm
+ \item knitnn.afm
+ \item knitnp.afm
+ \item knitnr.afm
+ \item knitw_sc_in.afm
+ \item knitw_sc_out.afm
+ \item knitwg.afm
+ \item knitwn.afm
+ \item knitwp.afm
\end{itemize}
\noindent knitting/fonts/map
\begin{itemize}
- \item knitfont.map
+ \item knitfont.map
\end{itemize}
\noindent knitting/fonts/source
\begin{itemize}
- \item knit\char`\_dimens.mf
- \item knit\char`\_grid\char`\_cables.mf
- \item knit\char`\_nogrid\char`\_cables.mf
- \item knit\char`\_symbols.mf
- \item knitgg.mf
- \item knitgn.mf
- \item knitgp.mf
- \item knitnl.mf
- \item knitnn.mf
- \item knitnp.mf
- \item knitnr.mf
- \item knitwg.mf
- \item knitwn.mf
- \item knitwp.mf
+ \item knit_dimens.mf
+ \item knit_grid_cables.mf
+ \item knit_nogrid_cables.mf
+ \item knit_symbols.mf
+ \item knitg_sc_in.mf
+ \item knitg_sc_out.mf
+ \item knitgg.mf
+ \item knitgn.mf
+ \item knitgp.mf
+ \item knitn_sc_in.mf
+ \item knitn_sc_out.mf
+ \item knitnl.mf
+ \item knitnn.mf
+ \item knitnp.mf
+ \item knitnr.mf
+ \item knitw_sc_in.mf
+ \item knitw_sc_out.mf
+ \item knitwg.mf
+ \item knitwn.mf
+ \item knitwp.mf
\end{itemize}
\noindent knitting/fonts/tfm
\begin{itemize}
- \item knitgg.tfm
- \item knitgn.tfm
- \item knitgp.tfm
- \item knitnl.tfm
- \item knitnn.tfm
- \item knitnp.tfm
- \item knitnr.tfm
- \item knitwg.tfm
- \item knitwn.tfm
- \item knitwp.tfm
+ \item knitg_sc_in.tfm
+ \item knitg_sc_out.tfm
+ \item knitgg.tfm
+ \item knitgn.tfm
+ \item knitgp.tfm
+ \item knitn_sc_in.tfm
+ \item knitn_sc_out.tfm
+ \item knitnl.tfm
+ \item knitnn.tfm
+ \item knitnp.tfm
+ \item knitnr.tfm
+ \item knitw_sc_in.tfm
+ \item knitw_sc_out.tfm
+ \item knitwg.tfm
+ \item knitwn.tfm
+ \item knitwp.tfm
\end{itemize}
\noindent knitting/fonts/type1
\begin{itemize}
- \item knitgg.pfb
- \item knitgn.pfb
- \item knitgp.pfb
- \item knitnl.pfb
- \item knitnn.pfb
- \item knitnp.pfb
- \item knitnr.pfb
- \item knitwg.pfb
- \item knitwn.pfb
- \item knitwp.pfb
+ \item knitg_sc_in.pfb
+ \item knitg_sc_out.pfb
+ \item knitgg.pfb
+ \item knitgn.pfb
+ \item knitgp.pfb
+ \item knitn_sc_in.pfb
+ \item knitn_sc_out.pfb
+ \item knitnl.pfb
+ \item knitnn.pfb
+ \item knitnp.pfb
+ \item knitnr.pfb
+ \item knitw_sc_in.pfb
+ \item knitw_sc_out.pfb
+ \item knitwg.pfb
+ \item knitwn.pfb
+ \item knitwp.pfb
\end{itemize}
\noindent knitting/tex/latex
\begin{itemize}
- \item knitting.sty
- \item uknit.fd
+ \item knitting.sty
+ \item uknit.fd
\end{itemize}
\noindent knitting/tex/plain
\begin{itemize}
- \item knitting.tex
+ \item knitting.tex
\end{itemize}
\endgroup
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm
new file mode 100644
index 00000000000..d9aef3790c2
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm
@@ -0,0 +1,259 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:39:02 2010
+FontName KnittingSymbols-grid-incount-Medium
+FullName KnittingSymbols-grid-incount
+FamilyName KnittingSymbols-grid-incount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -550 -288 7210 932
+CapHeight 688
+XHeight 662
+Ascender 932
+Descender -288
+StartCharMetrics 237
+C 0 ; WX 1204 ; N grave ; B -10 -288 1210 932 ;
+C 1 ; WX 1204 ; N acute ; B -10 -288 1210 932 ;
+C 2 ; WX 1204 ; N circumflex ; B -10 -288 1210 932 ;
+C 3 ; WX 1204 ; N tilde ; B -10 -288 1210 932 ;
+C 4 ; WX 1204 ; N dieresis ; B -10 -288 1210 932 ;
+C 5 ; WX 1204 ; N hungarumlaut ; B -10 -288 1210 932 ;
+C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
+C 17 ; WX 1204 ; N quotedblright ; B -10 -288 1210 932 ;
+C 18 ; WX 1204 ; N quotedblbase ; B -10 -288 1210 932 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 20 ; WX 1204 ; N guillemotright ; B -10 -288 1210 932 ;
+C 21 ; WX 1204 ; N endash ; B -10 -288 1210 932 ;
+C 22 ; WX 602 ; N emdash ; B -10 -288 610 932 ;
+C 23 ; WX 1204 ; N compwordmark ; B -10 -288 1210 932 ;
+C 24 ; WX 1204 ; N perthousandzero ; B -10 -288 1210 932 ;
+C 25 ; WX 602 ; N dotlessi ; B -10 -288 610 932 ;
+C 26 ; WX 602 ; N dotlessj ; B -10 -288 610 932 ;
+C 27 ; WX 602 ; N ff ; B -10 -288 610 932 ;
+C 28 ; WX 602 ; N fi ; B -10 -288 610 932 ;
+C 29 ; WX 1204 ; N fl ; B -10 -288 1210 932 ;
+C 30 ; WX 1204 ; N ffi ; B -10 -288 1210 932 ;
+C 31 ; WX 6022 ; N ffl ; B -10 -288 6010 932 ;
+C 33 ; WX 2409 ; N exclam ; B -10 -288 2410 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1204 ; N parenleft ; B -10 -288 1210 932 ;
+C 41 ; WX 1204 ; N parenright ; B -10 -288 1210 932 ;
+C 42 ; WX 1204 ; N asterisk ; B -10 -288 1210 932 ;
+C 43 ; WX 1204 ; N plus ; B -10 -288 1210 932 ;
+C 44 ; WX 0 ; N comma ; B -300 22 300 622 ;
+C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 46 ; WX 0 ; N period ; B -300 22 300 622 ;
+C 47 ; WX 1204 ; N slash ; B -10 -288 1210 932 ;
+C 49 ; WX 1204 ; N one ; B -10 -288 1210 932 ;
+C 50 ; WX 2409 ; N two ; B -10 -288 2410 932 ;
+C 51 ; WX 3613 ; N three ; B -10 -288 3610 932 ;
+C 52 ; WX 2409 ; N four ; B -10 -288 2410 932 ;
+C 53 ; WX 2409 ; N five ; B -10 -288 2410 932 ;
+C 54 ; WX 1204 ; N six ; B -10 -288 1210 932 ;
+C 55 ; WX 1204 ; N seven ; B -10 -288 1210 932 ;
+C 56 ; WX 1204 ; N eight ; B -10 -288 1210 932 ;
+C 57 ; WX 1204 ; N nine ; B -10 -288 1210 932 ;
+C 58 ; WX 2409 ; N colon ; B -10 -288 2410 932 ;
+C 59 ; WX 2409 ; N semicolon ; B -10 -288 2410 932 ;
+C 60 ; WX 2409 ; N less ; B -10 -288 2410 932 ;
+C 61 ; WX 1204 ; N equal ; B -10 -288 1210 932 ;
+C 62 ; WX 2409 ; N greater ; B -10 -288 2410 932 ;
+C 63 ; WX 1204 ; N question ; B -10 -288 1210 932 ;
+C 64 ; WX 1204 ; N at ; B -10 -288 1210 932 ;
+C 65 ; WX 3613 ; N A ; B -10 -288 3610 932 ;
+C 66 ; WX 1204 ; N B ; B -10 -288 1210 932 ;
+C 67 ; WX 1204 ; N C ; B -10 -288 1210 932 ;
+C 68 ; WX 1204 ; N D ; B -10 -288 1210 932 ;
+C 69 ; WX 1204 ; N E ; B -10 -288 1210 932 ;
+C 70 ; WX 1204 ; N F ; B -35 -288 1235 932 ;
+C 71 ; WX 1204 ; N G ; B -10 -288 1210 932 ;
+C 72 ; WX 0 ; N H ; B -140 -28 140 707 ;
+C 73 ; WX 0 ; N I ; B -300 -18 364 688 ;
+C 74 ; WX 0 ; N J ; B -364 -18 300 688 ;
+C 75 ; WX 1204 ; N K ; B -10 -288 1210 932 ;
+C 76 ; WX 3613 ; N L ; B -10 -288 3610 932 ;
+C 77 ; WX 0 ; N M ; B -300 112 300 532 ;
+C 78 ; WX 1204 ; N N ; B -10 -288 1210 932 ;
+C 79 ; WX 0 ; N O ; B -340 -18 340 662 ;
+C 80 ; WX 1204 ; N P ; B -10 -288 1210 932 ;
+C 81 ; WX 1204 ; N Q ; B -10 -288 1210 932 ;
+C 82 ; WX 3613 ; N R ; B -10 -288 3610 932 ;
+C 83 ; WX 1204 ; N S ; B -10 -288 1210 932 ;
+C 84 ; WX 0 ; N T ; B -258 -65 258 662 ;
+C 85 ; WX 0 ; N U ; B -300 22 300 622 ;
+C 86 ; WX 1204 ; N V ; B -10 -288 1210 932 ;
+C 87 ; WX 1204 ; N W ; B -10 -288 1210 932 ;
+C 88 ; WX 0 ; N X ; B -258 -65 258 662 ;
+C 89 ; WX 1204 ; N Y ; B -10 -288 1210 932 ;
+C 90 ; WX 1204 ; N Z ; B -10 -288 1210 932 ;
+C 91 ; WX 1204 ; N bracketleft ; B -10 -288 1210 932 ;
+C 93 ; WX 1204 ; N bracketright ; B -10 -288 1210 932 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 3613 ; N a ; B -10 -288 3610 932 ;
+C 98 ; WX 1204 ; N b ; B -10 -288 1210 932 ;
+C 99 ; WX 1204 ; N c ; B -10 -288 1210 932 ;
+C 100 ; WX 1204 ; N d ; B -10 -288 1210 932 ;
+C 101 ; WX 1204 ; N e ; B -10 -288 1210 932 ;
+C 102 ; WX 1204 ; N f ; B -35 -288 1235 932 ;
+C 103 ; WX 1204 ; N g ; B -10 -288 1210 932 ;
+C 104 ; WX 1204 ; N h ; B -10 -288 1210 932 ;
+C 105 ; WX 0 ; N i ; B -300 -18 364 688 ;
+C 106 ; WX 0 ; N j ; B -364 -18 300 688 ;
+C 107 ; WX 1204 ; N k ; B -10 -288 1210 932 ;
+C 108 ; WX 3613 ; N l ; B -10 -288 3610 932 ;
+C 109 ; WX 0 ; N m ; B -300 112 300 532 ;
+C 110 ; WX 1204 ; N n ; B -10 -288 1210 932 ;
+C 111 ; WX 1204 ; N o ; B -10 -288 1210 932 ;
+C 112 ; WX 1204 ; N p ; B -10 -288 1210 932 ;
+C 113 ; WX 1204 ; N q ; B -10 -288 1210 932 ;
+C 114 ; WX 3613 ; N r ; B -10 -288 3610 932 ;
+C 115 ; WX 1204 ; N s ; B -10 -288 1210 932 ;
+C 116 ; WX 0 ; N t ; B -258 -65 258 662 ;
+C 117 ; WX 1204 ; N u ; B -10 -288 1210 932 ;
+C 118 ; WX 1204 ; N v ; B -10 -288 1210 932 ;
+C 119 ; WX 1204 ; N w ; B -10 -288 1210 932 ;
+C 120 ; WX 0 ; N x ; B -258 -65 258 662 ;
+C 121 ; WX 1204 ; N y ; B -10 -288 1210 932 ;
+C 122 ; WX 1204 ; N z ; B -10 -288 1210 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 128 ; WX 2409 ; N Abreve ; B -10 -288 2410 932 ;
+C 129 ; WX 2409 ; N Aogonek ; B -10 -288 2410 932 ;
+C 130 ; WX 2409 ; N Cacute ; B -10 -288 2410 932 ;
+C 131 ; WX 2409 ; N Ccaron ; B -10 -288 2410 932 ;
+C 132 ; WX 3613 ; N Dcaron ; B -10 -288 3610 932 ;
+C 133 ; WX 3613 ; N Ecaron ; B -10 -288 3610 932 ;
+C 134 ; WX 3613 ; N Eogonek ; B -10 -288 3610 932 ;
+C 135 ; WX 3613 ; N Gbreve ; B -10 -288 3610 932 ;
+C 136 ; WX 2409 ; N Lacute ; B -10 -288 2410 932 ;
+C 137 ; WX 2409 ; N Lcaron ; B -10 -288 2410 932 ;
+C 138 ; WX 2409 ; N Lslash ; B -10 -288 2410 932 ;
+C 139 ; WX 2409 ; N Nacute ; B -10 -288 2410 932 ;
+C 140 ; WX 2409 ; N Ncaron ; B -10 -288 2410 932 ;
+C 141 ; WX 2409 ; N Eng ; B -10 -288 2410 932 ;
+C 142 ; WX 2409 ; N Odblacute ; B -10 -288 2410 932 ;
+C 143 ; WX 2409 ; N Racute ; B -10 -288 2410 932 ;
+C 144 ; WX 2409 ; N Rcaron ; B -10 -288 2410 932 ;
+C 145 ; WX 2409 ; N Sacute ; B -10 -288 2410 932 ;
+C 146 ; WX 2409 ; N Scaron ; B -10 -288 2410 932 ;
+C 147 ; WX 2409 ; N Scedilla ; B -10 -288 2410 932 ;
+C 148 ; WX 3613 ; N Tcaron ; B -10 -288 3610 932 ;
+C 149 ; WX 3613 ; N Tcedilla ; B -10 -288 3610 932 ;
+C 150 ; WX 3613 ; N Udblacute ; B -10 -288 3610 932 ;
+C 151 ; WX 3613 ; N Uring ; B -10 -288 3610 932 ;
+C 152 ; WX 3613 ; N Ydieresis ; B -10 -288 3610 932 ;
+C 153 ; WX 3613 ; N Zacute ; B -10 -288 3610 932 ;
+C 154 ; WX 3613 ; N Zcaron ; B -10 -288 3610 932 ;
+C 155 ; WX 3613 ; N Zdot ; B -10 -288 3610 932 ;
+C 156 ; WX 3613 ; N IJ ; B -10 -288 3610 932 ;
+C 157 ; WX 3613 ; N Idot ; B -10 -288 3610 932 ;
+C 158 ; WX 3613 ; N dmacron ; B -10 -288 3610 932 ;
+C 159 ; WX 3613 ; N section ; B -10 -288 3610 932 ;
+C 160 ; WX 3613 ; N abreve ; B -10 -288 3610 932 ;
+C 161 ; WX 3613 ; N aogonek ; B -10 -288 3610 932 ;
+C 162 ; WX 3613 ; N cacute ; B -10 -288 3610 932 ;
+C 163 ; WX 3613 ; N ccaron ; B -10 -288 3610 932 ;
+C 164 ; WX 4818 ; N dcaron ; B -10 -288 4810 932 ;
+C 165 ; WX 4818 ; N ecaron ; B -10 -288 4810 932 ;
+C 166 ; WX 4818 ; N eogonek ; B -10 -288 4810 932 ;
+C 167 ; WX 4818 ; N gbreve ; B -10 -288 4810 932 ;
+C 168 ; WX 4818 ; N lacute ; B -10 -288 4810 932 ;
+C 169 ; WX 4818 ; N lcaron ; B -10 -288 4810 932 ;
+C 170 ; WX 4818 ; N lslash ; B -10 -288 4810 932 ;
+C 171 ; WX 4818 ; N nacute ; B -10 -288 4810 932 ;
+C 172 ; WX 4818 ; N ncaron ; B -10 -288 4810 932 ;
+C 173 ; WX 4818 ; N eng ; B -10 -288 4810 932 ;
+C 174 ; WX 4818 ; N odblacute ; B -10 -288 4810 932 ;
+C 175 ; WX 4818 ; N racute ; B -10 -288 4810 932 ;
+C 176 ; WX 3613 ; N rcaron ; B -10 -288 3610 932 ;
+C 177 ; WX 3613 ; N sacute ; B -10 -288 3610 932 ;
+C 178 ; WX 3613 ; N scaron ; B -10 -288 3610 932 ;
+C 179 ; WX 3613 ; N scedilla ; B -10 -288 3610 932 ;
+C 180 ; WX 3613 ; N tcaron ; B -10 -288 3610 932 ;
+C 181 ; WX 3613 ; N tcedilla ; B -10 -288 3610 932 ;
+C 182 ; WX 3613 ; N udblacute ; B -10 -288 3610 932 ;
+C 183 ; WX 3613 ; N uring ; B -10 -288 3610 932 ;
+C 184 ; WX 3613 ; N ydieresis ; B -10 -288 3610 932 ;
+C 185 ; WX 3613 ; N zacute ; B -10 -288 3610 932 ;
+C 186 ; WX 3613 ; N zcaron ; B -10 -288 3610 932 ;
+C 187 ; WX 3613 ; N zdot ; B -10 -288 3610 932 ;
+C 188 ; WX 4818 ; N ij ; B -10 -288 4810 932 ;
+C 189 ; WX 4818 ; N exclamdown ; B -10 -288 4810 932 ;
+C 190 ; WX 4818 ; N questiondown ; B -10 -288 4810 932 ;
+C 191 ; WX 4818 ; N sterling ; B -10 -288 4810 932 ;
+C 192 ; WX 4818 ; N Agrave ; B -10 -288 4810 932 ;
+C 193 ; WX 4818 ; N Aacute ; B -10 -288 4810 932 ;
+C 194 ; WX 4818 ; N Acircumflex ; B -10 -288 4810 932 ;
+C 195 ; WX 4818 ; N Atilde ; B -10 -288 4810 932 ;
+C 196 ; WX 4818 ; N Adieresis ; B -10 -288 4810 932 ;
+C 197 ; WX 4818 ; N Aring ; B -10 -288 4810 932 ;
+C 198 ; WX 4818 ; N AE ; B -10 -288 4810 932 ;
+C 199 ; WX 4818 ; N Ccedilla ; B -10 -288 4810 932 ;
+C 200 ; WX 6022 ; N Egrave ; B -10 -288 6010 932 ;
+C 201 ; WX 6022 ; N Eacute ; B -10 -288 6010 932 ;
+C 202 ; WX 6022 ; N Ecircumflex ; B -10 -288 6010 932 ;
+C 203 ; WX 6022 ; N Edieresis ; B -10 -288 6010 932 ;
+C 204 ; WX 7227 ; N Igrave ; B -10 -288 7210 932 ;
+C 205 ; WX 7227 ; N Iacute ; B -10 -288 7210 932 ;
+C 206 ; WX 7227 ; N Icircumflex ; B -10 -288 7210 932 ;
+C 207 ; WX 7227 ; N Idieresis ; B -10 -288 7210 932 ;
+C 208 ; WX 6022 ; N Eth ; B -10 -288 6010 932 ;
+C 209 ; WX 6022 ; N Ntilde ; B -10 -288 6010 932 ;
+C 210 ; WX 6022 ; N Ograve ; B -10 -288 6010 932 ;
+C 211 ; WX 6022 ; N Oacute ; B -10 -288 6010 932 ;
+C 212 ; WX 6022 ; N Ocircumflex ; B -10 -288 6010 932 ;
+C 213 ; WX 6022 ; N Otilde ; B -10 -288 6010 932 ;
+C 214 ; WX 6022 ; N Odieresis ; B -10 -288 6010 932 ;
+C 215 ; WX 6022 ; N OE ; B -10 -288 6010 932 ;
+C 216 ; WX 6022 ; N Oslash ; B -10 -288 6010 932 ;
+C 217 ; WX 6022 ; N Ugrave ; B -10 -288 6010 932 ;
+C 218 ; WX 6022 ; N Uacute ; B -10 -288 6010 932 ;
+C 219 ; WX 6022 ; N Ucircumflex ; B -10 -288 6010 932 ;
+C 220 ; WX 4818 ; N Udieresis ; B -10 -288 4810 932 ;
+C 221 ; WX 4818 ; N Yacute ; B -10 -288 4810 932 ;
+C 222 ; WX 4818 ; N Thorn ; B -10 -288 4810 932 ;
+C 223 ; WX 4818 ; N Germandbls ; B -10 -288 4810 932 ;
+C 224 ; WX 4818 ; N agrave ; B -10 -288 4810 932 ;
+C 225 ; WX 4818 ; N aacute ; B -10 -288 4810 932 ;
+C 226 ; WX 4818 ; N acircumflex ; B -10 -288 4810 932 ;
+C 227 ; WX 4818 ; N atilde ; B -10 -288 4810 932 ;
+C 228 ; WX 4818 ; N adieresis ; B -10 -288 4810 932 ;
+C 229 ; WX 4818 ; N aring ; B -10 -288 4810 932 ;
+C 230 ; WX 4818 ; N ae ; B -10 -288 4810 932 ;
+C 231 ; WX 4818 ; N ccedilla ; B -10 -288 4810 932 ;
+C 232 ; WX 6022 ; N egrave ; B -10 -288 6010 932 ;
+C 233 ; WX 6022 ; N eacute ; B -10 -288 6010 932 ;
+C 234 ; WX 6022 ; N ecircumflex ; B -10 -288 6010 932 ;
+C 235 ; WX 6022 ; N edieresis ; B -10 -288 6010 932 ;
+C 236 ; WX 6022 ; N igrave ; B -10 -288 6010 932 ;
+C 237 ; WX 6022 ; N iacute ; B -10 -288 6010 932 ;
+C 238 ; WX 6022 ; N icircumflex ; B -10 -288 6010 932 ;
+C 239 ; WX 6022 ; N idieresis ; B -10 -288 6010 932 ;
+C 240 ; WX 6022 ; N eth ; B -10 -288 6010 932 ;
+C 241 ; WX 6022 ; N ntilde ; B -10 -288 6010 932 ;
+C 242 ; WX 6022 ; N ograve ; B -10 -288 6010 932 ;
+C 243 ; WX 6022 ; N oacute ; B -10 -288 6010 932 ;
+C 244 ; WX 7227 ; N ocircumflex ; B -10 -288 7210 932 ;
+C 245 ; WX 7227 ; N otilde ; B -10 -288 7210 932 ;
+C 246 ; WX 7227 ; N odieresis ; B -10 -288 7210 932 ;
+C 247 ; WX 7227 ; N oe ; B -10 -288 7210 932 ;
+C 248 ; WX 7227 ; N oslash ; B -10 -288 7210 932 ;
+C 249 ; WX 7227 ; N ugrave ; B -10 -288 7210 932 ;
+C 250 ; WX 7227 ; N uacute ; B -10 -288 7210 932 ;
+C 251 ; WX 7227 ; N ucircumflex ; B -10 -288 7210 932 ;
+C 252 ; WX 7227 ; N udieresis ; B -10 -288 7210 932 ;
+C 253 ; WX 7227 ; N yacute ; B -10 -288 7210 932 ;
+C 254 ; WX 7227 ; N thorn ; B -10 -288 7210 932 ;
+C 255 ; WX 7227 ; N germandbls ; B -10 -288 7210 932 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm
new file mode 100644
index 00000000000..71927804b35
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm
@@ -0,0 +1,259 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:39:06 2010
+FontName KnittingSymbols-grid-outcount-Medium
+FullName KnittingSymbols-grid-outcount
+FamilyName KnittingSymbols-grid-outcount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -635 -288 7210 932
+CapHeight 932
+XHeight 932
+Ascender 932
+Descender -288
+StartCharMetrics 237
+C 0 ; WX 1204 ; N grave ; B -10 -288 1210 932 ;
+C 1 ; WX 1204 ; N acute ; B -10 -288 1210 932 ;
+C 2 ; WX 1204 ; N circumflex ; B -10 -288 1210 932 ;
+C 3 ; WX 1204 ; N tilde ; B -10 -288 1210 932 ;
+C 4 ; WX 1204 ; N dieresis ; B -10 -288 1210 932 ;
+C 5 ; WX 1204 ; N hungarumlaut ; B -10 -288 1210 932 ;
+C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
+C 17 ; WX 1204 ; N quotedblright ; B -10 -288 1210 932 ;
+C 18 ; WX 0 ; N quotedblbase ; B -600 214 410 584 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 20 ; WX 1204 ; N guillemotright ; B -10 -288 1210 932 ;
+C 21 ; WX 1204 ; N endash ; B -10 -288 1210 932 ;
+C 22 ; WX 602 ; N emdash ; B -10 -288 610 932 ;
+C 23 ; WX 1204 ; N compwordmark ; B -10 -288 1210 932 ;
+C 24 ; WX 1204 ; N perthousandzero ; B -10 -288 1210 932 ;
+C 25 ; WX 602 ; N dotlessi ; B -10 -288 610 932 ;
+C 26 ; WX 602 ; N dotlessj ; B -10 -288 610 932 ;
+C 27 ; WX 602 ; N ff ; B -10 -288 610 932 ;
+C 28 ; WX 602 ; N fi ; B -10 -288 610 932 ;
+C 29 ; WX 1204 ; N fl ; B -10 -288 1210 932 ;
+C 30 ; WX 1204 ; N ffi ; B -10 -288 1210 932 ;
+C 31 ; WX 1204 ; N ffl ; B -10 -288 1210 932 ;
+C 33 ; WX 1204 ; N exclam ; B -10 -288 1210 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1204 ; N parenleft ; B -10 -288 1210 932 ;
+C 41 ; WX 1204 ; N parenright ; B -10 -288 1210 932 ;
+C 42 ; WX 1204 ; N asterisk ; B -10 -288 1210 932 ;
+C 43 ; WX 1204 ; N plus ; B -10 -288 1210 932 ;
+C 44 ; WX 0 ; N comma ; B -300 22 300 622 ;
+C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 46 ; WX 0 ; N period ; B -300 22 300 622 ;
+C 47 ; WX 1204 ; N slash ; B -10 -288 1210 932 ;
+C 49 ; WX 1204 ; N one ; B -10 -288 1210 932 ;
+C 50 ; WX 1204 ; N two ; B -10 -288 1210 932 ;
+C 51 ; WX 1204 ; N three ; B -10 -288 1210 932 ;
+C 52 ; WX 1204 ; N four ; B -10 -288 1210 932 ;
+C 53 ; WX 1204 ; N five ; B -10 -288 1210 932 ;
+C 54 ; WX 1204 ; N six ; B -10 -288 1210 932 ;
+C 55 ; WX 2409 ; N seven ; B -10 -288 2410 932 ;
+C 56 ; WX 2409 ; N eight ; B -10 -288 2410 932 ;
+C 57 ; WX 2409 ; N nine ; B -10 -288 2410 932 ;
+C 58 ; WX 1204 ; N colon ; B -10 -288 1210 932 ;
+C 59 ; WX 1204 ; N semicolon ; B -10 -288 1210 932 ;
+C 60 ; WX 1204 ; N less ; B -10 -288 1210 932 ;
+C 61 ; WX 1204 ; N equal ; B -10 -288 1210 932 ;
+C 62 ; WX 1204 ; N greater ; B -10 -288 1210 932 ;
+C 63 ; WX 1204 ; N question ; B -10 -288 1210 932 ;
+C 64 ; WX 1204 ; N at ; B -10 -288 1210 932 ;
+C 65 ; WX 1204 ; N A ; B -10 -288 1210 932 ;
+C 66 ; WX 1204 ; N B ; B -10 -288 1210 932 ;
+C 67 ; WX 1204 ; N C ; B -10 -288 1210 932 ;
+C 68 ; WX 1204 ; N D ; B -10 -288 1210 932 ;
+C 69 ; WX 3613 ; N E ; B -10 -288 3610 932 ;
+C 70 ; WX 0 ; N F ; B -635 287 635 622 ;
+C 71 ; WX 1204 ; N G ; B -10 -288 1210 932 ;
+C 72 ; WX 1204 ; N H ; B -10 -288 1210 932 ;
+C 73 ; WX 1204 ; N I ; B -10 -288 1210 932 ;
+C 74 ; WX 1204 ; N J ; B -10 -288 1210 932 ;
+C 75 ; WX 1204 ; N K ; B -10 -288 1210 932 ;
+C 76 ; WX 1204 ; N L ; B -10 -288 1210 932 ;
+C 77 ; WX 1204 ; N M ; B -10 -288 1210 932 ;
+C 78 ; WX 1204 ; N N ; B -10 -288 1210 932 ;
+C 79 ; WX 1204 ; N O ; B -10 -288 1210 932 ;
+C 80 ; WX 1204 ; N P ; B -10 -288 1210 932 ;
+C 81 ; WX 1204 ; N Q ; B -10 -288 1210 932 ;
+C 82 ; WX 1204 ; N R ; B -10 -288 1210 932 ;
+C 83 ; WX 1204 ; N S ; B -10 -288 1210 932 ;
+C 84 ; WX 1204 ; N T ; B -10 -288 1210 932 ;
+C 85 ; WX 1204 ; N U ; B -35 -288 1235 932 ;
+C 86 ; WX 2409 ; N V ; B -10 -288 2410 932 ;
+C 87 ; WX 3613 ; N W ; B -10 -288 3610 932 ;
+C 88 ; WX 1204 ; N X ; B -10 -288 1210 932 ;
+C 89 ; WX 3613 ; N Y ; B -10 -288 3610 932 ;
+C 90 ; WX 3613 ; N Z ; B -10 -288 3610 932 ;
+C 91 ; WX 1204 ; N bracketleft ; B -10 -288 1210 932 ;
+C 93 ; WX 1204 ; N bracketright ; B -10 -288 1210 932 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 1204 ; N a ; B -10 -288 1210 932 ;
+C 98 ; WX 1204 ; N b ; B -10 -288 1210 932 ;
+C 99 ; WX 1204 ; N c ; B -10 -288 1210 932 ;
+C 100 ; WX 1204 ; N d ; B -10 -288 1210 932 ;
+C 101 ; WX 1204 ; N e ; B -10 -288 1210 932 ;
+C 102 ; WX 0 ; N f ; B -635 287 635 622 ;
+C 103 ; WX 1204 ; N g ; B -10 -288 1210 932 ;
+C 104 ; WX 0 ; N h ; B -140 -63 140 672 ;
+C 105 ; WX 1204 ; N i ; B -10 -288 1210 932 ;
+C 106 ; WX 1204 ; N j ; B -10 -288 1210 932 ;
+C 107 ; WX 1204 ; N k ; B -10 -288 1210 932 ;
+C 108 ; WX 1204 ; N l ; B -10 -288 1210 932 ;
+C 109 ; WX 1204 ; N m ; B -10 -288 1210 932 ;
+C 110 ; WX 1204 ; N n ; B -10 -288 1210 932 ;
+C 111 ; WX 1204 ; N o ; B -10 -288 1210 932 ;
+C 112 ; WX 1204 ; N p ; B -10 -288 1210 932 ;
+C 113 ; WX 1204 ; N q ; B -10 -288 1210 932 ;
+C 114 ; WX 1204 ; N r ; B -10 -288 1210 932 ;
+C 115 ; WX 1204 ; N s ; B -10 -288 1210 932 ;
+C 116 ; WX 1204 ; N t ; B -10 -288 1210 932 ;
+C 117 ; WX 2409 ; N u ; B -10 -288 2410 932 ;
+C 118 ; WX 2409 ; N v ; B -10 -288 2410 932 ;
+C 119 ; WX 3613 ; N w ; B -10 -288 3610 932 ;
+C 120 ; WX 1204 ; N x ; B -10 -288 1210 932 ;
+C 121 ; WX 2409 ; N y ; B -10 -288 2410 932 ;
+C 122 ; WX 2409 ; N z ; B -10 -288 2410 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 128 ; WX 2409 ; N Abreve ; B -10 -288 2410 932 ;
+C 129 ; WX 2409 ; N Aogonek ; B -10 -288 2410 932 ;
+C 130 ; WX 2409 ; N Cacute ; B -10 -288 2410 932 ;
+C 131 ; WX 2409 ; N Ccaron ; B -10 -288 2410 932 ;
+C 132 ; WX 3613 ; N Dcaron ; B -10 -288 3610 932 ;
+C 133 ; WX 3613 ; N Ecaron ; B -10 -288 3610 932 ;
+C 134 ; WX 3613 ; N Eogonek ; B -10 -288 3610 932 ;
+C 135 ; WX 3613 ; N Gbreve ; B -10 -288 3610 932 ;
+C 136 ; WX 2409 ; N Lacute ; B -10 -288 2410 932 ;
+C 137 ; WX 2409 ; N Lcaron ; B -10 -288 2410 932 ;
+C 138 ; WX 2409 ; N Lslash ; B -10 -288 2410 932 ;
+C 139 ; WX 2409 ; N Nacute ; B -10 -288 2410 932 ;
+C 140 ; WX 2409 ; N Ncaron ; B -10 -288 2410 932 ;
+C 141 ; WX 2409 ; N Eng ; B -10 -288 2410 932 ;
+C 142 ; WX 2409 ; N Odblacute ; B -10 -288 2410 932 ;
+C 143 ; WX 2409 ; N Racute ; B -10 -288 2410 932 ;
+C 144 ; WX 2409 ; N Rcaron ; B -10 -288 2410 932 ;
+C 145 ; WX 2409 ; N Sacute ; B -10 -288 2410 932 ;
+C 146 ; WX 2409 ; N Scaron ; B -10 -288 2410 932 ;
+C 147 ; WX 2409 ; N Scedilla ; B -10 -288 2410 932 ;
+C 148 ; WX 3613 ; N Tcaron ; B -10 -288 3610 932 ;
+C 149 ; WX 3613 ; N Tcedilla ; B -10 -288 3610 932 ;
+C 150 ; WX 3613 ; N Udblacute ; B -10 -288 3610 932 ;
+C 151 ; WX 3613 ; N Uring ; B -10 -288 3610 932 ;
+C 152 ; WX 3613 ; N Ydieresis ; B -10 -288 3610 932 ;
+C 153 ; WX 3613 ; N Zacute ; B -10 -288 3610 932 ;
+C 154 ; WX 3613 ; N Zcaron ; B -10 -288 3610 932 ;
+C 155 ; WX 3613 ; N Zdot ; B -10 -288 3610 932 ;
+C 156 ; WX 3613 ; N IJ ; B -10 -288 3610 932 ;
+C 157 ; WX 3613 ; N Idot ; B -10 -288 3610 932 ;
+C 158 ; WX 3613 ; N dmacron ; B -10 -288 3610 932 ;
+C 159 ; WX 3613 ; N section ; B -10 -288 3610 932 ;
+C 160 ; WX 3613 ; N abreve ; B -10 -288 3610 932 ;
+C 161 ; WX 3613 ; N aogonek ; B -10 -288 3610 932 ;
+C 162 ; WX 3613 ; N cacute ; B -10 -288 3610 932 ;
+C 163 ; WX 3613 ; N ccaron ; B -10 -288 3610 932 ;
+C 164 ; WX 4818 ; N dcaron ; B -10 -288 4810 932 ;
+C 165 ; WX 4818 ; N ecaron ; B -10 -288 4810 932 ;
+C 166 ; WX 4818 ; N eogonek ; B -10 -288 4810 932 ;
+C 167 ; WX 4818 ; N gbreve ; B -10 -288 4810 932 ;
+C 168 ; WX 4818 ; N lacute ; B -10 -288 4810 932 ;
+C 169 ; WX 4818 ; N lcaron ; B -10 -288 4810 932 ;
+C 170 ; WX 4818 ; N lslash ; B -10 -288 4810 932 ;
+C 171 ; WX 4818 ; N nacute ; B -10 -288 4810 932 ;
+C 172 ; WX 4818 ; N ncaron ; B -10 -288 4810 932 ;
+C 173 ; WX 4818 ; N eng ; B -10 -288 4810 932 ;
+C 174 ; WX 4818 ; N odblacute ; B -10 -288 4810 932 ;
+C 175 ; WX 4818 ; N racute ; B -10 -288 4810 932 ;
+C 176 ; WX 3613 ; N rcaron ; B -10 -288 3610 932 ;
+C 177 ; WX 3613 ; N sacute ; B -10 -288 3610 932 ;
+C 178 ; WX 3613 ; N scaron ; B -10 -288 3610 932 ;
+C 179 ; WX 3613 ; N scedilla ; B -10 -288 3610 932 ;
+C 180 ; WX 3613 ; N tcaron ; B -10 -288 3610 932 ;
+C 181 ; WX 3613 ; N tcedilla ; B -10 -288 3610 932 ;
+C 182 ; WX 3613 ; N udblacute ; B -10 -288 3610 932 ;
+C 183 ; WX 3613 ; N uring ; B -10 -288 3610 932 ;
+C 184 ; WX 3613 ; N ydieresis ; B -10 -288 3610 932 ;
+C 185 ; WX 3613 ; N zacute ; B -10 -288 3610 932 ;
+C 186 ; WX 3613 ; N zcaron ; B -10 -288 3610 932 ;
+C 187 ; WX 3613 ; N zdot ; B -10 -288 3610 932 ;
+C 188 ; WX 4818 ; N ij ; B -10 -288 4810 932 ;
+C 189 ; WX 4818 ; N exclamdown ; B -10 -288 4810 932 ;
+C 190 ; WX 4818 ; N questiondown ; B -10 -288 4810 932 ;
+C 191 ; WX 4818 ; N sterling ; B -10 -288 4810 932 ;
+C 192 ; WX 4818 ; N Agrave ; B -10 -288 4810 932 ;
+C 193 ; WX 4818 ; N Aacute ; B -10 -288 4810 932 ;
+C 194 ; WX 4818 ; N Acircumflex ; B -10 -288 4810 932 ;
+C 195 ; WX 4818 ; N Atilde ; B -10 -288 4810 932 ;
+C 196 ; WX 4818 ; N Adieresis ; B -10 -288 4810 932 ;
+C 197 ; WX 4818 ; N Aring ; B -10 -288 4810 932 ;
+C 198 ; WX 4818 ; N AE ; B -10 -288 4810 932 ;
+C 199 ; WX 4818 ; N Ccedilla ; B -10 -288 4810 932 ;
+C 200 ; WX 6022 ; N Egrave ; B -10 -288 6010 932 ;
+C 201 ; WX 6022 ; N Eacute ; B -10 -288 6010 932 ;
+C 202 ; WX 6022 ; N Ecircumflex ; B -10 -288 6010 932 ;
+C 203 ; WX 6022 ; N Edieresis ; B -10 -288 6010 932 ;
+C 204 ; WX 7227 ; N Igrave ; B -10 -288 7210 932 ;
+C 205 ; WX 7227 ; N Iacute ; B -10 -288 7210 932 ;
+C 206 ; WX 7227 ; N Icircumflex ; B -10 -288 7210 932 ;
+C 207 ; WX 7227 ; N Idieresis ; B -10 -288 7210 932 ;
+C 208 ; WX 6022 ; N Eth ; B -10 -288 6010 932 ;
+C 209 ; WX 6022 ; N Ntilde ; B -10 -288 6010 932 ;
+C 210 ; WX 6022 ; N Ograve ; B -10 -288 6010 932 ;
+C 211 ; WX 6022 ; N Oacute ; B -10 -288 6010 932 ;
+C 212 ; WX 6022 ; N Ocircumflex ; B -10 -288 6010 932 ;
+C 213 ; WX 6022 ; N Otilde ; B -10 -288 6010 932 ;
+C 214 ; WX 6022 ; N Odieresis ; B -10 -288 6010 932 ;
+C 215 ; WX 6022 ; N OE ; B -10 -288 6010 932 ;
+C 216 ; WX 6022 ; N Oslash ; B -10 -288 6010 932 ;
+C 217 ; WX 6022 ; N Ugrave ; B -10 -288 6010 932 ;
+C 218 ; WX 6022 ; N Uacute ; B -10 -288 6010 932 ;
+C 219 ; WX 6022 ; N Ucircumflex ; B -10 -288 6010 932 ;
+C 220 ; WX 4818 ; N Udieresis ; B -10 -288 4810 932 ;
+C 221 ; WX 4818 ; N Yacute ; B -10 -288 4810 932 ;
+C 222 ; WX 4818 ; N Thorn ; B -10 -288 4810 932 ;
+C 223 ; WX 4818 ; N Germandbls ; B -10 -288 4810 932 ;
+C 224 ; WX 4818 ; N agrave ; B -10 -288 4810 932 ;
+C 225 ; WX 4818 ; N aacute ; B -10 -288 4810 932 ;
+C 226 ; WX 4818 ; N acircumflex ; B -10 -288 4810 932 ;
+C 227 ; WX 4818 ; N atilde ; B -10 -288 4810 932 ;
+C 228 ; WX 4818 ; N adieresis ; B -10 -288 4810 932 ;
+C 229 ; WX 4818 ; N aring ; B -10 -288 4810 932 ;
+C 230 ; WX 4818 ; N ae ; B -10 -288 4810 932 ;
+C 231 ; WX 4818 ; N ccedilla ; B -10 -288 4810 932 ;
+C 232 ; WX 6022 ; N egrave ; B -10 -288 6010 932 ;
+C 233 ; WX 6022 ; N eacute ; B -10 -288 6010 932 ;
+C 234 ; WX 6022 ; N ecircumflex ; B -10 -288 6010 932 ;
+C 235 ; WX 6022 ; N edieresis ; B -10 -288 6010 932 ;
+C 236 ; WX 6022 ; N igrave ; B -10 -288 6010 932 ;
+C 237 ; WX 6022 ; N iacute ; B -10 -288 6010 932 ;
+C 238 ; WX 6022 ; N icircumflex ; B -10 -288 6010 932 ;
+C 239 ; WX 6022 ; N idieresis ; B -10 -288 6010 932 ;
+C 240 ; WX 6022 ; N eth ; B -10 -288 6010 932 ;
+C 241 ; WX 6022 ; N ntilde ; B -10 -288 6010 932 ;
+C 242 ; WX 6022 ; N ograve ; B -10 -288 6010 932 ;
+C 243 ; WX 6022 ; N oacute ; B -10 -288 6010 932 ;
+C 244 ; WX 7227 ; N ocircumflex ; B -10 -288 7210 932 ;
+C 245 ; WX 7227 ; N otilde ; B -10 -288 7210 932 ;
+C 246 ; WX 7227 ; N odieresis ; B -10 -288 7210 932 ;
+C 247 ; WX 7227 ; N oe ; B -10 -288 7210 932 ;
+C 248 ; WX 7227 ; N oslash ; B -10 -288 7210 932 ;
+C 249 ; WX 7227 ; N ugrave ; B -10 -288 7210 932 ;
+C 250 ; WX 7227 ; N uacute ; B -10 -288 7210 932 ;
+C 251 ; WX 7227 ; N ucircumflex ; B -10 -288 7210 932 ;
+C 252 ; WX 7227 ; N udieresis ; B -10 -288 7210 932 ;
+C 253 ; WX 7227 ; N yacute ; B -10 -288 7210 932 ;
+C 254 ; WX 7227 ; N thorn ; B -10 -288 7210 932 ;
+C 255 ; WX 7227 ; N germandbls ; B -10 -288 7210 932 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitgg.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitgg.afm
index db766b56323..73e7e85a2cd 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitgg.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitgg.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:18 2010
+Comment Creation Date: Sun Aug 29 08:39:27 2010
FontName KnittingSymbols-grid-grid-Medium
FullName KnittingSymbols-grid-grid
FamilyName KnittingSymbols-grid-grid
@@ -17,7 +17,7 @@ CapHeight 937
XHeight 937
Ascender 937
Descender -293
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1204 ; N grave ; B -15 -293 1215 937 ;
C 1 ; WX 1204 ; N acute ; B -15 -293 1215 937 ;
C 2 ; WX 1204 ; N circumflex ; B -15 -293 1215 937 ;
@@ -27,7 +27,7 @@ C 5 ; WX 1204 ; N hungarumlaut ; B -15 -293 1215 937 ;
C 6 ; WX 0 ; N ring ; B -15 -293 15 937 ;
C 17 ; WX 1204 ; N quotedblright ; B -15 -293 1215 937 ;
C 18 ; WX 1204 ; N quotedblbase ; B -15 -293 1215 937 ;
-C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ;
+C 19 ; WX 1204 ; N guillemotleft ; B 0 0 0 0 ;
C 20 ; WX 1204 ; N guillemotright ; B -15 -293 1215 937 ;
C 21 ; WX 1204 ; N endash ; B -15 -293 1215 937 ;
C 22 ; WX 602 ; N emdash ; B 0 -293 600 937 ;
@@ -41,7 +41,7 @@ C 29 ; WX 1204 ; N fl ; B 0 -293 1200 937 ;
C 30 ; WX 1204 ; N ffi ; B 0 -293 1200 937 ;
C 31 ; WX 6022 ; N ffl ; B -15 -293 6015 937 ;
C 33 ; WX 1204 ; N exclam ; B -15 -293 1215 937 ;
-C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ;
+C 34 ; WX 1204 ; N quotedbl ; B 0 0 0 0 ;
C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ;
C 40 ; WX 1204 ; N parenleft ; B -15 -293 1215 937 ;
C 41 ; WX 1204 ; N parenright ; B -15 -293 1215 937 ;
@@ -56,6 +56,10 @@ C 50 ; WX 1204 ; N two ; B -15 -293 1215 937 ;
C 51 ; WX 1204 ; N three ; B -15 -293 1215 937 ;
C 52 ; WX 1204 ; N four ; B -15 -293 1215 937 ;
C 53 ; WX 1204 ; N five ; B -15 -293 1215 937 ;
+C 54 ; WX 1204 ; N six ; B -15 -293 1215 937 ;
+C 55 ; WX 1204 ; N seven ; B -15 -293 1215 937 ;
+C 56 ; WX 1204 ; N eight ; B -15 -293 1215 937 ;
+C 57 ; WX 1204 ; N nine ; B -15 -293 1215 937 ;
C 58 ; WX 1204 ; N colon ; B -15 -293 1215 937 ;
C 59 ; WX 1204 ; N semicolon ; B -15 -293 1215 937 ;
C 60 ; WX 1204 ; N less ; B -15 -293 1215 937 ;
@@ -118,7 +122,9 @@ C 119 ; WX 1204 ; N w ; B -15 -293 1215 937 ;
C 120 ; WX 1204 ; N x ; B -15 -293 1215 937 ;
C 121 ; WX 1204 ; N y ; B -15 -293 1215 937 ;
C 122 ; WX 1204 ; N z ; B -15 -293 1215 937 ;
+C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 151 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B -15 -293 1215 937 ;
C 128 ; WX 2409 ; N Abreve ; B -15 -293 2415 937 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm
index acef6098108..bd22d5ea4e3 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:15 2010
+Comment Creation Date: Sun Aug 29 08:39:24 2010
FontName KnittingSymbols-grid-foreground-Medium
FullName KnittingSymbols-grid-foreground
FamilyName KnittingSymbols-grid-foreground
@@ -16,7 +16,7 @@ FontBBox -35 -293 5611 937
CapHeight 688
XHeight 662
Ascender 712
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1204 ; N grave ; B 80 -198 1120 842 ;
C 1 ; WX 1204 ; N acute ; B 265 472 935 842 ;
C 2 ; WX 1204 ; N circumflex ; B 265 472 935 842 ;
@@ -52,9 +52,13 @@ C 46 ; WX 1204 ; N period ; B 300 22 900 622 ;
C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ;
C 49 ; WX 1204 ; N one ; B 190 214 1200 584 ;
C 50 ; WX 1204 ; N two ; B 260 -18 940 662 ;
-C 51 ; WX 1204 ; N three ; B 210 -68 950 712 ;
+C 51 ; WX 1204 ; N three ; B 210 -68 990 712 ;
C 52 ; WX 1204 ; N four ; B 263 -18 937 662 ;
C 53 ; WX 1204 ; N five ; B 263 -18 937 662 ;
+C 54 ; WX 1204 ; N six ; B 250 -18 950 662 ;
+C 55 ; WX 1204 ; N seven ; B 356 -28 804 672 ;
+C 56 ; WX 1204 ; N eight ; B 396 -28 844 672 ;
+C 57 ; WX 1204 ; N nine ; B 80 -88 1120 672 ;
C 58 ; WX 1204 ; N colon ; B 260 -18 900 662 ;
C 59 ; WX 1204 ; N semicolon ; B 300 -18 940 662 ;
C 60 ; WX 1204 ; N less ; B 300 -18 940 662 ;
@@ -62,7 +66,7 @@ C 61 ; WX 1204 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 1204 ; N greater ; B 260 -18 900 662 ;
C 63 ; WX 1204 ; N question ; B 210 -28 1200 712 ;
C 64 ; WX 1204 ; N at ; B 307 29 893 615 ;
-C 65 ; WX 1204 ; N A ; B 210 -68 950 712 ;
+C 65 ; WX 1204 ; N A ; B 210 -68 990 712 ;
C 66 ; WX 1204 ; N B ; B 342 -18 858 710 ;
C 67 ; WX 1204 ; N C ; B 0 0 0 0 ;
C 68 ; WX 1204 ; N D ; B 0 0 0 0 ;
@@ -73,13 +77,13 @@ C 72 ; WX 1204 ; N H ; B 460 -28 740 707 ;
C 73 ; WX 1204 ; N I ; B 300 -18 964 688 ;
C 74 ; WX 1204 ; N J ; B 236 -18 900 688 ;
C 75 ; WX 1204 ; N K ; B 0 0 0 0 ;
-C 76 ; WX 1204 ; N L ; B 250 -68 990 712 ;
+C 76 ; WX 1204 ; N L ; B 250 -69 990 712 ;
C 77 ; WX 1204 ; N M ; B 300 112 900 532 ;
C 78 ; WX 1204 ; N N ; B 0 0 0 0 ;
C 79 ; WX 1204 ; N O ; B 260 -18 940 662 ;
C 80 ; WX 1204 ; N P ; B 0 0 0 0 ;
C 81 ; WX 1204 ; N Q ; B 342 -18 858 710 ;
-C 82 ; WX 1204 ; N R ; B 210 -68 950 712 ;
+C 82 ; WX 1204 ; N R ; B 210 -69 950 712 ;
C 83 ; WX 1204 ; N S ; B 215 182 950 462 ;
C 84 ; WX 1204 ; N T ; B 342 -65 858 662 ;
C 85 ; WX 1204 ; N U ; B -35 22 1235 622 ;
@@ -117,7 +121,9 @@ C 119 ; WX 1204 ; N w ; B 210 -68 990 712 ;
C 120 ; WX 1204 ; N x ; B 342 -65 858 662 ;
C 121 ; WX 1204 ; N y ; B 263 -18 937 662 ;
C 122 ; WX 1204 ; N z ; B 250 -28 950 672 ;
+C 123 ; WX 636 ; N braceleft ; B 148 84 500 541 ;
C 124 ; WX 151 ; N bar ; B 0 -293 150 937 ;
+C 125 ; WX 636 ; N braceright ; B 133 84 485 541 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ;
C 128 ; WX 2409 ; N Abreve ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitgp.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitgp.afm
index 815ff228cb3..09ff6300a92 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitgp.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitgp.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:19 2010
+Comment Creation Date: Sun Aug 29 08:39:29 2010
FontName KnittingSymbols-grid-purl-Medium
FullName KnittingSymbols-grid-purl
FamilyName KnittingSymbols-grid-purl
@@ -15,7 +15,7 @@ EncodingScheme FontSpecific
FontBBox 0 -278 7200 922
CapHeight 922
Descender -278
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1204 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 1204 ; N acute ; B 0 0 0 0 ;
C 2 ; WX 1204 ; N circumflex ; B 0 -278 1200 922 ;
@@ -54,6 +54,10 @@ C 50 ; WX 1204 ; N two ; B 0 -278 1200 922 ;
C 51 ; WX 1204 ; N three ; B 0 -278 1200 922 ;
C 52 ; WX 1204 ; N four ; B 0 0 0 0 ;
C 53 ; WX 1204 ; N five ; B 0 0 0 0 ;
+C 54 ; WX 1204 ; N six ; B 0 0 0 0 ;
+C 55 ; WX 1204 ; N seven ; B 0 0 0 0 ;
+C 56 ; WX 1204 ; N eight ; B 0 0 0 0 ;
+C 57 ; WX 1204 ; N nine ; B 0 0 0 0 ;
C 58 ; WX 1204 ; N colon ; B 0 -278 1200 922 ;
C 59 ; WX 1204 ; N semicolon ; B 0 -278 1200 922 ;
C 60 ; WX 1204 ; N less ; B 0 0 0 0 ;
@@ -116,7 +120,9 @@ C 119 ; WX 1204 ; N w ; B 0 0 0 0 ;
C 120 ; WX 1204 ; N x ; B 0 0 0 0 ;
C 121 ; WX 1204 ; N y ; B 0 0 0 0 ;
C 122 ; WX 1204 ; N z ; B 0 0 0 0 ;
+C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 151 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ;
C 128 ; WX 2409 ; N Abreve ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm
new file mode 100644
index 00000000000..d4308b4caa8
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm
@@ -0,0 +1,149 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:38:47 2010
+FontName KnittingSymbols-nogrid-incount-Medium
+FullName KnittingSymbols-nogrid-incount
+FamilyName KnittingSymbols-nogrid-incount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -1035 -288 6010 932
+CapHeight 738
+XHeight 712
+Ascender 932
+Descender -288
+StartCharMetrics 127
+C 0 ; WX 1204 ; N grave ; B -10 -288 1210 932 ;
+C 1 ; WX 1204 ; N acute ; B -10 -288 1210 932 ;
+C 2 ; WX 1204 ; N circumflex ; B -10 -288 1210 932 ;
+C 3 ; WX 1204 ; N tilde ; B -10 -288 1210 932 ;
+C 4 ; WX 1204 ; N dieresis ; B -10 -288 1210 932 ;
+C 5 ; WX 0 ; N hungarumlaut ; B -1000 652 200 722 ;
+C 6 ; WX 0 ; N ring ; B -1000 -78 200 -8 ;
+C 7 ; WX 0 ; N caron ; B -200 652 1000 722 ;
+C 8 ; WX 0 ; N breve ; B -200 -78 1000 -8 ;
+C 9 ; WX 0 ; N macron ; B -1000 -78 -200 -8 ;
+C 10 ; WX 0 ; N dotaccent ; B -1000 652 -200 722 ;
+C 11 ; WX 0 ; N cedilla ; B 200 652 1000 722 ;
+C 12 ; WX 0 ; N ogonek ; B 200 -78 1000 -8 ;
+C 13 ; WX 0 ; N quotesinglbase ; B -235 -78 235 722 ;
+C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
+C 17 ; WX 1204 ; N quotedblright ; B -10 -288 1210 932 ;
+C 18 ; WX 1204 ; N quotedblbase ; B -10 -288 1210 932 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 22 ; WX 602 ; N emdash ; B -10 -288 610 932 ;
+C 23 ; WX 1204 ; N compwordmark ; B -10 -288 1210 932 ;
+C 24 ; WX 1204 ; N perthousandzero ; B -10 -288 1210 932 ;
+C 25 ; WX 602 ; N dotlessi ; B -10 -288 610 932 ;
+C 26 ; WX 602 ; N dotlessj ; B -10 -288 610 932 ;
+C 27 ; WX 602 ; N ff ; B -10 -288 610 932 ;
+C 28 ; WX 602 ; N fi ; B -10 -288 610 932 ;
+C 29 ; WX 1204 ; N fl ; B -10 -288 1210 932 ;
+C 30 ; WX 1204 ; N ffi ; B -10 -288 1210 932 ;
+C 31 ; WX 6022 ; N ffl ; B -10 -288 6010 932 ;
+C 33 ; WX 2409 ; N exclam ; B -10 -288 2410 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1204 ; N parenleft ; B -10 -288 1210 932 ;
+C 41 ; WX 1204 ; N parenright ; B -10 -288 1210 932 ;
+C 42 ; WX 1204 ; N asterisk ; B -10 -288 1210 932 ;
+C 43 ; WX 1204 ; N plus ; B -10 -288 1210 932 ;
+C 44 ; WX 0 ; N comma ; B 0 0 0 0 ;
+C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 46 ; WX 0 ; N period ; B 0 0 0 0 ;
+C 47 ; WX 1204 ; N slash ; B -10 -288 1210 932 ;
+C 49 ; WX 1204 ; N one ; B -10 -288 1210 932 ;
+C 50 ; WX 2409 ; N two ; B -10 -288 2410 932 ;
+C 51 ; WX 3613 ; N three ; B -10 -288 3610 932 ;
+C 52 ; WX 2409 ; N four ; B -10 -288 2410 932 ;
+C 53 ; WX 2409 ; N five ; B -10 -288 2410 932 ;
+C 54 ; WX 1204 ; N six ; B -10 -288 1210 932 ;
+C 55 ; WX 1204 ; N seven ; B -10 -288 1210 932 ;
+C 56 ; WX 1204 ; N eight ; B -10 -288 1210 932 ;
+C 57 ; WX 1204 ; N nine ; B -10 -288 1210 932 ;
+C 58 ; WX 2409 ; N colon ; B -10 -288 2410 932 ;
+C 59 ; WX 2409 ; N semicolon ; B -10 -288 2410 932 ;
+C 60 ; WX 2409 ; N less ; B -10 -288 2410 932 ;
+C 61 ; WX 1204 ; N equal ; B -10 -288 1210 932 ;
+C 62 ; WX 2409 ; N greater ; B -10 -288 2410 932 ;
+C 63 ; WX 1204 ; N question ; B -10 -288 1210 932 ;
+C 64 ; WX 1204 ; N at ; B -10 -288 1210 932 ;
+C 65 ; WX 3613 ; N A ; B -10 -288 3610 932 ;
+C 66 ; WX 1204 ; N B ; B -10 -288 1210 932 ;
+C 67 ; WX 1204 ; N C ; B -10 -288 1210 932 ;
+C 68 ; WX 2409 ; N D ; B -10 -288 2410 932 ;
+C 69 ; WX 1204 ; N E ; B -10 -288 1210 932 ;
+C 70 ; WX 1204 ; N F ; B -35 -288 1235 932 ;
+C 71 ; WX 1204 ; N G ; B -10 -288 1210 932 ;
+C 72 ; WX 0 ; N H ; B -157 -78 157 757 ;
+C 73 ; WX 0 ; N I ; B -350 -68 414 738 ;
+C 74 ; WX 0 ; N J ; B -414 -68 350 738 ;
+C 75 ; WX 1204 ; N K ; B -10 -288 1210 932 ;
+C 76 ; WX 3613 ; N L ; B -10 -288 3610 932 ;
+C 77 ; WX 0 ; N M ; B -300 112 300 532 ;
+C 78 ; WX 0 ; N N ; B -300 15 300 435 ;
+C 79 ; WX 0 ; N O ; B -390 -68 390 712 ;
+C 80 ; WX 1204 ; N P ; B -10 -288 1210 932 ;
+C 81 ; WX 1204 ; N Q ; B -10 -288 1210 932 ;
+C 82 ; WX 3613 ; N R ; B -10 -288 3610 932 ;
+C 83 ; WX 1204 ; N S ; B -10 -288 1210 932 ;
+C 84 ; WX 0 ; N T ; B -297 -115 297 712 ;
+C 85 ; WX 0 ; N U ; B -350 -28 350 672 ;
+C 86 ; WX 1204 ; N V ; B -10 -288 1210 932 ;
+C 87 ; WX 1204 ; N W ; B -10 -288 1210 932 ;
+C 88 ; WX 0 ; N X ; B -297 -115 297 712 ;
+C 89 ; WX 1204 ; N Y ; B -10 -288 1210 932 ;
+C 90 ; WX 1204 ; N Z ; B -10 -288 1210 932 ;
+C 91 ; WX 1204 ; N bracketleft ; B -10 -288 1210 932 ;
+C 93 ; WX 1204 ; N bracketright ; B -10 -288 1210 932 ;
+C 94 ; WX 0 ; N asciicircum ; B -1035 652 1035 722 ;
+C 95 ; WX 0 ; N underscore ; B -1035 -78 1035 -8 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 3613 ; N a ; B -10 -288 3610 932 ;
+C 98 ; WX 1204 ; N b ; B -10 -288 1210 932 ;
+C 99 ; WX 1204 ; N c ; B -10 -288 1210 932 ;
+C 100 ; WX 2409 ; N d ; B -10 -288 2410 932 ;
+C 101 ; WX 0 ; N e ; B -300 210 300 630 ;
+C 102 ; WX 1204 ; N f ; B -35 -288 1235 932 ;
+C 103 ; WX 1204 ; N g ; B -10 -288 1210 932 ;
+C 104 ; WX 1204 ; N h ; B -10 -288 1210 932 ;
+C 105 ; WX 0 ; N i ; B -350 -68 414 738 ;
+C 106 ; WX 0 ; N j ; B -414 -68 350 738 ;
+C 107 ; WX 1204 ; N k ; B -10 -288 1210 932 ;
+C 108 ; WX 3613 ; N l ; B -10 -288 3610 932 ;
+C 109 ; WX 0 ; N m ; B -300 112 300 532 ;
+C 110 ; WX 0 ; N n ; B -300 210 300 630 ;
+C 111 ; WX 2409 ; N o ; B -10 -288 2410 932 ;
+C 112 ; WX 1204 ; N p ; B -10 -288 1210 932 ;
+C 113 ; WX 1204 ; N q ; B -10 -288 1210 932 ;
+C 114 ; WX 3613 ; N r ; B -10 -288 3610 932 ;
+C 115 ; WX 1204 ; N s ; B -10 -288 1210 932 ;
+C 116 ; WX 0 ; N t ; B -297 -115 297 712 ;
+C 117 ; WX 1204 ; N u ; B -10 -288 1210 932 ;
+C 118 ; WX 1204 ; N v ; B -10 -288 1210 932 ;
+C 119 ; WX 1204 ; N w ; B -10 -288 1210 932 ;
+C 120 ; WX 0 ; N x ; B -297 -115 297 712 ;
+C 121 ; WX 1204 ; N y ; B -10 -288 1210 932 ;
+C 122 ; WX 1204 ; N z ; B -10 -288 1210 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 128 ; WX 1204 ; N Abreve ; B -10 -288 1210 932 ;
+C 129 ; WX 1204 ; N Aogonek ; B -10 -288 1210 932 ;
+C 130 ; WX 1204 ; N Cacute ; B -10 -288 1210 932 ;
+C 131 ; WX 1204 ; N Ccaron ; B -10 -288 1210 932 ;
+C 132 ; WX 0 ; N Dcaron ; B -300 210 300 630 ;
+C 133 ; WX 0 ; N Ecaron ; B -300 210 300 630 ;
+C 134 ; WX 0 ; N Eogonek ; B -300 15 300 435 ;
+C 135 ; WX 2409 ; N Gbreve ; B -10 -288 2410 932 ;
+C 136 ; WX 2409 ; N Lacute ; B -10 -288 2410 932 ;
+C 137 ; WX 2409 ; N Lcaron ; B -10 -288 2410 932 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm
new file mode 100644
index 00000000000..f4d112f1252
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm
@@ -0,0 +1,149 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:38:51 2010
+FontName KnittingSymbols-nogrid-outcount-Medium
+FullName KnittingSymbols-nogrid-outcount
+FamilyName KnittingSymbols-nogrid-outcount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -1035 -288 3610 932
+CapHeight 932
+XHeight 932
+Ascender 932
+Descender -288
+StartCharMetrics 127
+C 0 ; WX 1204 ; N grave ; B -10 -288 1210 932 ;
+C 1 ; WX 1204 ; N acute ; B -10 -288 1210 932 ;
+C 2 ; WX 1204 ; N circumflex ; B -10 -288 1210 932 ;
+C 3 ; WX 1204 ; N tilde ; B -10 -288 1210 932 ;
+C 4 ; WX 1204 ; N dieresis ; B -10 -288 1210 932 ;
+C 5 ; WX 0 ; N hungarumlaut ; B -1000 652 200 722 ;
+C 6 ; WX 0 ; N ring ; B -1000 -78 200 -8 ;
+C 7 ; WX 0 ; N caron ; B -200 652 1000 722 ;
+C 8 ; WX 0 ; N breve ; B -200 -78 1000 -8 ;
+C 9 ; WX 0 ; N macron ; B -1000 -78 -200 -8 ;
+C 10 ; WX 0 ; N dotaccent ; B -1000 652 -200 722 ;
+C 11 ; WX 0 ; N cedilla ; B 200 652 1000 722 ;
+C 12 ; WX 0 ; N ogonek ; B 200 -78 1000 -8 ;
+C 13 ; WX 0 ; N quotesinglbase ; B -235 -78 235 722 ;
+C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
+C 17 ; WX 1204 ; N quotedblright ; B -10 -288 1210 932 ;
+C 18 ; WX 0 ; N quotedblbase ; B -600 -68 460 712 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 22 ; WX 602 ; N emdash ; B -10 -288 610 932 ;
+C 23 ; WX 1204 ; N compwordmark ; B -10 -288 1210 932 ;
+C 24 ; WX 1204 ; N perthousandzero ; B -10 -288 1210 932 ;
+C 25 ; WX 602 ; N dotlessi ; B -10 -288 610 932 ;
+C 26 ; WX 602 ; N dotlessj ; B -10 -288 610 932 ;
+C 27 ; WX 602 ; N ff ; B -10 -288 610 932 ;
+C 28 ; WX 602 ; N fi ; B -10 -288 610 932 ;
+C 29 ; WX 1204 ; N fl ; B -10 -288 1210 932 ;
+C 30 ; WX 1204 ; N ffi ; B -10 -288 1210 932 ;
+C 31 ; WX 1204 ; N ffl ; B -10 -288 1210 932 ;
+C 33 ; WX 1204 ; N exclam ; B -10 -288 1210 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1204 ; N parenleft ; B -10 -288 1210 932 ;
+C 41 ; WX 1204 ; N parenright ; B -10 -288 1210 932 ;
+C 42 ; WX 1204 ; N asterisk ; B -10 -288 1210 932 ;
+C 43 ; WX 1204 ; N plus ; B -10 -288 1210 932 ;
+C 44 ; WX 0 ; N comma ; B 0 0 0 0 ;
+C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 46 ; WX 0 ; N period ; B 0 0 0 0 ;
+C 47 ; WX 1204 ; N slash ; B -10 -288 1210 932 ;
+C 49 ; WX 1204 ; N one ; B -10 -288 1210 932 ;
+C 50 ; WX 1204 ; N two ; B -10 -288 1210 932 ;
+C 51 ; WX 1204 ; N three ; B -10 -288 1210 932 ;
+C 52 ; WX 1204 ; N four ; B -10 -288 1210 932 ;
+C 53 ; WX 1204 ; N five ; B -10 -288 1210 932 ;
+C 54 ; WX 1204 ; N six ; B -10 -288 1210 932 ;
+C 55 ; WX 2409 ; N seven ; B -10 -288 2410 932 ;
+C 56 ; WX 2409 ; N eight ; B -10 -288 2410 932 ;
+C 57 ; WX 2409 ; N nine ; B -10 -288 2410 932 ;
+C 58 ; WX 1204 ; N colon ; B -10 -288 1210 932 ;
+C 59 ; WX 1204 ; N semicolon ; B -10 -288 1210 932 ;
+C 60 ; WX 1204 ; N less ; B -10 -288 1210 932 ;
+C 61 ; WX 1204 ; N equal ; B -10 -288 1210 932 ;
+C 62 ; WX 1204 ; N greater ; B -10 -288 1210 932 ;
+C 63 ; WX 1204 ; N question ; B -10 -288 1210 932 ;
+C 64 ; WX 1204 ; N at ; B -10 -288 1210 932 ;
+C 65 ; WX 1204 ; N A ; B -10 -288 1210 932 ;
+C 66 ; WX 1204 ; N B ; B -10 -288 1210 932 ;
+C 67 ; WX 1204 ; N C ; B -10 -288 1210 932 ;
+C 68 ; WX 1204 ; N D ; B -10 -288 1210 932 ;
+C 69 ; WX 3613 ; N E ; B -10 -288 3610 932 ;
+C 70 ; WX 0 ; N F ; B -635 287 635 672 ;
+C 71 ; WX 1204 ; N G ; B -10 -288 1210 932 ;
+C 72 ; WX 1204 ; N H ; B -10 -288 1210 932 ;
+C 73 ; WX 1204 ; N I ; B -10 -288 1210 932 ;
+C 74 ; WX 1204 ; N J ; B -10 -288 1210 932 ;
+C 75 ; WX 1204 ; N K ; B -10 -288 1210 932 ;
+C 76 ; WX 1204 ; N L ; B -10 -288 1210 932 ;
+C 77 ; WX 1204 ; N M ; B -10 -288 1210 932 ;
+C 78 ; WX 1204 ; N N ; B -10 -288 1210 932 ;
+C 79 ; WX 1204 ; N O ; B -10 -288 1210 932 ;
+C 80 ; WX 1204 ; N P ; B -10 -288 1210 932 ;
+C 81 ; WX 1204 ; N Q ; B -10 -288 1210 932 ;
+C 82 ; WX 1204 ; N R ; B -10 -288 1210 932 ;
+C 83 ; WX 1204 ; N S ; B -10 -288 1210 932 ;
+C 84 ; WX 1204 ; N T ; B -10 -288 1210 932 ;
+C 85 ; WX 1204 ; N U ; B -35 -288 1235 932 ;
+C 86 ; WX 2409 ; N V ; B -10 -288 2410 932 ;
+C 87 ; WX 3613 ; N W ; B -10 -288 3610 932 ;
+C 88 ; WX 1204 ; N X ; B -10 -288 1210 932 ;
+C 89 ; WX 3613 ; N Y ; B -10 -288 3610 932 ;
+C 90 ; WX 3613 ; N Z ; B -10 -288 3610 932 ;
+C 91 ; WX 1204 ; N bracketleft ; B -10 -288 1210 932 ;
+C 93 ; WX 1204 ; N bracketright ; B -10 -288 1210 932 ;
+C 94 ; WX 0 ; N asciicircum ; B -1035 652 1035 722 ;
+C 95 ; WX 0 ; N underscore ; B -1035 -78 1035 -8 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 1204 ; N a ; B -10 -288 1210 932 ;
+C 98 ; WX 1204 ; N b ; B -10 -288 1210 932 ;
+C 99 ; WX 1204 ; N c ; B -10 -288 1210 932 ;
+C 100 ; WX 1204 ; N d ; B -10 -288 1210 932 ;
+C 101 ; WX 1204 ; N e ; B -10 -288 1210 932 ;
+C 102 ; WX 0 ; N f ; B -635 287 635 672 ;
+C 103 ; WX 1204 ; N g ; B -10 -288 1210 932 ;
+C 104 ; WX 0 ; N h ; B -157 -113 157 722 ;
+C 105 ; WX 1204 ; N i ; B -10 -288 1210 932 ;
+C 106 ; WX 1204 ; N j ; B -10 -288 1210 932 ;
+C 107 ; WX 1204 ; N k ; B -10 -288 1210 932 ;
+C 108 ; WX 1204 ; N l ; B -10 -288 1210 932 ;
+C 109 ; WX 1204 ; N m ; B -10 -288 1210 932 ;
+C 110 ; WX 1204 ; N n ; B -10 -288 1210 932 ;
+C 111 ; WX 1204 ; N o ; B -10 -288 1210 932 ;
+C 112 ; WX 1204 ; N p ; B -10 -288 1210 932 ;
+C 113 ; WX 1204 ; N q ; B -10 -288 1210 932 ;
+C 114 ; WX 1204 ; N r ; B -10 -288 1210 932 ;
+C 115 ; WX 1204 ; N s ; B -10 -288 1210 932 ;
+C 116 ; WX 1204 ; N t ; B -10 -288 1210 932 ;
+C 117 ; WX 2409 ; N u ; B -10 -288 2410 932 ;
+C 118 ; WX 2409 ; N v ; B -10 -288 2410 932 ;
+C 119 ; WX 3613 ; N w ; B -10 -288 3610 932 ;
+C 120 ; WX 1204 ; N x ; B -10 -288 1210 932 ;
+C 121 ; WX 2409 ; N y ; B -10 -288 2410 932 ;
+C 122 ; WX 2409 ; N z ; B -10 -288 2410 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ;
+C 128 ; WX 1204 ; N Abreve ; B -10 -288 1210 932 ;
+C 129 ; WX 1204 ; N Aogonek ; B -10 -288 1210 932 ;
+C 130 ; WX 1204 ; N Cacute ; B -10 -288 1210 932 ;
+C 131 ; WX 1204 ; N Ccaron ; B -10 -288 1210 932 ;
+C 132 ; WX 1204 ; N Dcaron ; B -10 -288 1210 932 ;
+C 133 ; WX 1204 ; N Ecaron ; B -10 -288 1210 932 ;
+C 134 ; WX 1204 ; N Eogonek ; B -10 -288 1210 932 ;
+C 135 ; WX 1204 ; N Gbreve ; B -10 -288 1210 932 ;
+C 136 ; WX 1204 ; N Lacute ; B -10 -288 1210 932 ;
+C 137 ; WX 1204 ; N Lcaron ; B -10 -288 1210 932 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnl.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnl.afm
index 7b97ccb5c7d..ce2bb12585e 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitnl.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitnl.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:32:57 2010
+Comment Creation Date: Sun Aug 29 08:39:12 2010
FontName KnittingSymbols-nogrid-lowered-Medium
FullName KnittingSymbols-nogrid-lowered
FamilyName KnittingSymbols-nogrid-lowered
@@ -17,7 +17,7 @@ CapHeight 543
XHeight 517
Ascender 567
Descender 287
-StartCharMetrics 123
+StartCharMetrics 127
C 0 ; WX 1204 ; N grave ; B 197 -178 1003 627 ;
C 1 ; WX 1204 ; N acute ; B 312 344 888 668 ;
C 2 ; WX 1204 ; N circumflex ; B 312 344 888 668 ;
@@ -36,8 +36,6 @@ C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
C 17 ; WX 1204 ; N quotedblright ; B 0 -118 1200 567 ;
C 18 ; WX 1204 ; N quotedblbase ; B 0 -68 1060 517 ;
C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ;
-C 20 ; WX 1204 ; N guillemotright ; B 165 186 1035 458 ;
-C 21 ; WX 1204 ; N endash ; B 165 186 1035 458 ;
C 22 ; WX 602 ; N emdash ; B 0 155 600 295 ;
C 23 ; WX 1204 ; N compwordmark ; B 0 -118 1200 567 ;
C 24 ; WX 1204 ; N perthousandzero ; B 0 -118 1040 567 ;
@@ -61,9 +59,13 @@ C 46 ; WX 1204 ; N period ; B 0 0 0 0 ;
C 47 ; WX 1204 ; N slash ; B 165 12 1035 632 ;
C 49 ; WX 1204 ; N one ; B 140 -68 1200 517 ;
C 50 ; WX 1204 ; N two ; B 308 -68 892 517 ;
-C 51 ; WX 1204 ; N three ; B 258 -118 903 567 ;
+C 51 ; WX 1204 ; N three ; B 258 -118 943 567 ;
C 52 ; WX 1204 ; N four ; B 310 -68 890 517 ;
C 53 ; WX 1204 ; N five ; B 310 -68 890 517 ;
+C 54 ; WX 1204 ; N six ; B 298 -68 903 517 ;
+C 55 ; WX 1204 ; N seven ; B 385 -78 776 527 ;
+C 56 ; WX 1204 ; N eight ; B 425 -78 816 527 ;
+C 57 ; WX 1204 ; N nine ; B 60 -158 1140 527 ;
C 58 ; WX 1204 ; N colon ; B 308 -68 853 517 ;
C 59 ; WX 1204 ; N semicolon ; B 348 -68 892 517 ;
C 60 ; WX 1204 ; N less ; B 348 -68 892 517 ;
@@ -71,7 +73,7 @@ C 61 ; WX 1204 ; N equal ; B 353 287 847 357 ;
C 62 ; WX 1204 ; N greater ; B 308 -68 853 517 ;
C 63 ; WX 1204 ; N question ; B 160 -118 1200 567 ;
C 64 ; WX 1204 ; N at ; B 307 29 893 615 ;
-C 65 ; WX 1204 ; N A ; B 258 -118 903 567 ;
+C 65 ; WX 1204 ; N A ; B 258 -118 943 567 ;
C 66 ; WX 1204 ; N B ; B 380 -68 820 565 ;
C 67 ; WX 1204 ; N C ; B 565 -28 635 477 ;
C 68 ; WX 1204 ; N D ; B 348 -68 892 517 ;
@@ -82,13 +84,13 @@ C 72 ; WX 1204 ; N H ; B 476 -78 724 562 ;
C 73 ; WX 1204 ; N I ; B 348 -68 916 543 ;
C 74 ; WX 1204 ; N J ; B 284 -68 853 543 ;
C 75 ; WX 1204 ; N K ; B 565 -28 635 477 ;
-C 76 ; WX 1204 ; N L ; B 298 -118 943 567 ;
+C 76 ; WX 1204 ; N L ; B 298 -119 943 567 ;
C 77 ; WX 1204 ; N M ; B 300 15 900 435 ;
C 78 ; WX 1204 ; N N ; B 300 15 900 435 ;
C 79 ; WX 1204 ; N O ; B 308 -68 892 517 ;
C 80 ; WX 1204 ; N P ; B 353 287 847 357 ;
C 81 ; WX 1204 ; N Q ; B 380 -68 820 565 ;
-C 82 ; WX 1204 ; N R ; B 258 -118 903 567 ;
+C 82 ; WX 1204 ; N R ; B 257 -119 903 567 ;
C 83 ; WX 1204 ; N S ; B 165 68 1000 381 ;
C 84 ; WX 1204 ; N T ; B 380 -115 820 517 ;
C 85 ; WX 1204 ; N U ; B -35 -28 1235 477 ;
@@ -119,7 +121,7 @@ C 110 ; WX 1204 ; N n ; B 300 112 900 532 ;
C 111 ; WX 1204 ; N o ; B 445 127 795 517 ;
C 112 ; WX 1204 ; N p ; B 353 287 847 357 ;
C 113 ; WX 1204 ; N q ; B 380 -68 820 565 ;
-C 114 ; WX 1204 ; N r ; B 565 -118 943 260 ;
+C 114 ; WX 1204 ; N r ; B 258 -118 943 567 ;
C 115 ; WX 1204 ; N s ; B 200 68 1035 381 ;
C 116 ; WX 1204 ; N t ; B 380 -115 820 517 ;
C 117 ; WX 1204 ; N u ; B 310 -68 890 517 ;
@@ -128,7 +130,9 @@ C 119 ; WX 1204 ; N w ; B 258 -118 943 567 ;
C 120 ; WX 1204 ; N x ; B 380 -115 820 517 ;
C 121 ; WX 1204 ; N y ; B 310 -68 890 517 ;
C 122 ; WX 1204 ; N z ; B 297 -78 903 527 ;
+C 123 ; WX 636 ; N braceleft ; B 153 87 500 538 ;
C 124 ; WX 80 ; N bar ; B 0 -298 80 942 ;
+C 125 ; WX 636 ; N braceright ; B 133 87 480 538 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 565 -68 635 517 ;
C 128 ; WX 1204 ; N Abreve ; B 565 167 635 477 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm
index 7340a139a05..db55e3e598f 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:02 2010
+Comment Creation Date: Sun Aug 29 08:39:16 2010
FontName KnittingSymbols-nogrid-foreground-Medium
FullName KnittingSymbols-nogrid-foreground
FamilyName KnittingSymbols-nogrid-foreground
@@ -17,7 +17,7 @@ CapHeight 738
XHeight 712
Ascender 762
Descender 287
-StartCharMetrics 123
+StartCharMetrics 127
C 0 ; WX 1204 ; N grave ; B 60 -218 1140 862 ;
C 1 ; WX 1204 ; N acute ; B 215 442 985 862 ;
C 2 ; WX 1204 ; N circumflex ; B 215 442 985 862 ;
@@ -36,8 +36,6 @@ C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
C 17 ; WX 1204 ; N quotedblright ; B 0 -118 1200 762 ;
C 18 ; WX 1204 ; N quotedblbase ; B 0 -68 1060 712 ;
C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ;
-C 20 ; WX 1204 ; N guillemotright ; B 165 147 1035 497 ;
-C 21 ; WX 1204 ; N endash ; B 165 147 1035 497 ;
C 22 ; WX 602 ; N emdash ; B 0 252 600 392 ;
C 23 ; WX 1204 ; N compwordmark ; B 0 -118 1200 762 ;
C 24 ; WX 1204 ; N perthousandzero ; B 0 -118 1140 762 ;
@@ -61,9 +59,13 @@ C 46 ; WX 1204 ; N period ; B 0 0 0 0 ;
C 47 ; WX 1204 ; N slash ; B 165 -85 1035 730 ;
C 49 ; WX 1204 ; N one ; B 140 -68 1200 712 ;
C 50 ; WX 1204 ; N two ; B 210 -68 990 712 ;
-C 51 ; WX 1204 ; N three ; B 160 -118 1000 762 ;
+C 51 ; WX 1204 ; N three ; B 160 -118 1040 762 ;
C 52 ; WX 1204 ; N four ; B 214 -68 986 712 ;
C 53 ; WX 1204 ; N five ; B 214 -68 986 712 ;
+C 54 ; WX 1204 ; N six ; B 200 -68 1000 712 ;
+C 55 ; WX 1204 ; N seven ; B 326 -78 834 722 ;
+C 56 ; WX 1204 ; N eight ; B 366 -78 874 722 ;
+C 57 ; WX 1204 ; N nine ; B 60 -136 1140 722 ;
C 58 ; WX 1204 ; N colon ; B 210 -68 950 712 ;
C 59 ; WX 1204 ; N semicolon ; B 250 -68 990 712 ;
C 60 ; WX 1204 ; N less ; B 250 -68 990 712 ;
@@ -71,7 +73,7 @@ C 61 ; WX 1204 ; N equal ; B 285 287 915 357 ;
C 62 ; WX 1204 ; N greater ; B 210 -68 950 712 ;
C 63 ; WX 1204 ; N question ; B 60 -118 1200 762 ;
C 64 ; WX 1204 ; N at ; B 307 29 893 615 ;
-C 65 ; WX 1204 ; N A ; B 160 -118 1000 762 ;
+C 65 ; WX 1204 ; N A ; B 160 -118 1040 762 ;
C 66 ; WX 1204 ; N B ; B 303 -68 897 760 ;
C 67 ; WX 1204 ; N C ; B 565 -28 635 477 ;
C 68 ; WX 1204 ; N D ; B 348 -68 892 517 ;
@@ -82,13 +84,13 @@ C 72 ; WX 1204 ; N H ; B 443 -78 757 757 ;
C 73 ; WX 1204 ; N I ; B 250 -68 1014 738 ;
C 74 ; WX 1204 ; N J ; B 186 -68 950 738 ;
C 75 ; WX 1204 ; N K ; B 565 -28 635 477 ;
-C 76 ; WX 1204 ; N L ; B 200 -118 1040 762 ;
+C 76 ; WX 1204 ; N L ; B 200 -118 1041 762 ;
C 77 ; WX 1204 ; N M ; B 300 112 900 532 ;
C 78 ; WX 1204 ; N N ; B 300 15 900 435 ;
C 79 ; WX 1204 ; N O ; B 210 -68 990 712 ;
C 80 ; WX 1204 ; N P ; B 285 287 915 357 ;
C 81 ; WX 1204 ; N Q ; B 303 -68 897 760 ;
-C 82 ; WX 1204 ; N R ; B 160 -118 1000 762 ;
+C 82 ; WX 1204 ; N R ; B 159 -118 1000 762 ;
C 83 ; WX 1204 ; N S ; B 165 166 1000 479 ;
C 84 ; WX 1204 ; N T ; B 303 -115 897 712 ;
C 85 ; WX 1204 ; N U ; B -35 -28 1235 672 ;
@@ -128,7 +130,9 @@ C 119 ; WX 1204 ; N w ; B 160 -118 1040 762 ;
C 120 ; WX 1204 ; N x ; B 303 -115 897 712 ;
C 121 ; WX 1204 ; N y ; B 214 -68 986 712 ;
C 122 ; WX 1204 ; N z ; B 200 -78 1000 722 ;
+C 123 ; WX 636 ; N braceleft ; B 153 87 500 538 ;
C 124 ; WX 80 ; N bar ; B 0 -298 80 942 ;
+C 125 ; WX 636 ; N braceright ; B 133 87 480 538 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 565 -68 635 712 ;
C 128 ; WX 1204 ; N Abreve ; B 565 167 635 672 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm
index f3093718405..810d5792dc7 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:32:58 2010
+Comment Creation Date: Sun Aug 29 08:39:13 2010
FontName KnittingSymbols-nogrid-purl-Medium
FullName KnittingSymbols-nogrid-purl
FamilyName KnittingSymbols-nogrid-purl
@@ -15,7 +15,7 @@ EncodingScheme FontSpecific
FontBBox -1035 -298 1220 942
CapHeight 942
Descender -298
-StartCharMetrics 123
+StartCharMetrics 127
C 0 ; WX 1204 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 1204 ; N acute ; B 0 0 0 0 ;
C 2 ; WX 1204 ; N circumflex ; B -20 -298 1220 942 ;
@@ -34,8 +34,6 @@ C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
C 17 ; WX 1204 ; N quotedblright ; B 0 0 0 0 ;
C 18 ; WX 1204 ; N quotedblbase ; B 0 0 0 0 ;
C 19 ; WX 1204 ; N guillemotleft ; B 0 0 0 0 ;
-C 20 ; WX 1204 ; N guillemotright ; B 0 0 0 0 ;
-C 21 ; WX 1204 ; N endash ; B 0 0 0 0 ;
C 22 ; WX 602 ; N emdash ; B 0 0 0 0 ;
C 23 ; WX 1204 ; N compwordmark ; B 0 0 0 0 ;
C 24 ; WX 1204 ; N perthousandzero ; B 0 0 0 0 ;
@@ -62,6 +60,10 @@ C 50 ; WX 1204 ; N two ; B -20 -298 1220 942 ;
C 51 ; WX 1204 ; N three ; B -20 -298 1220 942 ;
C 52 ; WX 1204 ; N four ; B 0 0 0 0 ;
C 53 ; WX 1204 ; N five ; B 0 0 0 0 ;
+C 54 ; WX 1204 ; N six ; B 0 0 0 0 ;
+C 55 ; WX 1204 ; N seven ; B 0 0 0 0 ;
+C 56 ; WX 1204 ; N eight ; B 0 0 0 0 ;
+C 57 ; WX 1204 ; N nine ; B 0 0 0 0 ;
C 58 ; WX 1204 ; N colon ; B -20 -298 1220 942 ;
C 59 ; WX 1204 ; N semicolon ; B -20 -298 1220 942 ;
C 60 ; WX 1204 ; N less ; B 0 0 0 0 ;
@@ -126,7 +128,9 @@ C 119 ; WX 1204 ; N w ; B 0 0 0 0 ;
C 120 ; WX 1204 ; N x ; B 0 0 0 0 ;
C 121 ; WX 1204 ; N y ; B 0 0 0 0 ;
C 122 ; WX 1204 ; N z ; B 0 0 0 0 ;
+C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 80 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ;
C 128 ; WX 1204 ; N Abreve ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm
index e5977c9c09e..b5064ebfda6 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:32:53 2010
+Comment Creation Date: Sun Aug 29 08:39:09 2010
FontName KnittingSymbols-nogrid-raised-Medium
FullName KnittingSymbols-nogrid-raised
FamilyName KnittingSymbols-nogrid-raised
@@ -15,9 +15,9 @@ EncodingScheme FontSpecific
FontBBox -1035 -298 5611 942
CapHeight 738
XHeight 712
-Ascender 455
+Ascender 762
Descender 287
-StartCharMetrics 123
+StartCharMetrics 127
C 0 ; WX 1204 ; N grave ; B 197 17 1003 822 ;
C 1 ; WX 1204 ; N acute ; B 312 540 888 862 ;
C 2 ; WX 1204 ; N circumflex ; B 312 540 888 862 ;
@@ -36,8 +36,6 @@ C 14 ; WX 0 ; N guilsinglleft ; B -235 -78 235 722 ;
C 17 ; WX 1204 ; N quotedblright ; B 0 77 1200 762 ;
C 18 ; WX 1204 ; N quotedblbase ; B 0 127 1060 712 ;
C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ;
-C 20 ; WX 1204 ; N guillemotright ; B 165 186 1035 458 ;
-C 21 ; WX 1204 ; N endash ; B 165 186 1035 458 ;
C 22 ; WX 602 ; N emdash ; B 0 350 600 490 ;
C 23 ; WX 1204 ; N compwordmark ; B 0 77 1200 762 ;
C 24 ; WX 1204 ; N perthousandzero ; B 0 77 1040 762 ;
@@ -61,9 +59,13 @@ C 46 ; WX 1204 ; N period ; B 0 0 0 0 ;
C 47 ; WX 1204 ; N slash ; B 165 12 1035 632 ;
C 49 ; WX 1204 ; N one ; B 140 127 1200 712 ;
C 50 ; WX 1204 ; N two ; B 308 127 892 712 ;
-C 51 ; WX 1204 ; N three ; B 258 77 903 762 ;
+C 51 ; WX 1204 ; N three ; B 258 77 943 762 ;
C 52 ; WX 1204 ; N four ; B 310 127 890 712 ;
C 53 ; WX 1204 ; N five ; B 310 127 890 712 ;
+C 54 ; WX 1204 ; N six ; B 298 127 903 712 ;
+C 55 ; WX 1204 ; N seven ; B 385 117 776 722 ;
+C 56 ; WX 1204 ; N eight ; B 425 117 816 722 ;
+C 57 ; WX 1204 ; N nine ; B 60 36 1140 722 ;
C 58 ; WX 1204 ; N colon ; B 308 127 853 712 ;
C 59 ; WX 1204 ; N semicolon ; B 348 127 892 712 ;
C 60 ; WX 1204 ; N less ; B 348 127 892 712 ;
@@ -71,7 +73,7 @@ C 61 ; WX 1204 ; N equal ; B 353 287 847 357 ;
C 62 ; WX 1204 ; N greater ; B 308 127 853 712 ;
C 63 ; WX 1204 ; N question ; B 160 77 1200 762 ;
C 64 ; WX 1204 ; N at ; B 307 29 893 615 ;
-C 65 ; WX 1204 ; N A ; B 258 77 903 762 ;
+C 65 ; WX 1204 ; N A ; B 258 77 943 762 ;
C 66 ; WX 1204 ; N B ; B 380 127 820 760 ;
C 67 ; WX 1204 ; N C ; B 565 167 635 477 ;
C 68 ; WX 1204 ; N D ; B 445 127 795 517 ;
@@ -82,13 +84,13 @@ C 72 ; WX 1204 ; N H ; B 476 117 724 757 ;
C 73 ; WX 1204 ; N I ; B 348 127 916 738 ;
C 74 ; WX 1204 ; N J ; B 284 127 853 738 ;
C 75 ; WX 1204 ; N K ; B 565 167 635 477 ;
-C 76 ; WX 1204 ; N L ; B 298 77 943 762 ;
+C 76 ; WX 1204 ; N L ; B 298 76 943 762 ;
C 77 ; WX 1204 ; N M ; B 300 210 900 630 ;
C 78 ; WX 1204 ; N N ; B 300 112 900 532 ;
C 79 ; WX 1204 ; N O ; B 308 127 892 712 ;
C 80 ; WX 1204 ; N P ; B 353 287 847 357 ;
C 81 ; WX 1204 ; N Q ; B 380 127 820 760 ;
-C 82 ; WX 1204 ; N R ; B 258 77 903 762 ;
+C 82 ; WX 1204 ; N R ; B 257 76 903 762 ;
C 83 ; WX 1204 ; N S ; B 165 263 1000 576 ;
C 84 ; WX 1204 ; N T ; B 380 80 820 712 ;
C 85 ; WX 1204 ; N U ; B -35 167 1235 672 ;
@@ -113,7 +115,7 @@ C 104 ; WX 1204 ; N h ; B 476 82 724 722 ;
C 105 ; WX 1204 ; N i ; B 348 127 916 738 ;
C 106 ; WX 1204 ; N j ; B 284 127 853 738 ;
C 107 ; WX 1204 ; N k ; B 565 167 635 672 ;
-C 108 ; WX 1204 ; N l ; B 258 77 635 455 ;
+C 108 ; WX 1204 ; N l ; B 258 77 943 762 ;
C 109 ; WX 1204 ; N m ; B 300 210 900 630 ;
C 110 ; WX 1204 ; N n ; B 300 210 900 630 ;
C 111 ; WX 1204 ; N o ; B 348 127 892 712 ;
@@ -128,7 +130,9 @@ C 119 ; WX 1204 ; N w ; B 258 77 943 762 ;
C 120 ; WX 1204 ; N x ; B 380 80 820 712 ;
C 121 ; WX 1204 ; N y ; B 310 127 890 712 ;
C 122 ; WX 1204 ; N z ; B 297 117 903 722 ;
+C 123 ; WX 636 ; N braceleft ; B 153 87 500 538 ;
C 124 ; WX 80 ; N bar ; B 0 -298 80 942 ;
+C 125 ; WX 636 ; N braceright ; B 133 87 480 538 ;
C 126 ; WX 1204 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1204 ; N hyphen ; B 565 127 635 712 ;
C 128 ; WX 1204 ; N Abreve ; B 565 167 635 672 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_in.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_in.afm
new file mode 100644
index 00000000000..a09b8a8a35d
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_in.afm
@@ -0,0 +1,259 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:38:55 2010
+FontName KnittingSymbols-wide-incount-Medium
+FullName KnittingSymbols-wide-incount
+FamilyName KnittingSymbols-wide-incount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -550 -288 8160 932
+CapHeight 688
+XHeight 662
+Ascender 932
+Descender -288
+StartCharMetrics 237
+C 0 ; WX 1636 ; N grave ; B -10 -288 1640 932 ;
+C 1 ; WX 1636 ; N acute ; B -10 -288 1640 932 ;
+C 2 ; WX 1636 ; N circumflex ; B -10 -288 1640 932 ;
+C 3 ; WX 1636 ; N tilde ; B -10 -288 1640 932 ;
+C 4 ; WX 1636 ; N dieresis ; B -10 -288 1640 932 ;
+C 5 ; WX 1636 ; N hungarumlaut ; B -10 -288 1640 932 ;
+C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
+C 17 ; WX 1636 ; N quotedblright ; B -10 -288 1640 932 ;
+C 18 ; WX 1636 ; N quotedblbase ; B -10 -288 1640 932 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 20 ; WX 1636 ; N guillemotright ; B -10 -288 1640 932 ;
+C 21 ; WX 1636 ; N endash ; B -10 -288 1640 932 ;
+C 22 ; WX 818 ; N emdash ; B -10 -288 825 932 ;
+C 23 ; WX 1636 ; N compwordmark ; B -10 -288 1640 932 ;
+C 24 ; WX 1636 ; N perthousandzero ; B -10 -288 1640 932 ;
+C 25 ; WX 818 ; N dotlessi ; B -10 -288 825 932 ;
+C 26 ; WX 818 ; N dotlessj ; B -10 -288 825 932 ;
+C 27 ; WX 818 ; N ff ; B -10 -288 825 932 ;
+C 28 ; WX 818 ; N fi ; B -10 -288 825 932 ;
+C 29 ; WX 1636 ; N fl ; B -10 -288 1640 932 ;
+C 30 ; WX 1636 ; N ffi ; B -10 -288 1640 932 ;
+C 31 ; WX 8181 ; N ffl ; B -10 -288 8160 932 ;
+C 33 ; WX 3272 ; N exclam ; B -10 -288 3270 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1636 ; N parenleft ; B -10 -288 1640 932 ;
+C 41 ; WX 1636 ; N parenright ; B -10 -288 1640 932 ;
+C 42 ; WX 1636 ; N asterisk ; B -10 -288 1640 932 ;
+C 43 ; WX 1636 ; N plus ; B -10 -288 1640 932 ;
+C 44 ; WX 0 ; N comma ; B -300 22 300 622 ;
+C 45 ; WX 1636 ; N hyphen ; B -10 -288 1640 932 ;
+C 46 ; WX 0 ; N period ; B -300 22 300 622 ;
+C 47 ; WX 1636 ; N slash ; B -10 -288 1640 932 ;
+C 49 ; WX 1636 ; N one ; B -10 -288 1640 932 ;
+C 50 ; WX 3272 ; N two ; B -10 -288 3270 932 ;
+C 51 ; WX 4908 ; N three ; B -10 -288 4900 932 ;
+C 52 ; WX 3272 ; N four ; B -10 -288 3270 932 ;
+C 53 ; WX 3272 ; N five ; B -10 -288 3270 932 ;
+C 54 ; WX 1636 ; N six ; B -10 -288 1640 932 ;
+C 55 ; WX 1636 ; N seven ; B -10 -288 1640 932 ;
+C 56 ; WX 1636 ; N eight ; B -10 -288 1640 932 ;
+C 57 ; WX 1636 ; N nine ; B -10 -288 1640 932 ;
+C 58 ; WX 3272 ; N colon ; B -10 -288 3270 932 ;
+C 59 ; WX 3272 ; N semicolon ; B -10 -288 3270 932 ;
+C 60 ; WX 3272 ; N less ; B -10 -288 3270 932 ;
+C 61 ; WX 1636 ; N equal ; B -10 -288 1640 932 ;
+C 62 ; WX 3272 ; N greater ; B -10 -288 3270 932 ;
+C 63 ; WX 1636 ; N question ; B -10 -288 1640 932 ;
+C 64 ; WX 1636 ; N at ; B -10 -288 1640 932 ;
+C 65 ; WX 4908 ; N A ; B -10 -288 4900 932 ;
+C 66 ; WX 1636 ; N B ; B -10 -288 1640 932 ;
+C 67 ; WX 1636 ; N C ; B -10 -288 1640 932 ;
+C 68 ; WX 1636 ; N D ; B -10 -288 1640 932 ;
+C 69 ; WX 1636 ; N E ; B -10 -288 1640 932 ;
+C 70 ; WX 1636 ; N F ; B -35 -288 1665 932 ;
+C 71 ; WX 1636 ; N G ; B -10 -288 1640 932 ;
+C 72 ; WX 0 ; N H ; B -140 -28 140 707 ;
+C 73 ; WX 0 ; N I ; B -300 -18 364 688 ;
+C 74 ; WX 0 ; N J ; B -364 -18 300 688 ;
+C 75 ; WX 1636 ; N K ; B -10 -288 1640 932 ;
+C 76 ; WX 4908 ; N L ; B -10 -288 4900 932 ;
+C 77 ; WX 0 ; N M ; B -300 112 300 532 ;
+C 78 ; WX 1636 ; N N ; B -10 -288 1640 932 ;
+C 79 ; WX 0 ; N O ; B -340 -18 340 662 ;
+C 80 ; WX 1636 ; N P ; B -10 -288 1640 932 ;
+C 81 ; WX 1636 ; N Q ; B -10 -288 1640 932 ;
+C 82 ; WX 4908 ; N R ; B -10 -288 4900 932 ;
+C 83 ; WX 1636 ; N S ; B -10 -288 1640 932 ;
+C 84 ; WX 0 ; N T ; B -258 -65 258 662 ;
+C 85 ; WX 0 ; N U ; B -300 22 300 622 ;
+C 86 ; WX 1636 ; N V ; B -10 -288 1640 932 ;
+C 87 ; WX 1636 ; N W ; B -10 -288 1640 932 ;
+C 88 ; WX 0 ; N X ; B -258 -65 258 662 ;
+C 89 ; WX 1636 ; N Y ; B -10 -288 1640 932 ;
+C 90 ; WX 1636 ; N Z ; B -10 -288 1640 932 ;
+C 91 ; WX 1636 ; N bracketleft ; B -10 -288 1640 932 ;
+C 93 ; WX 1636 ; N bracketright ; B -10 -288 1640 932 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 4908 ; N a ; B -10 -288 4900 932 ;
+C 98 ; WX 1636 ; N b ; B -10 -288 1640 932 ;
+C 99 ; WX 1636 ; N c ; B -10 -288 1640 932 ;
+C 100 ; WX 1636 ; N d ; B -10 -288 1640 932 ;
+C 101 ; WX 1636 ; N e ; B -10 -288 1640 932 ;
+C 102 ; WX 1636 ; N f ; B -35 -288 1665 932 ;
+C 103 ; WX 1636 ; N g ; B -10 -288 1640 932 ;
+C 104 ; WX 1636 ; N h ; B -10 -288 1640 932 ;
+C 105 ; WX 0 ; N i ; B -300 -18 364 688 ;
+C 106 ; WX 0 ; N j ; B -364 -18 300 688 ;
+C 107 ; WX 1636 ; N k ; B -10 -288 1640 932 ;
+C 108 ; WX 4908 ; N l ; B -10 -288 4900 932 ;
+C 109 ; WX 0 ; N m ; B -300 112 300 532 ;
+C 110 ; WX 1636 ; N n ; B -10 -288 1640 932 ;
+C 111 ; WX 1636 ; N o ; B -10 -288 1640 932 ;
+C 112 ; WX 1636 ; N p ; B -10 -288 1640 932 ;
+C 113 ; WX 1636 ; N q ; B -10 -288 1640 932 ;
+C 114 ; WX 4908 ; N r ; B -10 -288 4900 932 ;
+C 115 ; WX 1636 ; N s ; B -10 -288 1640 932 ;
+C 116 ; WX 0 ; N t ; B -258 -65 258 662 ;
+C 117 ; WX 1636 ; N u ; B -10 -288 1640 932 ;
+C 118 ; WX 1636 ; N v ; B -10 -288 1640 932 ;
+C 119 ; WX 1636 ; N w ; B -10 -288 1640 932 ;
+C 120 ; WX 0 ; N x ; B -258 -65 258 662 ;
+C 121 ; WX 1636 ; N y ; B -10 -288 1640 932 ;
+C 122 ; WX 1636 ; N z ; B -10 -288 1640 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1636 ; N hyphen ; B -10 -288 1640 932 ;
+C 128 ; WX 3272 ; N Abreve ; B -10 -288 3270 932 ;
+C 129 ; WX 3272 ; N Aogonek ; B -10 -288 3270 932 ;
+C 130 ; WX 3272 ; N Cacute ; B -10 -288 3270 932 ;
+C 131 ; WX 3272 ; N Ccaron ; B -10 -288 3270 932 ;
+C 132 ; WX 4908 ; N Dcaron ; B -10 -288 4900 932 ;
+C 133 ; WX 4908 ; N Ecaron ; B -10 -288 4900 932 ;
+C 134 ; WX 4908 ; N Eogonek ; B -10 -288 4900 932 ;
+C 135 ; WX 4908 ; N Gbreve ; B -10 -288 4900 932 ;
+C 136 ; WX 3272 ; N Lacute ; B -10 -288 3270 932 ;
+C 137 ; WX 3272 ; N Lcaron ; B -10 -288 3270 932 ;
+C 138 ; WX 3272 ; N Lslash ; B -10 -288 3270 932 ;
+C 139 ; WX 3272 ; N Nacute ; B -10 -288 3270 932 ;
+C 140 ; WX 3272 ; N Ncaron ; B -10 -288 3270 932 ;
+C 141 ; WX 3272 ; N Eng ; B -10 -288 3270 932 ;
+C 142 ; WX 3272 ; N Odblacute ; B -10 -288 3270 932 ;
+C 143 ; WX 3272 ; N Racute ; B -10 -288 3270 932 ;
+C 144 ; WX 3272 ; N Rcaron ; B -10 -288 3270 932 ;
+C 145 ; WX 3272 ; N Sacute ; B -10 -288 3270 932 ;
+C 146 ; WX 3272 ; N Scaron ; B -10 -288 3270 932 ;
+C 147 ; WX 3272 ; N Scedilla ; B -10 -288 3270 932 ;
+C 148 ; WX 4908 ; N Tcaron ; B -10 -288 4900 932 ;
+C 149 ; WX 4908 ; N Tcedilla ; B -10 -288 4900 932 ;
+C 150 ; WX 4908 ; N Udblacute ; B -10 -288 4900 932 ;
+C 151 ; WX 4908 ; N Uring ; B -10 -288 4900 932 ;
+C 152 ; WX 4908 ; N Ydieresis ; B -10 -288 4900 932 ;
+C 153 ; WX 4908 ; N Zacute ; B -10 -288 4900 932 ;
+C 154 ; WX 4908 ; N Zcaron ; B -10 -288 4900 932 ;
+C 155 ; WX 4908 ; N Zdot ; B -10 -288 4900 932 ;
+C 156 ; WX 4908 ; N IJ ; B -10 -288 4900 932 ;
+C 157 ; WX 4908 ; N Idot ; B -10 -288 4900 932 ;
+C 158 ; WX 4908 ; N dmacron ; B -10 -288 4900 932 ;
+C 159 ; WX 4908 ; N section ; B -10 -288 4900 932 ;
+C 160 ; WX 4908 ; N abreve ; B -10 -288 4900 932 ;
+C 161 ; WX 4908 ; N aogonek ; B -10 -288 4900 932 ;
+C 162 ; WX 4908 ; N cacute ; B -10 -288 4900 932 ;
+C 163 ; WX 4908 ; N ccaron ; B -10 -288 4900 932 ;
+C 164 ; WX 6544 ; N dcaron ; B -10 -288 6530 932 ;
+C 165 ; WX 6544 ; N ecaron ; B -10 -288 6530 932 ;
+C 166 ; WX 6544 ; N eogonek ; B -10 -288 6530 932 ;
+C 167 ; WX 6544 ; N gbreve ; B -10 -288 6530 932 ;
+C 168 ; WX 6544 ; N lacute ; B -10 -288 6530 932 ;
+C 169 ; WX 6544 ; N lcaron ; B -10 -288 6530 932 ;
+C 170 ; WX 6544 ; N lslash ; B -10 -288 6530 932 ;
+C 171 ; WX 6544 ; N nacute ; B -10 -288 6530 932 ;
+C 172 ; WX 6544 ; N ncaron ; B -10 -288 6530 932 ;
+C 173 ; WX 6544 ; N eng ; B -10 -288 6530 932 ;
+C 174 ; WX 6544 ; N odblacute ; B -10 -288 6530 932 ;
+C 175 ; WX 6544 ; N racute ; B -10 -288 6530 932 ;
+C 176 ; WX 4908 ; N rcaron ; B -10 -288 4900 932 ;
+C 177 ; WX 4908 ; N sacute ; B -10 -288 4900 932 ;
+C 178 ; WX 4908 ; N scaron ; B -10 -288 4900 932 ;
+C 179 ; WX 4908 ; N scedilla ; B -10 -288 4900 932 ;
+C 180 ; WX 4908 ; N tcaron ; B -10 -288 4900 932 ;
+C 181 ; WX 4908 ; N tcedilla ; B -10 -288 4900 932 ;
+C 182 ; WX 4908 ; N udblacute ; B -10 -288 4900 932 ;
+C 183 ; WX 4908 ; N uring ; B -10 -288 4900 932 ;
+C 184 ; WX 4908 ; N ydieresis ; B -10 -288 4900 932 ;
+C 185 ; WX 4908 ; N zacute ; B -10 -288 4900 932 ;
+C 186 ; WX 4908 ; N zcaron ; B -10 -288 4900 932 ;
+C 187 ; WX 4908 ; N zdot ; B -10 -288 4900 932 ;
+C 188 ; WX 6544 ; N ij ; B -10 -288 6530 932 ;
+C 189 ; WX 6544 ; N exclamdown ; B -10 -288 6530 932 ;
+C 190 ; WX 6544 ; N questiondown ; B -10 -288 6530 932 ;
+C 191 ; WX 6544 ; N sterling ; B -10 -288 6530 932 ;
+C 192 ; WX 6544 ; N Agrave ; B -10 -288 6530 932 ;
+C 193 ; WX 6544 ; N Aacute ; B -10 -288 6530 932 ;
+C 194 ; WX 6544 ; N Acircumflex ; B -10 -288 6530 932 ;
+C 195 ; WX 6544 ; N Atilde ; B -10 -288 6530 932 ;
+C 196 ; WX 6544 ; N Adieresis ; B -10 -288 6530 932 ;
+C 197 ; WX 6544 ; N Aring ; B -10 -288 6530 932 ;
+C 198 ; WX 6544 ; N AE ; B -10 -288 6530 932 ;
+C 199 ; WX 6544 ; N Ccedilla ; B -10 -288 6530 932 ;
+C 200 ; WX 8181 ; N Egrave ; B -10 -288 8160 932 ;
+C 201 ; WX 8181 ; N Eacute ; B -10 -288 8160 932 ;
+C 202 ; WX 8181 ; N Ecircumflex ; B -10 -288 8160 932 ;
+C 203 ; WX 8181 ; N Edieresis ; B -10 -288 8160 932 ;
+C 204 ; WX 0 ; N Igrave ; B 0 0 0 0 ;
+C 205 ; WX 0 ; N Iacute ; B 0 0 0 0 ;
+C 206 ; WX 0 ; N Icircumflex ; B 0 0 0 0 ;
+C 207 ; WX 0 ; N Idieresis ; B 0 0 0 0 ;
+C 208 ; WX 8181 ; N Eth ; B -10 -288 8160 932 ;
+C 209 ; WX 8181 ; N Ntilde ; B -10 -288 8160 932 ;
+C 210 ; WX 8181 ; N Ograve ; B -10 -288 8160 932 ;
+C 211 ; WX 8181 ; N Oacute ; B -10 -288 8160 932 ;
+C 212 ; WX 8181 ; N Ocircumflex ; B -10 -288 8160 932 ;
+C 213 ; WX 8181 ; N Otilde ; B -10 -288 8160 932 ;
+C 214 ; WX 8181 ; N Odieresis ; B -10 -288 8160 932 ;
+C 215 ; WX 8181 ; N OE ; B -10 -288 8160 932 ;
+C 216 ; WX 8181 ; N Oslash ; B -10 -288 8160 932 ;
+C 217 ; WX 8181 ; N Ugrave ; B -10 -288 8160 932 ;
+C 218 ; WX 8181 ; N Uacute ; B -10 -288 8160 932 ;
+C 219 ; WX 8181 ; N Ucircumflex ; B -10 -288 8160 932 ;
+C 220 ; WX 6544 ; N Udieresis ; B -10 -288 6530 932 ;
+C 221 ; WX 6544 ; N Yacute ; B -10 -288 6530 932 ;
+C 222 ; WX 6544 ; N Thorn ; B -10 -288 6530 932 ;
+C 223 ; WX 6544 ; N Germandbls ; B -10 -288 6530 932 ;
+C 224 ; WX 6544 ; N agrave ; B -10 -288 6530 932 ;
+C 225 ; WX 6544 ; N aacute ; B -10 -288 6530 932 ;
+C 226 ; WX 6544 ; N acircumflex ; B -10 -288 6530 932 ;
+C 227 ; WX 6544 ; N atilde ; B -10 -288 6530 932 ;
+C 228 ; WX 6544 ; N adieresis ; B -10 -288 6530 932 ;
+C 229 ; WX 6544 ; N aring ; B -10 -288 6530 932 ;
+C 230 ; WX 6544 ; N ae ; B -10 -288 6530 932 ;
+C 231 ; WX 6544 ; N ccedilla ; B -10 -288 6530 932 ;
+C 232 ; WX 8181 ; N egrave ; B -10 -288 8160 932 ;
+C 233 ; WX 8181 ; N eacute ; B -10 -288 8160 932 ;
+C 234 ; WX 8181 ; N ecircumflex ; B -10 -288 8160 932 ;
+C 235 ; WX 8181 ; N edieresis ; B -10 -288 8160 932 ;
+C 236 ; WX 8181 ; N igrave ; B -10 -288 8160 932 ;
+C 237 ; WX 8181 ; N iacute ; B -10 -288 8160 932 ;
+C 238 ; WX 8181 ; N icircumflex ; B -10 -288 8160 932 ;
+C 239 ; WX 8181 ; N idieresis ; B -10 -288 8160 932 ;
+C 240 ; WX 8181 ; N eth ; B -10 -288 8160 932 ;
+C 241 ; WX 8181 ; N ntilde ; B -10 -288 8160 932 ;
+C 242 ; WX 8181 ; N ograve ; B -10 -288 8160 932 ;
+C 243 ; WX 8181 ; N oacute ; B -10 -288 8160 932 ;
+C 244 ; WX 0 ; N ocircumflex ; B 0 0 0 0 ;
+C 245 ; WX 0 ; N otilde ; B 0 0 0 0 ;
+C 246 ; WX 0 ; N odieresis ; B 0 0 0 0 ;
+C 247 ; WX 0 ; N oe ; B 0 0 0 0 ;
+C 248 ; WX 0 ; N oslash ; B 0 0 0 0 ;
+C 249 ; WX 0 ; N ugrave ; B 0 0 0 0 ;
+C 250 ; WX 0 ; N uacute ; B 0 0 0 0 ;
+C 251 ; WX 0 ; N ucircumflex ; B 0 0 0 0 ;
+C 252 ; WX 0 ; N udieresis ; B 0 0 0 0 ;
+C 253 ; WX 0 ; N yacute ; B 0 0 0 0 ;
+C 254 ; WX 0 ; N thorn ; B 0 0 0 0 ;
+C 255 ; WX 0 ; N germandbls ; B 0 0 0 0 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_out.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_out.afm
new file mode 100644
index 00000000000..710f1626092
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_out.afm
@@ -0,0 +1,259 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20070915
+Comment Creation Date: Sun Aug 29 08:38:58 2010
+FontName KnittingSymbols-wide-outcount-Medium
+FullName KnittingSymbols-wide-outcount
+FamilyName KnittingSymbols-wide-outcount
+Weight Medium
+Notice (Font converted to Type 1 by mf2pt1, written by Scott Pakin.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -850 -288 8160 932
+CapHeight 932
+XHeight 932
+Ascender 932
+Descender -288
+StartCharMetrics 237
+C 0 ; WX 1636 ; N grave ; B -10 -288 1640 932 ;
+C 1 ; WX 1636 ; N acute ; B -10 -288 1640 932 ;
+C 2 ; WX 1636 ; N circumflex ; B -10 -288 1640 932 ;
+C 3 ; WX 1636 ; N tilde ; B -10 -288 1640 932 ;
+C 4 ; WX 1636 ; N dieresis ; B -10 -288 1640 932 ;
+C 5 ; WX 1636 ; N hungarumlaut ; B -10 -288 1640 932 ;
+C 6 ; WX 0 ; N ring ; B 0 0 0 0 ;
+C 17 ; WX 1636 ; N quotedblright ; B -10 -288 1640 932 ;
+C 18 ; WX 0 ; N quotedblbase ; B -815 147 625 617 ;
+C 19 ; WX 0 ; N guillemotleft ; B -550 -114 360 757 ;
+C 20 ; WX 1636 ; N guillemotright ; B -10 -288 1640 932 ;
+C 21 ; WX 1636 ; N endash ; B -10 -288 1640 932 ;
+C 22 ; WX 818 ; N emdash ; B -10 -288 825 932 ;
+C 23 ; WX 1636 ; N compwordmark ; B -10 -288 1640 932 ;
+C 24 ; WX 1636 ; N perthousandzero ; B -10 -288 1640 932 ;
+C 25 ; WX 818 ; N dotlessi ; B -10 -288 825 932 ;
+C 26 ; WX 818 ; N dotlessj ; B -10 -288 825 932 ;
+C 27 ; WX 818 ; N ff ; B -10 -288 825 932 ;
+C 28 ; WX 818 ; N fi ; B -10 -288 825 932 ;
+C 29 ; WX 1636 ; N fl ; B -10 -288 1640 932 ;
+C 30 ; WX 1636 ; N ffi ; B -10 -288 1640 932 ;
+C 31 ; WX 1636 ; N ffl ; B -10 -288 1640 932 ;
+C 33 ; WX 1636 ; N exclam ; B -10 -288 1640 932 ;
+C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ;
+C 39 ; WX 0 ; N quoteright ; B 0 0 0 0 ;
+C 40 ; WX 1636 ; N parenleft ; B -10 -288 1640 932 ;
+C 41 ; WX 1636 ; N parenright ; B -10 -288 1640 932 ;
+C 42 ; WX 1636 ; N asterisk ; B -10 -288 1640 932 ;
+C 43 ; WX 1636 ; N plus ; B -10 -288 1640 932 ;
+C 44 ; WX 0 ; N comma ; B -300 22 300 622 ;
+C 45 ; WX 1636 ; N hyphen ; B -10 -288 1640 932 ;
+C 46 ; WX 0 ; N period ; B -300 22 300 622 ;
+C 47 ; WX 1636 ; N slash ; B -10 -288 1640 932 ;
+C 49 ; WX 1636 ; N one ; B -10 -288 1640 932 ;
+C 50 ; WX 1636 ; N two ; B -10 -288 1640 932 ;
+C 51 ; WX 1636 ; N three ; B -10 -288 1640 932 ;
+C 52 ; WX 1636 ; N four ; B -10 -288 1640 932 ;
+C 53 ; WX 1636 ; N five ; B -10 -288 1640 932 ;
+C 54 ; WX 1636 ; N six ; B -10 -288 1640 932 ;
+C 55 ; WX 3272 ; N seven ; B -10 -288 3270 932 ;
+C 56 ; WX 3272 ; N eight ; B -10 -288 3270 932 ;
+C 57 ; WX 3272 ; N nine ; B -10 -288 3270 932 ;
+C 58 ; WX 1636 ; N colon ; B -10 -288 1640 932 ;
+C 59 ; WX 1636 ; N semicolon ; B -10 -288 1640 932 ;
+C 60 ; WX 1636 ; N less ; B -10 -288 1640 932 ;
+C 61 ; WX 1636 ; N equal ; B -10 -288 1640 932 ;
+C 62 ; WX 1636 ; N greater ; B -10 -288 1640 932 ;
+C 63 ; WX 1636 ; N question ; B -10 -288 1640 932 ;
+C 64 ; WX 1636 ; N at ; B -10 -288 1640 932 ;
+C 65 ; WX 1636 ; N A ; B -10 -288 1640 932 ;
+C 66 ; WX 1636 ; N B ; B -10 -288 1640 932 ;
+C 67 ; WX 1636 ; N C ; B -10 -288 1640 932 ;
+C 68 ; WX 1636 ; N D ; B -10 -288 1640 932 ;
+C 69 ; WX 4908 ; N E ; B -10 -288 4900 932 ;
+C 70 ; WX 0 ; N F ; B -850 287 850 622 ;
+C 71 ; WX 1636 ; N G ; B -10 -288 1640 932 ;
+C 72 ; WX 1636 ; N H ; B -10 -288 1640 932 ;
+C 73 ; WX 1636 ; N I ; B -10 -288 1640 932 ;
+C 74 ; WX 1636 ; N J ; B -10 -288 1640 932 ;
+C 75 ; WX 1636 ; N K ; B -10 -288 1640 932 ;
+C 76 ; WX 1636 ; N L ; B -10 -288 1640 932 ;
+C 77 ; WX 1636 ; N M ; B -10 -288 1640 932 ;
+C 78 ; WX 1636 ; N N ; B -10 -288 1640 932 ;
+C 79 ; WX 1636 ; N O ; B -10 -288 1640 932 ;
+C 80 ; WX 1636 ; N P ; B -10 -288 1640 932 ;
+C 81 ; WX 1636 ; N Q ; B -10 -288 1640 932 ;
+C 82 ; WX 1636 ; N R ; B -10 -288 1640 932 ;
+C 83 ; WX 1636 ; N S ; B -10 -288 1640 932 ;
+C 84 ; WX 1636 ; N T ; B -10 -288 1640 932 ;
+C 85 ; WX 1636 ; N U ; B -35 -288 1665 932 ;
+C 86 ; WX 3272 ; N V ; B -10 -288 3270 932 ;
+C 87 ; WX 4908 ; N W ; B -10 -288 4900 932 ;
+C 88 ; WX 1636 ; N X ; B -10 -288 1640 932 ;
+C 89 ; WX 4908 ; N Y ; B -10 -288 4900 932 ;
+C 90 ; WX 4908 ; N Z ; B -10 -288 4900 932 ;
+C 91 ; WX 1636 ; N bracketleft ; B -10 -288 1640 932 ;
+C 93 ; WX 1636 ; N bracketright ; B -10 -288 1640 932 ;
+C 96 ; WX 0 ; N quoteleft ; B 0 0 0 0 ;
+C 97 ; WX 1636 ; N a ; B -10 -288 1640 932 ;
+C 98 ; WX 1636 ; N b ; B -10 -288 1640 932 ;
+C 99 ; WX 1636 ; N c ; B -10 -288 1640 932 ;
+C 100 ; WX 1636 ; N d ; B -10 -288 1640 932 ;
+C 101 ; WX 1636 ; N e ; B -10 -288 1640 932 ;
+C 102 ; WX 0 ; N f ; B -850 287 850 622 ;
+C 103 ; WX 1636 ; N g ; B -10 -288 1640 932 ;
+C 104 ; WX 0 ; N h ; B -140 -63 140 672 ;
+C 105 ; WX 1636 ; N i ; B -10 -288 1640 932 ;
+C 106 ; WX 1636 ; N j ; B -10 -288 1640 932 ;
+C 107 ; WX 1636 ; N k ; B -10 -288 1640 932 ;
+C 108 ; WX 1636 ; N l ; B -10 -288 1640 932 ;
+C 109 ; WX 1636 ; N m ; B -10 -288 1640 932 ;
+C 110 ; WX 1636 ; N n ; B -10 -288 1640 932 ;
+C 111 ; WX 1636 ; N o ; B -10 -288 1640 932 ;
+C 112 ; WX 1636 ; N p ; B -10 -288 1640 932 ;
+C 113 ; WX 1636 ; N q ; B -10 -288 1640 932 ;
+C 114 ; WX 1636 ; N r ; B -10 -288 1640 932 ;
+C 115 ; WX 1636 ; N s ; B -10 -288 1640 932 ;
+C 116 ; WX 1636 ; N t ; B -10 -288 1640 932 ;
+C 117 ; WX 3272 ; N u ; B -10 -288 3270 932 ;
+C 118 ; WX 3272 ; N v ; B -10 -288 3270 932 ;
+C 119 ; WX 4908 ; N w ; B -10 -288 4900 932 ;
+C 120 ; WX 1636 ; N x ; B -10 -288 1640 932 ;
+C 121 ; WX 3272 ; N y ; B -10 -288 3270 932 ;
+C 122 ; WX 3272 ; N z ; B -10 -288 3270 932 ;
+C 123 ; WX 636 ; N braceleft ; B -10 -10 643 635 ;
+C 124 ; WX 0 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ;
+C 126 ; WX 0 ; N asciitilde ; B 0 0 0 0 ;
+C 127 ; WX 1636 ; N hyphen ; B -10 -288 1640 932 ;
+C 128 ; WX 3272 ; N Abreve ; B -10 -288 3270 932 ;
+C 129 ; WX 3272 ; N Aogonek ; B -10 -288 3270 932 ;
+C 130 ; WX 3272 ; N Cacute ; B -10 -288 3270 932 ;
+C 131 ; WX 3272 ; N Ccaron ; B -10 -288 3270 932 ;
+C 132 ; WX 4908 ; N Dcaron ; B -10 -288 4900 932 ;
+C 133 ; WX 4908 ; N Ecaron ; B -10 -288 4900 932 ;
+C 134 ; WX 4908 ; N Eogonek ; B -10 -288 4900 932 ;
+C 135 ; WX 4908 ; N Gbreve ; B -10 -288 4900 932 ;
+C 136 ; WX 3272 ; N Lacute ; B -10 -288 3270 932 ;
+C 137 ; WX 3272 ; N Lcaron ; B -10 -288 3270 932 ;
+C 138 ; WX 3272 ; N Lslash ; B -10 -288 3270 932 ;
+C 139 ; WX 3272 ; N Nacute ; B -10 -288 3270 932 ;
+C 140 ; WX 3272 ; N Ncaron ; B -10 -288 3270 932 ;
+C 141 ; WX 3272 ; N Eng ; B -10 -288 3270 932 ;
+C 142 ; WX 3272 ; N Odblacute ; B -10 -288 3270 932 ;
+C 143 ; WX 3272 ; N Racute ; B -10 -288 3270 932 ;
+C 144 ; WX 3272 ; N Rcaron ; B -10 -288 3270 932 ;
+C 145 ; WX 3272 ; N Sacute ; B -10 -288 3270 932 ;
+C 146 ; WX 3272 ; N Scaron ; B -10 -288 3270 932 ;
+C 147 ; WX 3272 ; N Scedilla ; B -10 -288 3270 932 ;
+C 148 ; WX 4908 ; N Tcaron ; B -10 -288 4900 932 ;
+C 149 ; WX 4908 ; N Tcedilla ; B -10 -288 4900 932 ;
+C 150 ; WX 4908 ; N Udblacute ; B -10 -288 4900 932 ;
+C 151 ; WX 4908 ; N Uring ; B -10 -288 4900 932 ;
+C 152 ; WX 4908 ; N Ydieresis ; B -10 -288 4900 932 ;
+C 153 ; WX 4908 ; N Zacute ; B -10 -288 4900 932 ;
+C 154 ; WX 4908 ; N Zcaron ; B -10 -288 4900 932 ;
+C 155 ; WX 4908 ; N Zdot ; B -10 -288 4900 932 ;
+C 156 ; WX 4908 ; N IJ ; B -10 -288 4900 932 ;
+C 157 ; WX 4908 ; N Idot ; B -10 -288 4900 932 ;
+C 158 ; WX 4908 ; N dmacron ; B -10 -288 4900 932 ;
+C 159 ; WX 4908 ; N section ; B -10 -288 4900 932 ;
+C 160 ; WX 4908 ; N abreve ; B -10 -288 4900 932 ;
+C 161 ; WX 4908 ; N aogonek ; B -10 -288 4900 932 ;
+C 162 ; WX 4908 ; N cacute ; B -10 -288 4900 932 ;
+C 163 ; WX 4908 ; N ccaron ; B -10 -288 4900 932 ;
+C 164 ; WX 6544 ; N dcaron ; B -10 -288 6530 932 ;
+C 165 ; WX 6544 ; N ecaron ; B -10 -288 6530 932 ;
+C 166 ; WX 6544 ; N eogonek ; B -10 -288 6530 932 ;
+C 167 ; WX 6544 ; N gbreve ; B -10 -288 6530 932 ;
+C 168 ; WX 6544 ; N lacute ; B -10 -288 6530 932 ;
+C 169 ; WX 6544 ; N lcaron ; B -10 -288 6530 932 ;
+C 170 ; WX 6544 ; N lslash ; B -10 -288 6530 932 ;
+C 171 ; WX 6544 ; N nacute ; B -10 -288 6530 932 ;
+C 172 ; WX 6544 ; N ncaron ; B -10 -288 6530 932 ;
+C 173 ; WX 6544 ; N eng ; B -10 -288 6530 932 ;
+C 174 ; WX 6544 ; N odblacute ; B -10 -288 6530 932 ;
+C 175 ; WX 6544 ; N racute ; B -10 -288 6530 932 ;
+C 176 ; WX 4908 ; N rcaron ; B -10 -288 4900 932 ;
+C 177 ; WX 4908 ; N sacute ; B -10 -288 4900 932 ;
+C 178 ; WX 4908 ; N scaron ; B -10 -288 4900 932 ;
+C 179 ; WX 4908 ; N scedilla ; B -10 -288 4900 932 ;
+C 180 ; WX 4908 ; N tcaron ; B -10 -288 4900 932 ;
+C 181 ; WX 4908 ; N tcedilla ; B -10 -288 4900 932 ;
+C 182 ; WX 4908 ; N udblacute ; B -10 -288 4900 932 ;
+C 183 ; WX 4908 ; N uring ; B -10 -288 4900 932 ;
+C 184 ; WX 4908 ; N ydieresis ; B -10 -288 4900 932 ;
+C 185 ; WX 4908 ; N zacute ; B -10 -288 4900 932 ;
+C 186 ; WX 4908 ; N zcaron ; B -10 -288 4900 932 ;
+C 187 ; WX 4908 ; N zdot ; B -10 -288 4900 932 ;
+C 188 ; WX 6544 ; N ij ; B -10 -288 6530 932 ;
+C 189 ; WX 6544 ; N exclamdown ; B -10 -288 6530 932 ;
+C 190 ; WX 6544 ; N questiondown ; B -10 -288 6530 932 ;
+C 191 ; WX 6544 ; N sterling ; B -10 -288 6530 932 ;
+C 192 ; WX 6544 ; N Agrave ; B -10 -288 6530 932 ;
+C 193 ; WX 6544 ; N Aacute ; B -10 -288 6530 932 ;
+C 194 ; WX 6544 ; N Acircumflex ; B -10 -288 6530 932 ;
+C 195 ; WX 6544 ; N Atilde ; B -10 -288 6530 932 ;
+C 196 ; WX 6544 ; N Adieresis ; B -10 -288 6530 932 ;
+C 197 ; WX 6544 ; N Aring ; B -10 -288 6530 932 ;
+C 198 ; WX 6544 ; N AE ; B -10 -288 6530 932 ;
+C 199 ; WX 6544 ; N Ccedilla ; B -10 -288 6530 932 ;
+C 200 ; WX 8181 ; N Egrave ; B -10 -288 8160 932 ;
+C 201 ; WX 8181 ; N Eacute ; B -10 -288 8160 932 ;
+C 202 ; WX 8181 ; N Ecircumflex ; B -10 -288 8160 932 ;
+C 203 ; WX 8181 ; N Edieresis ; B -10 -288 8160 932 ;
+C 204 ; WX 0 ; N Igrave ; B 0 0 0 0 ;
+C 205 ; WX 0 ; N Iacute ; B 0 0 0 0 ;
+C 206 ; WX 0 ; N Icircumflex ; B 0 0 0 0 ;
+C 207 ; WX 0 ; N Idieresis ; B 0 0 0 0 ;
+C 208 ; WX 8181 ; N Eth ; B -10 -288 8160 932 ;
+C 209 ; WX 8181 ; N Ntilde ; B -10 -288 8160 932 ;
+C 210 ; WX 8181 ; N Ograve ; B -10 -288 8160 932 ;
+C 211 ; WX 8181 ; N Oacute ; B -10 -288 8160 932 ;
+C 212 ; WX 8181 ; N Ocircumflex ; B -10 -288 8160 932 ;
+C 213 ; WX 8181 ; N Otilde ; B -10 -288 8160 932 ;
+C 214 ; WX 8181 ; N Odieresis ; B -10 -288 8160 932 ;
+C 215 ; WX 8181 ; N OE ; B -10 -288 8160 932 ;
+C 216 ; WX 8181 ; N Oslash ; B -10 -288 8160 932 ;
+C 217 ; WX 8181 ; N Ugrave ; B -10 -288 8160 932 ;
+C 218 ; WX 8181 ; N Uacute ; B -10 -288 8160 932 ;
+C 219 ; WX 8181 ; N Ucircumflex ; B -10 -288 8160 932 ;
+C 220 ; WX 6544 ; N Udieresis ; B -10 -288 6530 932 ;
+C 221 ; WX 6544 ; N Yacute ; B -10 -288 6530 932 ;
+C 222 ; WX 6544 ; N Thorn ; B -10 -288 6530 932 ;
+C 223 ; WX 6544 ; N Germandbls ; B -10 -288 6530 932 ;
+C 224 ; WX 6544 ; N agrave ; B -10 -288 6530 932 ;
+C 225 ; WX 6544 ; N aacute ; B -10 -288 6530 932 ;
+C 226 ; WX 6544 ; N acircumflex ; B -10 -288 6530 932 ;
+C 227 ; WX 6544 ; N atilde ; B -10 -288 6530 932 ;
+C 228 ; WX 6544 ; N adieresis ; B -10 -288 6530 932 ;
+C 229 ; WX 6544 ; N aring ; B -10 -288 6530 932 ;
+C 230 ; WX 6544 ; N ae ; B -10 -288 6530 932 ;
+C 231 ; WX 6544 ; N ccedilla ; B -10 -288 6530 932 ;
+C 232 ; WX 8181 ; N egrave ; B -10 -288 8160 932 ;
+C 233 ; WX 8181 ; N eacute ; B -10 -288 8160 932 ;
+C 234 ; WX 8181 ; N ecircumflex ; B -10 -288 8160 932 ;
+C 235 ; WX 8181 ; N edieresis ; B -10 -288 8160 932 ;
+C 236 ; WX 8181 ; N igrave ; B -10 -288 8160 932 ;
+C 237 ; WX 8181 ; N iacute ; B -10 -288 8160 932 ;
+C 238 ; WX 8181 ; N icircumflex ; B -10 -288 8160 932 ;
+C 239 ; WX 8181 ; N idieresis ; B -10 -288 8160 932 ;
+C 240 ; WX 8181 ; N eth ; B -10 -288 8160 932 ;
+C 241 ; WX 8181 ; N ntilde ; B -10 -288 8160 932 ;
+C 242 ; WX 8181 ; N ograve ; B -10 -288 8160 932 ;
+C 243 ; WX 8181 ; N oacute ; B -10 -288 8160 932 ;
+C 244 ; WX 0 ; N ocircumflex ; B 0 0 0 0 ;
+C 245 ; WX 0 ; N otilde ; B 0 0 0 0 ;
+C 246 ; WX 0 ; N odieresis ; B 0 0 0 0 ;
+C 247 ; WX 0 ; N oe ; B 0 0 0 0 ;
+C 248 ; WX 0 ; N oslash ; B 0 0 0 0 ;
+C 249 ; WX 0 ; N ugrave ; B 0 0 0 0 ;
+C 250 ; WX 0 ; N uacute ; B 0 0 0 0 ;
+C 251 ; WX 0 ; N ucircumflex ; B 0 0 0 0 ;
+C 252 ; WX 0 ; N udieresis ; B 0 0 0 0 ;
+C 253 ; WX 0 ; N yacute ; B 0 0 0 0 ;
+C 254 ; WX 0 ; N thorn ; B 0 0 0 0 ;
+C 255 ; WX 0 ; N germandbls ; B 0 0 0 0 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitwg.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitwg.afm
index 66b8ea7c39c..62573ea6163 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitwg.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitwg.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:10 2010
+Comment Creation Date: Sun Aug 29 08:39:20 2010
FontName KnittingSymbols-wide-grid-Medium
FullName KnittingSymbols-wide-grid
FamilyName KnittingSymbols-wide-grid
@@ -17,7 +17,7 @@ CapHeight 937
XHeight 937
Ascender 937
Descender -293
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1636 ; N grave ; B -15 -293 1645 937 ;
C 1 ; WX 1636 ; N acute ; B -15 -293 1645 937 ;
C 2 ; WX 1636 ; N circumflex ; B -15 -293 1645 937 ;
@@ -27,7 +27,7 @@ C 5 ; WX 1636 ; N hungarumlaut ; B -15 -293 1645 937 ;
C 6 ; WX 0 ; N ring ; B -15 -293 15 937 ;
C 17 ; WX 1636 ; N quotedblright ; B -15 -293 1645 937 ;
C 18 ; WX 1636 ; N quotedblbase ; B -15 -293 1645 937 ;
-C 19 ; WX 1636 ; N guillemotleft ; B 265 -114 1175 757 ;
+C 19 ; WX 1636 ; N guillemotleft ; B 0 0 0 0 ;
C 20 ; WX 1636 ; N guillemotright ; B -15 -293 1645 937 ;
C 21 ; WX 1636 ; N endash ; B -15 -293 1645 937 ;
C 22 ; WX 818 ; N emdash ; B 0 -293 815 937 ;
@@ -41,7 +41,7 @@ C 29 ; WX 1636 ; N fl ; B 0 -293 1630 937 ;
C 30 ; WX 1636 ; N ffi ; B 0 -293 1630 937 ;
C 31 ; WX 8181 ; N ffl ; B -15 -293 8165 937 ;
C 33 ; WX 1636 ; N exclam ; B -15 -293 1645 937 ;
-C 34 ; WX 1636 ; N quotedbl ; B 455 -114 1365 757 ;
+C 34 ; WX 1636 ; N quotedbl ; B 0 0 0 0 ;
C 39 ; WX 818 ; N quoteright ; B 0 0 0 0 ;
C 40 ; WX 1636 ; N parenleft ; B -15 -293 1645 937 ;
C 41 ; WX 1636 ; N parenright ; B -15 -293 1645 937 ;
@@ -56,6 +56,10 @@ C 50 ; WX 1636 ; N two ; B -15 -293 1645 937 ;
C 51 ; WX 1636 ; N three ; B -15 -293 1645 937 ;
C 52 ; WX 1636 ; N four ; B -15 -293 1645 937 ;
C 53 ; WX 1636 ; N five ; B -15 -293 1645 937 ;
+C 54 ; WX 1636 ; N six ; B -15 -293 1645 937 ;
+C 55 ; WX 1636 ; N seven ; B -15 -293 1645 937 ;
+C 56 ; WX 1636 ; N eight ; B -15 -293 1645 937 ;
+C 57 ; WX 1636 ; N nine ; B -15 -293 1645 937 ;
C 58 ; WX 1636 ; N colon ; B -15 -293 1645 937 ;
C 59 ; WX 1636 ; N semicolon ; B -15 -293 1645 937 ;
C 60 ; WX 1636 ; N less ; B -15 -293 1645 937 ;
@@ -118,7 +122,9 @@ C 119 ; WX 1636 ; N w ; B -15 -293 1645 937 ;
C 120 ; WX 1636 ; N x ; B -15 -293 1645 937 ;
C 121 ; WX 1636 ; N y ; B -15 -293 1645 937 ;
C 122 ; WX 1636 ; N z ; B -15 -293 1645 937 ;
+C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 151 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ;
C 126 ; WX 1636 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1636 ; N hyphen ; B -15 -293 1645 937 ;
C 128 ; WX 3272 ; N Abreve ; B -15 -293 3275 937 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm
index 1dcf2c1074f..b18fab3399a 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:07 2010
+Comment Creation Date: Sun Aug 29 08:39:18 2010
FontName KnittingSymbols-wide-foreground-Medium
FullName KnittingSymbols-wide-foreground
FamilyName KnittingSymbols-wide-foreground
@@ -16,7 +16,7 @@ FontBBox -35 -293 7617 937
CapHeight 688
XHeight 662
Ascender 712
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1636 ; N grave ; B 295 -198 1335 842 ;
C 1 ; WX 1636 ; N acute ; B 480 472 1150 842 ;
C 2 ; WX 1636 ; N circumflex ; B 480 472 1150 842 ;
@@ -52,9 +52,13 @@ C 46 ; WX 1636 ; N period ; B 515 22 1115 622 ;
C 47 ; WX 1636 ; N slash ; B 0 0 0 0 ;
C 49 ; WX 1636 ; N one ; B 190 147 1630 617 ;
C 50 ; WX 1636 ; N two ; B 475 -18 1155 662 ;
-C 51 ; WX 1636 ; N three ; B 425 -68 1165 712 ;
+C 51 ; WX 1636 ; N three ; B 425 -68 1205 712 ;
C 52 ; WX 1636 ; N four ; B 478 -18 1152 662 ;
C 53 ; WX 1636 ; N five ; B 478 -18 1152 662 ;
+C 54 ; WX 1636 ; N six ; B 465 -18 1165 662 ;
+C 55 ; WX 1636 ; N seven ; B 571 -28 1019 672 ;
+C 56 ; WX 1636 ; N eight ; B 611 -28 1059 672 ;
+C 57 ; WX 1636 ; N nine ; B 80 -154 1550 672 ;
C 58 ; WX 1636 ; N colon ; B 475 -18 1115 662 ;
C 59 ; WX 1636 ; N semicolon ; B 515 -18 1155 662 ;
C 60 ; WX 1636 ; N less ; B 515 -18 1155 662 ;
@@ -62,7 +66,7 @@ C 61 ; WX 1636 ; N equal ; B 0 0 0 0 ;
C 62 ; WX 1636 ; N greater ; B 475 -18 1115 662 ;
C 63 ; WX 1636 ; N question ; B 210 -28 1630 712 ;
C 64 ; WX 1636 ; N at ; B 522 29 1108 615 ;
-C 65 ; WX 1636 ; N A ; B 425 -68 1165 712 ;
+C 65 ; WX 1636 ; N A ; B 425 -68 1205 712 ;
C 66 ; WX 1636 ; N B ; B 557 -18 1073 710 ;
C 67 ; WX 1636 ; N C ; B 0 0 0 0 ;
C 68 ; WX 1636 ; N D ; B 0 0 0 0 ;
@@ -73,13 +77,13 @@ C 72 ; WX 1636 ; N H ; B 675 -28 955 707 ;
C 73 ; WX 1636 ; N I ; B 515 -18 1179 688 ;
C 74 ; WX 1636 ; N J ; B 451 -18 1115 688 ;
C 75 ; WX 1636 ; N K ; B 0 0 0 0 ;
-C 76 ; WX 1636 ; N L ; B 465 -68 1205 712 ;
+C 76 ; WX 1636 ; N L ; B 465 -69 1205 712 ;
C 77 ; WX 1636 ; N M ; B 515 112 1115 532 ;
C 78 ; WX 1636 ; N N ; B 0 0 0 0 ;
C 79 ; WX 1636 ; N O ; B 475 -18 1155 662 ;
C 80 ; WX 1636 ; N P ; B 0 0 0 0 ;
C 81 ; WX 1636 ; N Q ; B 557 -18 1073 710 ;
-C 82 ; WX 1636 ; N R ; B 425 -68 1165 712 ;
+C 82 ; WX 1636 ; N R ; B 425 -69 1165 712 ;
C 83 ; WX 1636 ; N S ; B 430 182 1165 462 ;
C 84 ; WX 1636 ; N T ; B 557 -65 1073 662 ;
C 85 ; WX 1636 ; N U ; B -35 22 1665 622 ;
@@ -117,7 +121,9 @@ C 119 ; WX 1636 ; N w ; B 425 -68 1205 712 ;
C 120 ; WX 1636 ; N x ; B 557 -65 1073 662 ;
C 121 ; WX 1636 ; N y ; B 478 -18 1152 662 ;
C 122 ; WX 1636 ; N z ; B 465 -28 1165 672 ;
+C 123 ; WX 636 ; N braceleft ; B 148 84 500 541 ;
C 124 ; WX 151 ; N bar ; B 0 -293 150 937 ;
+C 125 ; WX 636 ; N braceright ; B 133 84 485 541 ;
C 126 ; WX 1636 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1636 ; N hyphen ; B 0 0 0 0 ;
C 128 ; WX 3272 ; N Abreve ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitwp.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitwp.afm
index 500b4ac8c8f..97570dad786 100644
--- a/Master/texmf-dist/fonts/afm/public/knitting/knitwp.afm
+++ b/Master/texmf-dist/fonts/afm/public/knitting/knitwp.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20070915
-Comment Creation Date: Sat Jan 16 18:33:11 2010
+Comment Creation Date: Sun Aug 29 08:39:21 2010
FontName KnittingSymbols-wide-purl-Medium
FullName KnittingSymbols-wide-purl
FamilyName KnittingSymbols-wide-purl
@@ -15,7 +15,7 @@ EncodingScheme FontSpecific
FontBBox 0 -278 8150 922
CapHeight 922
Descender -278
-StartCharMetrics 231
+StartCharMetrics 237
C 0 ; WX 1636 ; N grave ; B 0 0 0 0 ;
C 1 ; WX 1636 ; N acute ; B 0 0 0 0 ;
C 2 ; WX 1636 ; N circumflex ; B 0 -278 1630 922 ;
@@ -54,6 +54,10 @@ C 50 ; WX 1636 ; N two ; B 0 -278 1630 922 ;
C 51 ; WX 1636 ; N three ; B 0 -278 1630 922 ;
C 52 ; WX 1636 ; N four ; B 0 0 0 0 ;
C 53 ; WX 1636 ; N five ; B 0 0 0 0 ;
+C 54 ; WX 1636 ; N six ; B 0 0 0 0 ;
+C 55 ; WX 1636 ; N seven ; B 0 0 0 0 ;
+C 56 ; WX 1636 ; N eight ; B 0 0 0 0 ;
+C 57 ; WX 1636 ; N nine ; B 0 0 0 0 ;
C 58 ; WX 1636 ; N colon ; B 0 -278 1630 922 ;
C 59 ; WX 1636 ; N semicolon ; B 0 -278 1630 922 ;
C 60 ; WX 1636 ; N less ; B 0 0 0 0 ;
@@ -116,7 +120,9 @@ C 119 ; WX 1636 ; N w ; B 0 0 0 0 ;
C 120 ; WX 1636 ; N x ; B 0 0 0 0 ;
C 121 ; WX 1636 ; N y ; B 0 0 0 0 ;
C 122 ; WX 1636 ; N z ; B 0 0 0 0 ;
+C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ;
C 124 ; WX 151 ; N bar ; B 0 0 0 0 ;
+C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ;
C 126 ; WX 1636 ; N asciitilde ; B 0 0 0 0 ;
C 127 ; WX 1636 ; N hyphen ; B 0 0 0 0 ;
C 128 ; WX 3272 ; N Abreve ; B 0 0 0 0 ;
diff --git a/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map b/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map
index c728bd0aaac..f28f8d241ef 100644
--- a/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map
+++ b/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map
@@ -11,3 +11,10 @@ knitnl KnittingSymbols-nogrid-lowered-Medium <knitnl.pfb
knitgg KnittingSymbols-grid-grid-Medium <knitgg.pfb
knitwg KnittingSymbols-wide-grid-Medium <knitwg.pfb
+
+knitn_sc_in KnittingSymbols-nogrid-incount-Medium <knitn_sc_in.pfb
+knitn_sc_out KnittingSymbols-nogrid-outcount-Medium <knitn_sc_out.pfb
+knitg_sc_in KnittingSymbols-grid-incount-Medium <knitg_sc_in.pfb
+knitg_sc_out KnittingSymbols-grid-outcount-Medium <knitg_sc_out.pfb
+knitw_sc_in KnittingSymbols-wide-incount-Medium <knitw_sc_in.pfb
+knitw_sc_out KnittingSymbols-wide-outcount-Medium <knitw_sc_out.pfb \ No newline at end of file
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf b/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf
index 0e69a6bdbb7..e705e163dfb 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf
@@ -1,3 +1,5 @@
+% Date: 2010/08/10
+
widewd# = 16.3pt#;
% This is as wide as a cell can be without causing problems with 5-cell-wide symbols
if known wd#: else: wd# = 12 pt#; fi
@@ -5,6 +7,7 @@ if known wd#: else: wd# = 12 pt#; fi
symbolwidth#=0.7pt#;
purl_symbolwidth#=0.7pt#;
+ finesymbolwidth# = 0.4pt#;
gridwidth# = if gridfont: 0.3pt# else: 0pt# fi;
overlinewd# = if gridfont: 1.5pt# else: 0.8pt# fi;
@@ -39,7 +42,7 @@ purlextend# := 0pt#;
else:
purlextend# := 0.2pt#;
fi
-%
+
% Purlextend affects how far outside their box the purl background goes.
%
% This is largely irrelevant when printing,
@@ -49,14 +52,15 @@ fi
% particular printer, this is one parameter you *have* to fiddle with.
define_pixels(wd,ht,dp);
-define_blacker_pixels(cableextend,purlextend,gridwidth,symbolwidth,purl_symbolwidth,
- overlinewidth);
+define_blacker_pixels(cableextend,purlextend,gridwidth,symbolwidth,
+ purl_symbolwidth, finesymbolwidth, overlinewidth);
define_pixels(eraserwidth,wrapturngap);
define_corrected_pixels(o,ho);
define_pixels(standardgap,smallgap,mingap,topgap,bottomgap,
cablevertgap,cablebargap,cableslant, botcableheight,topcableheight);
pickup pencircle scaled symbolwidth; symbol_pen := savepen;
+pickup pencircle scaled finesymbolwidth; fine_pen := savepen;
pickup pencircle scaled purl_symbolwidth; purl_symbol_pen := savepen;
pickup pencircle scaled eraserwidth; eraser_pen := savepen;
@@ -90,8 +94,10 @@ overlinewd#, % dimen 11: overline/bar width
(topgap#-bottomgap#), % dimen 13: vertical offset
purlextend#; % dimen 14: purl box outlap
-def incrwidth (expr sts) = wd# enddef;
-def decrwidth (expr sts) = wd# enddef;
+if known incrwidthdefined: else:
+ def incrwidth (expr stsin, stsout) = 1*wd# enddef;
+ def decrwidth (expr stsin, stsout) = 1*wd# enddef;
+fi
Vwidth := standardheight; % Used twice: v and y
Wwidth := biggerheight; % Used for make 3 from 1
wideincline := 2symbolwidth;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knit_grid_cables.mf b/Master/texmf-dist/fonts/source/public/knitting/knit_grid_cables.mf
index 8e95657cb02..e127626bd5e 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knit_grid_cables.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knit_grid_cables.mf
@@ -1,3 +1,5 @@
+% Date: 2010/08/10
+
picture symbolpic[];
beginchar(5,wd#,ht#,dp#); "Top and bottom outlines";
@@ -16,14 +18,14 @@ endchar;
code := 127;
-beginchar(".",wd#,ht#,dp#); "No stitch";
+beginchar(".",incrwidth(0,0),ht#,dp#); "No stitch";
fill (0.5(w-standardheight),-d+bottomgap) --
(0.5(w-standardheight),h-topgap) --
(0.5(w+standardheight),h-topgap) --
(0.5(w+standardheight),-d+bottomgap) -- cycle;
symbolpic0 := currentpicture;
charbox; endchar;
-beginchar(",",wd#,ht#,dp#); "Purl no stitch";
+beginchar(",",incrwidth(0,0),ht#,dp#); "Purl no stitch";
currentpicture := symbolpic0;
purlbox; endchar;
@@ -32,11 +34,13 @@ beginchar("-",wd#,ht#,dp#); "A knit stitch";
beginchar("=",wd#,ht#,dp#); "A purl stitch";
purlbox; endchar;
-%Cables
+% Cables
cablelinewidth#:=0.4pt#;
define_blacker_pixels(cablelinewidth);
pickup pencircle scaled cablelinewidth; cable_pen := savepen;
+
+% The one-letter cells
beginchar("p",wd#,ht#,dp#); "Purl cable background";
purlbox; endchar;
@@ -67,6 +71,8 @@ beginchar("e",wd#,ht#,dp#); "Odd twist";
beginchar("o",wd#,ht#,dp#); "Odd twist";
charbox; endchar;
+% Horizontal cables
+
horizcablegap# := 0.3 wd#;
define_pixels(horizcablegap);
@@ -135,6 +141,8 @@ ligtable righthoriz:
"+" |=: righthoriz,
specialhoriz =:| midhoriz,
righthoriz =:| midhoriz;
+
+% Setup for the standard cables
numeric cableleft[][][]; numeric cableright[][][];
numeric whitecableleft[][][]; numeric whitecableright[][][];
@@ -161,7 +169,7 @@ for sts = 2 upto 3:
purlbox; endchar;
endfor
-% Draw all the cables
+% Draw the cables
if known slantlines: else: boolean slantlines; slantlines = false; fi
@@ -422,14 +430,17 @@ fi
fi
endfor endfor endfor
-%Ligatures
+
+% Ligatures to let kkKK turn into a cable
+
+if fonttype <> counttype:
cableright[0][1][0] := ASCII"k";
cableleft[1][0][0] := ASCII"K";
revcableright[0][1] := ASCII"p";
revcableleft[1][0] := ASCII"P";
- ligtable "c":
+ligtable "c":
"k" =: cableright[0][1+1][0],
"c" =: cableright[0][1+1][0],
"p" =: cableright[1][1][1],
@@ -570,3 +581,4 @@ for frontsts = 1 upto 3:
endfor
endfor
+fi
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knit_nogrid_cables.mf b/Master/texmf-dist/fonts/source/public/knitting/knit_nogrid_cables.mf
index 44a34381186..126d1f28176 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knit_nogrid_cables.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knit_nogrid_cables.mf
@@ -1,7 +1,9 @@
-beginchar(",",wd#,ht#,dp#); "No stitch";
+% Date: 2010/08/10
+
+beginchar(",",incrwidth(0,0),ht#,dp#); "No stitch";
purlbox;
endchar;
-beginchar(".",wd#,ht#,dp#); "No stitch";
+beginchar(".",incrwidth(0,0),ht#,dp#); "No stitch";
endchar;
path purlbar;
@@ -49,7 +51,7 @@ cablerightbackslash := 12;
leftslash := 13;
rightslash := 14;
-beginchar("+",wd#,ht#,dp#); "Left end of a horizontal cable";
+beginchar("+",wd#,ht#,dp#); "Horizontal cable";
pickup symbol_pen;
HCtop = (h-d)/2 + 0.2standardheight;
HCbot = (h-d)/2 - 0.2standardheight;
@@ -65,19 +67,19 @@ beginchar("+",wd#,ht#,dp#); "Left end of a horizontal cable";
symbolpic0 := currentpicture;
charbox; endchar;
-beginchar(midhoriz,wd#,ht#,dp#); "Middle of a horizontal cable";
- currentpicture := symbolpic0;
- charbox; endchar;
-beginchar(righthoriz,wd#,ht#,dp#); "Right end of a horizontal cable";
- currentpicture := symbolpic0;
- charbox; endchar;
-
-ligtable "+": specialhoriz:
- "+" |=: righthoriz;
-ligtable righthoriz:
- "+" |=: righthoriz,
- specialhoriz =:| midhoriz,
- righthoriz =:| midhoriz;
+%beginchar(midhoriz,wd#,ht#,dp#); "Middle of a horizontal cable";
+% currentpicture := symbolpic0;
+% charbox; endchar;
+%beginchar(righthoriz,wd#,ht#,dp#); "Right end of a horizontal cable";
+% currentpicture := symbolpic0;
+% charbox; endchar;
+%
+%ligtable "+": specialhoriz:
+% "+" |=: righthoriz;
+%ligtable righthoriz:
+% "+" |=: righthoriz,
+% specialhoriz =:| midhoriz,
+% righthoriz =:| midhoriz;
beginchar(specialhoriz,wd#,ht#,dp#); "Special horizontal cable";
pickup symbol_pen;
@@ -122,58 +124,58 @@ beginchar(pright,wd#,ht#,dp#); "Purl cable background";
purlbox;
endchar;
-beginchar("n",wd#,ht#,dp#); "Back make one";
+beginchar("n",incrwidth(0,1),ht#,dp#); "Back make one";
pickup symbol_pen;
- drawM(h-topgap, botcableheight+cablevertgap, 0.5w,symbolwidth);
+ drawM(h-topgap, botcableheight+cablevertgap, 0.5wd,symbolwidth);
charbox;
symbolpic0:=currentpicture;
endchar;
-beginchar(nright,wd#,ht#,dp#); "Back make one";
+beginchar(nright,incrwidth(0,1),ht#,dp#); "Back make one";
currentpicture := symbolpic0; endchar;
-beginchar("e",wd#,ht#,dp#); "Back purlwise make one";
+beginchar("e",incrwidth(0,1),ht#,dp#); "Back purlwise make one";
pickup purl_symbol_pen;
- drawM(h-topgap, botcableheight+cablevertgap, 0.5w,purl_symbolwidth);
+ drawM(h-topgap, botcableheight+cablevertgap, 0.5wd,purl_symbolwidth);
symbolpic0:=currentpicture; purlbox;
endchar;
-beginchar(eright,wd#,ht#,dp#); "Back purlwise make one";
+beginchar(eright,incrwidth(0,1),ht#,dp#); "Back purlwise make one";
currentpicture := symbolpic0;
purlbox;
endchar;
-beginchar("N",wd#,ht#,dp#); "Front make one";
+beginchar("N",incrwidth(0,1),ht#,dp#); "Front make one";
pickup symbol_pen;
- drawM(topcableheight-cablevertgap, -d+bottomgap, 0.5w,symbolwidth);
+ drawM(topcableheight-cablevertgap, -d+bottomgap, 0.5wd,symbolwidth);
symbolpic0 := currentpicture;
charbox; endchar;
-beginchar(Nright,wd#,ht#,dp#); "Front make one";
+beginchar(Nright,incrwidth(0,1),ht#,dp#); "Front make one";
currentpicture := symbolpic0;
charbox; endchar;
-beginchar("d",wd#,ht#,dp#); "Back decrease";
+beginchar("d",decrwidth(2,1),ht#,dp#); "Back decrease";
pickup symbol_pen;
drawSSK(h-topgap, botcableheight+cablevertgap);
charbox; symbolpic0:=currentpicture;
endchar;
-beginchar(dright,wd#,ht#,dp#); "Back decrease";
+beginchar(dright,decrwidth(2,1),ht#,dp#); "Back decrease";
fliphoriz(symbolpic0)(currentpicture); endchar;
-beginchar("o",wd#,ht#,dp#); "Back purl decrease";
+beginchar("o",decrwidth(2,1),ht#,dp#); "Back purl decrease";
pickup purl_symbol_pen;
drawSSK(h-topgap, botcableheight+cablevertgap);
symbolpic0:=currentpicture; purlbox;
endchar;
-beginchar(oright,wd#,ht#,dp#); "Back purl decrease";
+beginchar(oright,decrwidth(2,1),ht#,dp#); "Back purl decrease";
fliphoriz(symbolpic0)(currentpicture);
purlbox;
endchar;
-beginchar("D",wd#,ht#,dp#); "Front decrease";
+beginchar("D",decrwidth(2,1),ht#,dp#); "Front decrease";
pickup symbol_pen;
drawSSK(topcableheight-cablevertgap,-d+bottomgap);
charbox; symbolpic0:=currentpicture;
endchar;
-beginchar(Dright,wd#,ht#,dp#); "Front decrease";
+beginchar(Dright,decrwidth(2,1),ht#,dp#); "Front decrease";
fliphoriz(symbolpic0)(currentpicture); endchar;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf b/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf
index b69176268d2..e39d923d6bd 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf
@@ -1,3 +1,17 @@
+% Date: 2010/08/10
+
+% Don't flash pictures of the characters as you draw them.
+% This is dizzying, and UNIX can't do it anyway.
+displaying := 0;
+
+% If you want actual documentation, say
+% "mf knitnn" and then
+% "gftodvi knitnn.2602gf" and then
+% "dvipdfm knitnn"
+% at a command prompt in the directory containing this file.
+% This will give you a PDF with big pictures of all the characters in
+% the font with the important points labeled.
+
if known ps_output:
font_coding_scheme := "T1-WGL4.enc";
fi
@@ -16,6 +30,11 @@ purltype = 0;
gridtype = 1;
foretype = 2;
bothtype = 3;
+counttype = 4;
+
+if fonttype = counttype:
+ extra_endchar := extra_endchar & "pickup pencircle scaled 0.2pt; if w>0: draw (0,-d)--(0,h); draw (w,-d)--(w,h); fi";
+fi
if gridfont:
def charbox =
@@ -27,8 +46,10 @@ def charbox =
pickup pencircle scaled gridwidth;
fill (-gridwidth/2,-d-gridwidth/2)--(w+gridwidth/2,-d-gridwidth/2)--
(w+gridwidth/2,h+gridwidth/2)--(-gridwidth/2,h+gridwidth/2)--cycle;
- unfill (gridwidth/2,-d+gridwidth/2)--(w-gridwidth/2,-d+gridwidth/2)--
- (w-gridwidth/2,h-gridwidth/2)--(gridwidth/2,h-gridwidth/2)--cycle;
+ if (w>0):
+ unfill (gridwidth/2,-d+gridwidth/2)--(w-gridwidth/2,-d+gridwidth/2)--
+ (w-gridwidth/2,h-gridwidth/2)--(gridwidth/2,h-gridwidth/2)--cycle;
+ fi
%draw (0,-d)--(w,-d)--(w,h)--(0,h)--cycle;
fi
fi
@@ -41,7 +62,6 @@ def charbox =
enddef;
fi
-
def purlbox = charbox; purlfill; enddef;
picture symbolpic[];
@@ -67,6 +87,8 @@ def definearrow(text thepath, arrowlength, endpath) =
;
enddef;
+% Arrow symbols
+
beginchar("s",wd#,ht#,dp#); "Slip one left";
pickup symbol_pen;
y1 = y2 = (h-d)/2-offset;
@@ -76,16 +98,15 @@ beginchar("s",wd#,ht#,dp#); "Slip one left";
definearrow(symbolpath0)((x2-x1)/3)(symbolpath1);
draw symbolpath0;
draw symbolpath1;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
beginchar("S",wd#,ht#,dp#); "Slip one right";
- fliphoriz(symbolpic0)(currentpicture);
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
beginchar("[",wd#,ht#,dp#); "Slip one left knitwise";
pickup symbol_pen;
- pickup symbol_pen;
y1 = y2 = (h-d)/2-offset;
0.5[x1,x2]=w/2;
rt x2 - lft x1 = ht+dp-2*0.3[smallgap,mingap];
@@ -99,16 +120,16 @@ beginchar("[",wd#,ht#,dp#); "Slip one left knitwise";
y4-y3 = 1.5 ypart (point 2 of symbolpath1 - point 0 of symbolpath1);
draw z3--z4;
labels(1,2,3,4);
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
beginchar("]",wd#,ht#,dp#); "Slip one right knitwise";
- fliphoriz(symbolpic0)(currentpicture);
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
flipvert(currentpicture)(currentpicture);
charbox; endchar;
-beginchar("h",wd#,ht#,dp#); "Drop stitch";
+beginchar("h",decrwidth(1,0),ht#,dp#); "Drop stitch";
pickup symbol_pen;
y1 = bot h-small_topgap;
y2 = top -d+small_bottomgap;
@@ -117,14 +138,22 @@ beginchar("h",wd#,ht#,dp#); "Drop stitch";
definearrow(symbolpath0)((y1-y2)/3)(symbolpath1);
draw symbolpath0;
draw symbolpath1;
- symbolpic0 := currentpicture;
charbox; endchar;
-beginchar("H",wd#,ht#,dp#); "Up arrow";
- flipvert(symbolpic0)(currentpicture);
+beginchar("H",incrwidth(0,1),ht#,dp#); "Up arrow";
+ pickup symbol_pen;
+ y1 = bot h-small_topgap;
+ y2 = top -d+small_bottomgap;
+ x1 = x2 =w/2;
+ symbolpath0 := z1--z2;
+ definearrow(reverse symbolpath0)((y1-y2)/3)(symbolpath1);
+ draw symbolpath0;
+ draw symbolpath1;
charbox; endchar;
-beginchar("O",wd#,ht#,dp#); "Yarn over";
+% Miscellaneous symbols
+
+beginchar("O",incrwidth(0,1),ht#,dp#); "Yarn over";
pickup symbol_pen;
top z1 = (0.5w, h-topgap+o);
bot z3 = (0.5w, bottomgap-d-o);
@@ -147,8 +176,8 @@ beginchar("@",wd#,ht#,dp#); "Bead";
unfill fullcircle scaled 0.3333(y1-y3) shifted 0.5[z1,z3];
charbox; endchar;
-beginchar(ditto,wd#,ht#,dp#); "Wrap and turn";
- if fonttype <> purltype:
+beginchar(ditto,incrwidth(0,0),ht#,dp#); "Wrap and turn";
+ if (fonttype = foretype) or (fonttype = bothtype) or (fonttype = counttype):
pickup symbol_pen;
z0 = 0.4[z1,z3] = 0.5[z2,z4];
x3=x1=w/2; y2=y4; y3-y1=x4-x2;
@@ -173,10 +202,10 @@ beginchar(ditto,wd#,ht#,dp#); "Wrap and turn";
draw symbolpath0;
draw symbolpath1;
fi
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
endchar;
-beginchar(19,wd#,ht#,dp#); "Reverse wrap and turn";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar(19,incrwidth(0,0),ht#,dp#); "Reverse wrap and turn";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
endchar;
ligtable
@@ -218,16 +247,24 @@ def drawM(expr topheight, bottomheight, mwidth, penwidth) =
labels(1,2,3,4,5,6,7,8,9,10,4l,4r);
enddef;
-def drawstar(expr topheight, bottomheight) =
- top z1 = (w/2,topheight+o);
- bot z2 = (w/2, bottomheight-o);
+beginchar("*",wd#,ht#,dp#); "Special instructions";
+ pickup symbol_pen;
+ top z1 = (w/2,h-topgap+o);
+ bot z2 = (w/2, -d+bottomgap-o);
z3 - z4 = (z1-z2) rotated 60;
z5 - z6 = (z1-z2) rotated 120;
0.5[z3,z4] = 0.5 [z5,z6] = 0.5[z1,z2];
- draw z1--z2; draw z3--z4; draw z5--z6;
-enddef;
-
-beginchar("*",wd#,ht#,dp#); "Special instructions"; pickup symbol_pen; drawstar(h-topgap,-d+bottomgap); charbox; endchar;
+ for k=1,3,5:
+ z[k]' = 0.25[z[k],z[k+1]];
+ 0.5[z[k+1]',z[k]']=0.5[z1,z2];
+ z[k]'' = 0.5[z[k],z[k+1]];
+ penpos[k]'(symbolwidth, angle (z[k]-z[k+1])+90);
+ penpos[k+1]'(symbolwidth, angle (z[k]-z[k+1])+90);
+ penpos[k]''((1/sqrt(3))*symbolwidth, angle (z[k]-z[k+1])+90);
+ draw z[k]--z[k]'; draw z[k+1]--z[k+1]';
+ penstroke z[k]'e{z[k+1]-z[k]}..z[k]''e..{z[k+1]-z[k]}z[k+1]'e;
+ endfor
+charbox; endchar;
%beginchar("a",wd#,ht#,dp#); "Small bobble";
% pickup symbol_pen;
@@ -268,25 +305,25 @@ def drawhat(expr linewd) =
fill z3l---z1l3..z1l2---z2l..z2m..z2r---z1r---z3r..z3m..cycle;
enddef;
-
+% Increases and decreases
beginchar(1,wd#,ht#,dp#); "Make 1 from N";
% Fontforge keeps mangling this symbol, so I'm doing it the slow, hard, but reliable way.
drawhat(symbolwidth);
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
beginchar(2,wd#,ht#,dp#); "Purl make 1 from N";
drawhat(purl_symbolwidth);
- symbolpic1 := currentpicture;
+ symbolpic1 := currentpicture; symbolpicwd1 := w;
purlbox; endchar;
beginchar(3,wd#,ht#,dp#); "Make N from 1";
- flipvert(symbolpic0)(currentpicture);
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
charbox; endchar;
beginchar(4,wd#,ht#,dp#); "Purl make N from 1";
- flipvert(symbolpic1)(currentpicture);
+ flipvert(symbolpic1)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd1)/2,0);
purlbox; endchar;
-beginchar("U",wd#,ht#,dp#); "Cast on";
+beginchar("U",incrwidth(0,1),ht#,dp#); "Cast on";
if fonttype <> purltype:
pickup symbol_pen;
bot y1 = bot y3 = -d+bottomgap;
@@ -294,27 +331,25 @@ beginchar("U",wd#,ht#,dp#); "Cast on";
draw z1{right}..z2{left}..z3{right};
fi
endchar;
-beginchar("f",wd#,ht#,dp#); "Bind off knitwise";
+beginchar("f",decrwidth(1,0),ht#,dp#); "Bind off knitwise";
if fonttype <> purltype:
pickup symbol_pen;
- x1 = 0; x3 = w; x2 = w/2;
+ x3-x1=wd; 0.5[x1,x3]=w/2; x2 = 0.5[x1,x3];
y1 = y3 = (h-d)/2; top y2 = h-topgap;
bot z4 = (w/2, -d+bottomgap);
- draw z1..z2{right}..z3;
+ symbolpath0 := z1..z2{right}..z3;
+ draw symbolpath0;
%draw z4--bot z1;
fi
endchar;
-beginchar("F",wd#,ht#,dp#); "Bind off purlwise";
+beginchar("F",decrwidth(1,0),ht#,dp#); "Bind off purlwise";
if fonttype <> purltype:
- pickup symbol_pen;
- x1 = 0; x3 = w; x2 = w/2;
- y1 = y3 = (h-d)/2; top y2 = h-topgap;
- draw z1..z2{right}..z3;
+ pickup purl_symbol_pen;
+ draw symbolpath0;
fi
purlfill; endchar;
-beginchar("Z",wd#,ht#,dp#); "Knit one doubly elongated";
+beginchar("Z",incrwidth(1,3),ht#,dp#); "Knit one doubly elongated";
pickup symbol_pen;
-% drawstar(h-topgap,-d+bottomgap);
0.5[z1,z7] = top (w/2, -d+min_bottomgap);
y1 = y7;
x7 - x1 = 0.8(x8 - x0);
@@ -351,7 +386,7 @@ beginchar("Z",wd#,ht#,dp#); "Knit one doubly elongated";
charbox; endchar;
-beginchar("z",wd#,ht#,dp#); "Knit one elongated";
+beginchar("z",incrwidth(1,2),ht#,dp#); "Knit one elongated";
pickup symbol_pen;
0.5[z1,z5] = top (w/2, -d+small_bottomgap);
y1 = y5;
@@ -372,6 +407,24 @@ beginchar("z",wd#,ht#,dp#); "Knit one elongated";
..tension midtension..z4{right}..z6{down}..z5{dir(-endangle)};
charbox; endchar;
+beginchar("9",incrwidth(1,2),ht#,dp#); "CYCA knit one elongated";
+ pickup symbol_pen;
+ y0l=y0r; y1l=y1r; y2l=y2r;
+ x0r=wd-x0l;
+ x1r=wd-x1l;
+ x2r=wd-x2l;
+ z0l = top rt (mingap-ho,-d+small_bottomgap-o);
+ y1l = bot h-small_topgap;
+ x2r-x2l = y1l-y0l+2(smallgap-mingap-o/2);
+ x1l = 0.23[x2l,x2r];
+ y2l = 0.7[y0l,y1l];
+ draw z0l..tension 3..z1l{left}..z2l{down}..tension 1.5..
+ z2r{up}..z1r{left}..tension 3..z0r;
+ labels(0l,1l,2l,0r,1r,2r);
+ currentpicture := currentpicture shifted ((w-wd)/2,0);
+ charbox; endchar;
+
+
beginchar(25,wd#/2,ht#,dp#); "Left end of a wide increase";
if fonttype <> purltype:
@@ -387,7 +440,7 @@ beginchar(25,wd#/2,ht#,dp#); "Left end of a wide increase";
draw (0,h)--(0,-d);
draw (0,-d)--lft (w,-d);
fi fi fi
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
endchar;
beginchar(22,wd#/2,ht#,dp#); "Extender for a wide increase/decrease";
if fonttype <> purltype:
@@ -403,11 +456,11 @@ beginchar(22,wd#/2,ht#,dp#); "Extender for a wide increase/decrease";
fi fi fi
endchar;
beginchar(26,wd#/2,ht#,dp#); "Right end of a wide increase";
- fliphoriz(symbolpic0)(currentpicture); endchar;
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); endchar;
beginchar(27,wd#/2,ht#,dp#); "Left end of a wide decrease";
- flipvert(symbolpic0)(currentpicture); endchar;
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); endchar;
beginchar(28,wd#/2,ht#,dp#); "Right end of a wide decrease";
- fliphoriz(symbolpic0)(currentpicture); flipvert(currentpicture)(currentpicture);endchar;
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); flipvert(currentpicture)(currentpicture);endchar;
beginchar(29,wd#,ht#,dp#); "Middle of a wide increase";
if fonttype <> purltype:
@@ -425,15 +478,15 @@ beginchar(29,wd#,ht#,dp#); "Middle of a wide increase";
pickup pensquare scaled gridwidth;
draw lft (w,h) -- rt (0,h); draw rt (0,-d) -- lft (w,-d);
fi fi fi
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
endchar;
beginchar(30,wd#,ht#,dp#); "Middle of a wide decrease";
- flipvert(symbolpic0)(currentpicture);
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
endchar;
if 5*wd# < symbolmaxwd#:
-beginchar(31,5wd#,ht#,dp#); "Make 1 from 5";
+beginchar(31,if fonttype = counttype: decrwidth(5,1) else: 5wd# fi,ht#,dp#); "Make 1 from 5";
pickup pensquare xscaled wideinctip yscaled wideincline;
top z1 = (w/2,h-min_topgap+o);
x2 = wd/3; bot y2 = bot y3 = -d+min_bottomgap-o;
@@ -449,18 +502,18 @@ beginchar(31,5wd#,ht#,dp#); "Make 1 from 5";
endchar;
fi
-beginchar("~",wd#,ht#,dp#); "Empty box (spacer)"; endchar;
-beginchar("`",0.5wd#,ht#,dp#); "Empty box (spacer)"; endchar;
-beginchar("'",0.5wd#,ht#,dp#); "Empty box (spacer)";
+beginchar("~",incrwidth(0,0),ht#,dp#); "Empty box (spacer)"; endchar;
+beginchar("`",if fonttype = counttype: 0 else: 0.5wd# fi,ht#,dp#); "Empty box (spacer)"; endchar;
+beginchar("'",if fonttype = counttype: 0 else: 0.5wd# fi,ht#,dp#); "Empty box (spacer)";
if fonttype = purltype: fill (0,-d)--(w,-d)--(w,h)--(0,h)--cycle; fi
endchar;
-beginchar("m",wd#,ht#,dp#); "Make one";
+beginchar("m",incrwidth(0,1),ht#,dp#); "Make one";
pickup symbol_pen;
drawM(h-topgap, -d+bottomgap, 0.5(h+d),symbolwidth);
charbox; endchar;
-beginchar("M",wd#,ht#,dp#); "Make one purlwise";
+beginchar("M",incrwidth(0,1),ht#,dp#); "Make one purlwise";
pickup purl_symbol_pen;
drawM(h-topgap, -d+bottomgap, 0.5(h+d),purl_symbolwidth);
purlbox; endchar;
@@ -500,7 +553,7 @@ beginchar("M",wd#,ht#,dp#); "Make one purlwise";
% drawB(topgap, bottomgap, purl_symbolwidth);
% purlbox; endchar;
-beginchar("|",overlinewd#,ht#,dp#); "Divider";
+beginchar("|",if fonttype <> counttype: overlinewd# else: 0 fi,ht#,dp#); "Divider";
if fonttype <> purltype:
fill(0,-d-gridwidth/2-purlextend)--(0,h+gridwidth/2+purlextend)
--(w,h+gridwidth/2+purlextend)--(w,-d-gridwidth/2-purlextend)
@@ -515,7 +568,7 @@ path twistpath[];
pair time;
-beginchar("x",wd#,ht#,dp#); "Twist slanting right";
+beginchar("x",incrwidth(0,1),ht#,dp#); "Twist slanting right";
pickup symbol_pen;
bot lft z0 = (0.5w-0.4 standardheight-ho,-d+small_bottomgap-o);
bot rt z4 = (0.5w+0.4 standardheight+ho,-d+small_bottomgap-o);
@@ -561,36 +614,36 @@ beginchar("x",wd#,ht#,dp#); "Twist slanting right";
z1e{up}..z2e{left}..z3e{down}
;%..z4e{direction 4 of twistpath0};
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
labels(0,1,2,3,4,5);
charbox; endchar;
numeric t[];
-beginchar("t",wd#,ht#,dp#); "Twist slanting left";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("t",incrwidth(0,1),ht#,dp#); "Twist slanting left";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("X",wd#,ht#,dp#); "Purl right twist";
- currentpicture := symbolpic0;
+beginchar("X",incrwidth(0,1),ht#,dp#); "Purl right twist";
+ currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
purlbox; endchar;
-beginchar("T",wd#,ht#,dp#); "Purl left twist";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("T",incrwidth(0,1),ht#,dp#); "Purl left twist";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
purlbox; endchar;
beginchar("b",wd#,ht#,dp#); "Right upside-down twist";
- flipvert(symbolpic0)(currentpicture);
- symbolpic0 := currentpicture;
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
beginchar("q",wd#,ht#,dp#); "Left upside-down twist";
- fliphoriz(symbolpic0)(currentpicture);
- symbolpic0 := currentpicture;
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
beginchar("Q",wd#,ht#,dp#); "Purl right upside-down twist";
- currentpicture := symbolpic0;
+ currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
purlbox; endchar;
beginchar("B",wd#,ht#,dp#); "Purl left upside-down twist";
- fliphoriz(symbolpic0)(currentpicture);
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
purlbox; endchar;
%2/1 increases and decreases
@@ -603,24 +656,24 @@ def drawSSK(expr topheight,bottom) =
draw symbolpath0;
enddef;
-beginchar("<",decrwidth(2),ht#,dp#); "SSK or left-slant cable";
+beginchar("<",decrwidth(2,1),ht#,dp#); "SSK or left-slant cable";
pickup symbol_pen;
drawSSK(h-topgap,-d+bottomgap);
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
-beginchar(">",decrwidth(2),ht#,dp#); "k2tog or right-slant cable";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar(">",decrwidth(2,1),ht#,dp#); "k2tog or right-slant cable";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar(";",decrwidth(2),ht#,dp#); "P2tog";
+beginchar(";",decrwidth(2,1),ht#,dp#); "P2tog";
pickup purl_symbol_pen;
draw symbolpath0;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
purlbox; endchar;
-beginchar(":",decrwidth(2),ht#,dp#); "SSP";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar(":",decrwidth(2,1),ht#,dp#); "SSP";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
purlbox; endchar;
-beginchar("j",incrwidth(1),ht#,dp#); "Lifted increase slanting left";
+beginchar("j",incrwidth(0,1),ht#,dp#); "Lifted increase slanting left";
pickup symbol_pen;
top lft z1 = (0.5w-0.5 standardheight-ho,h-topgap+o);
bot rt z2 = (0.5w+0.5 standardheight, -d+bottomgap-o);
@@ -628,23 +681,26 @@ beginchar("j",incrwidth(1),ht#,dp#); "Lifted increase slanting left";
definearrow(symbolpath0)((y1-y2)/3)(symbolpath1);
draw symbolpath0;
draw symbolpath1;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
-beginchar("i",incrwidth(1),ht#,dp#); "Lifted increase slanting right";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("i",incrwidth(0,1),ht#,dp#); "Lifted increase slanting right";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("J",incrwidth(1),ht#,dp#); "Purl increase slanting right";
+beginchar("J",incrwidth(0,1),ht#,dp#); "Purl increase slanting right";
pickup purl_symbol_pen;
draw symbolpath0;
draw symbolpath1;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
purlbox; endchar;
-beginchar("I",incrwidth(1),ht#,dp#); "Purl increase slanting left";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("I",incrwidth(0,1),ht#,dp#); "Purl increase slanting left";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
purlbox; endchar;
beginchar("(",wd#,ht#,dp#); "Left-slanting line";
pickup symbol_pen;
+ top lft z1 = (0.5w-0.5 standardheight-ho,h-topgap+o);
+ bot rt z2 = (0.5w+0.5 standardheight, -d+bottomgap-o);
+ symbolpath0 := z2--z1;
draw symbolpath0;
charbox; endchar;
beginchar(")",wd#,ht#,dp#); "Right-slanting line";
@@ -653,7 +709,7 @@ beginchar(")",wd#,ht#,dp#); "Right-slanting line";
fliphoriz(currentpicture)(currentpicture);
charbox; endchar;
-beginchar("y",incrwidth(2),ht#,dp#); "Knit front and back";
+beginchar("y",incrwidth(1,2),ht#,dp#); "Knit front and back";
pickup symbol_pen;
bot lft z1 = (0.5w-0.495 Vwidth-ho,-d+bottomgap-o);
top rt z2 = (0.5w+0.495 Vwidth+ho,h-topgap+o);
@@ -663,46 +719,72 @@ beginchar("y",incrwidth(2),ht#,dp#); "Knit front and back";
z5 = whatever[z1,z2] = whatever[z3,z4];
draw z1--z2;
draw z4--z5;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
-beginchar("u",incrwidth(2),ht#,dp#); "Knit back and front";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("u",incrwidth(1,2),ht#,dp#); "Knit back and front";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-
-beginchar("4",incrwidth(2),ht#,dp#); "Alternative SSK";
- flipvert(symbolpic0)(currentpicture);
+beginchar("4",decrwidth(2,1),ht#,dp#); "Alternative SSK";
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("5",incrwidth(2),ht#,dp#); "Alternative K2tog";
- flipvert(symbolpic0)(currentpicture);
+beginchar("5",decrwidth(2,1),ht#,dp#); "Alternative K2tog";
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
fliphoriz(currentpicture)(currentpicture);
charbox; endchar;
-beginchar("v",incrwidth(2),ht#,dp#); "Generic make 2 from 1";
+
+beginchar("7",incrwidth(1,2),ht#,dp#); "Alt front and back";
+ pickup symbol_pen;
+ x0 = x1 = x2;
+ bot y0 = -d+small_bottomgap;
+ top y1 = h-small_topgap;
+ 0.5[x3+ho,x0] = w/2;
+ z3 = z2 + whatever*(-1.2,1);
+ y3 = 0.9[y0,y1];
+ y2 = 0.4[y0,y1];
+ draw z2--z3; draw z1--z0;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
+ charbox; endchar;
+beginchar("8",incrwidth(1,2),ht#,dp#); "Alt back and front";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
+ charbox; endchar;
+
+
+
+beginchar("v",incrwidth(1,2),ht#,dp#); "Generic make 2 from 1";
pickup symbol_pen;
top rt z1 = (0.5w+0.5 Vwidth+ho,h-topgap+o);
bot y2 = -d+bottomgap-o; x2 = 0.5[x1,x3];
top lft z3 = (0.5w-0.5 Vwidth-ho,h-topgap+o);
symbolpath0 := z1--z2--z3;
draw symbolpath0;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
charbox; endchar;
-beginchar("V",incrwidth(2),ht#,dp#); "Purl make 2 from 1";
+beginchar("V",incrwidth(1,2),ht#,dp#); "Purl make 2 from 1";
pickup purl_symbol_pen;
draw symbolpath0;
- symbolpic1 := currentpicture;
+ symbolpic1 := currentpicture; symbolpicwd1 := w;
purlbox; endchar;
+beginchar("6",wd#,ht#,dp#); "V with bar";
+ pickup symbol_pen;
+ currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
+ 0.5[x0,x1]=w/2;
+ y0=y1=0.6[-d+bottomgap,h-topgap];
+ rt x1-lft x0 = Wwidth;
+ draw z0--z1;
+ charbox; endchar;
-beginchar("!",incrwidth(2),ht#,dp#); "Make 1 from 2";
- flipvert(symbolpic0)(currentpicture);
+beginchar("!",decrwidth(2,1),ht#,dp#); "Make 1 from 2";
+ flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("2",incrwidth(2),ht#,dp#); "Make 1 from 2 purlwise";
- flipvert(symbolpic1)(currentpicture);
- purlbox; endchar;
+beginchar("2",decrwidth(2,1),ht#,dp#); "Make 1 from 2 purlwise";
+ flipvert(symbolpic1)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd1)/2,0);
+ purlbox; endchar;
%Double decreases and increases
-beginchar("w",incrwidth(3),ht#,dp#); "make 3 from 1";
+beginchar("w",incrwidth(1,3),ht#,dp#); "make 3 from 1";
pickup symbol_pen;
top lft z1 = (0.5w-0.5 Wwidth-ho,h-small_topgap+o);
bot z2 = (0.5w,-d+small_bottomgap-o);
@@ -713,12 +795,12 @@ beginchar("w",incrwidth(3),ht#,dp#); "make 3 from 1";
symbolpath1 := z2--z4;
draw symbolpath1;
charbox; endchar;
-beginchar("W",incrwidth(3),ht#,dp#); "Purl make 3 from 1";
+beginchar("W",incrwidth(1,3),ht#,dp#); "Purl make 3 from 1";
pickup purl_symbol_pen;
draw symbolpath0; draw symbolpath1;
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
purlbox; endchar;
-beginchar("Y",incrwidth(3),ht#,dp#); "Make 3 from 1 with YO center";
+beginchar("Y",incrwidth(1,3),ht#,dp#); "Make 3 from 1 with YO center";
pickup symbol_pen;
draw symbolpath0;
top z4 = (0.5w, h-small_topgap+o);
@@ -727,10 +809,10 @@ beginchar("Y",incrwidth(3),ht#,dp#); "Make 3 from 1 with YO center";
draw z4..z6..z5..z7..cycle;
charbox; endchar;
-beginchar("E",incrwidth(3),ht#,dp#); "make 3 from 1 with purl center";
+beginchar("E",incrwidth(1,3),ht#,dp#); "make 3 from 1 with purl center";
pickup symbol_pen;
if fonttype <> purltype:
- currentpicture := symbolpic0;
+ currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0);
else:
z1 = point 0 of symbolpath0;
z2 = point 1 of symbolpath0;
@@ -739,55 +821,107 @@ beginchar("E",incrwidth(3),ht#,dp#); "make 3 from 1 with purl center";
fi
endchar;
-beginchar("A",decrwidth(3),ht#,dp#); "Make 1 from 3";
+beginchar("A",decrwidth(3,1),ht#,dp#); "Make 1 from 3";
pickup symbol_pen;
bot lft z1 = (0.5w-0.5 biggerheight-ho,-d+small_bottomgap-o);
- top z2 = (0.5w, h-small_topgap+o);
- bot rt z3 = (0.5w+0.5 biggerheight, -d+small_bottomgap-o);
+ bot rt z3 = (0.5w+0.5 biggerheight+ho,-d+small_bottomgap-o);
+ top z2 = (xpart z4, h-small_topgap+o);
z4 = 0.5[z1,z3];
symbolpath0 := z1--z2--z3;
symbolpath1 := z2--z4;
draw symbolpath0;
draw symbolpath1;
+ labels(1,2,3,4);
charbox; endchar;
-beginchar("3",decrwidth(3),ht#,dp#); "Purl make 1 from 3";
+beginchar("3",decrwidth(3,1),ht#,dp#); "Purl make 1 from 3";
pickup purl_symbol_pen;
draw symbolpath0;
draw symbolpath1;
purlbox; endchar;
-beginchar("R",decrwidth(3),ht#,dp#); "k3tog";
+beginchar("R",decrwidth(3,1),ht#,dp#); "k3tog";
pickup symbol_pen;
+ finesymbolwidth := 4/7symbolwidth;
+ top rt z0 = (0.5w+0.5 biggerheight, h-small_topgap+o);
bot lft z1 = (0.5w-0.5 biggerheight-ho,-d+small_bottomgap-o);
- top rt z2 = (0.5w+0.5 biggerheight, h-small_topgap+o);
bot rt z3 = (0.5w+0.5 biggerheight, -d+small_bottomgap-o);
- z4 = 0.5[z1,z3];
- draw z1--z2--z3;
- draw z4--0.5[z4,z2];
- symbolpic0 := currentpicture;
+
+ % The line z0--z4 is halfway between z0--z1 and z0--z3 as angles
+ z4 = whatever[z1,z3];
+ z4 = z0+whatever*(dir 0.5[angle(z1-z0),angle(z3-z0)]);
+ z5 = 0.5[z1,z3];
+
+ z2 = 0.5[z4,z5];
+
+ z1' = 0.5[z1,z0];
+ z3' = 0.2[z3,z0];
+ z2'' = z0;
+ z2' = 0.2[z2,z2''];
+ penpos1(symbolwidth, -90+angle (z0-z1));
+ penpos1'(symbolwidth, -90+angle (z0-z1));
+ penpos3(symbolwidth, 0);
+ penpos3'(symbolwidth, 0);
+
+ z1''l = whatever[z1l,z1'l];
+ z1''l = z0 + whatever*((z1-z0) rotated 90);
+ penpos1''(finesymbolwidth, -90+angle (z0-z1));
+
+ z3''r = (x3r,y0);
+ penpos3''(finesymbolwidth, 0);
+
+ penpos2(symbolwidth, -90+angle (z2''-z2));
+ penpos2'(symbolwidth, -90+angle (z2''-z2));
+ penpos2''(finesymbolwidth, -90+angle (z2''-z2));
+
+ symbolpath1 := z1''l..z1'l---z1l..z1r---z1'r..z1''r;
+ symbolpath2 := z2''l..z2'l---z2l..z2r---z2'r..z2''r;
+ symbolpath3 := z3''l..z3'l---z3l..z3r---z3'r..z3''r;
+ % Not penstroke because we want the endpoints to be rounded
+
+ numeric t[];
+ (t12,t21) = symbolpath1 intersectiontimes symbolpath2;
+ (t23,t32) = symbolpath2 intersectiontimes symbolpath3;
+ fill (subpath(0,t12) of symbolpath1
+ -- subpath (t21,t23) of symbolpath2
+ -- subpath (t32,infinity) of symbolpath3
+ -- z3''r{z3''r-z3'r}..{z1-z0}cycle
+ );
+ %pickup pencircle scaled 0.01pt;
+ %draw symbolpath2; draw symbolpath3;
+
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
+ labels(1,2,3,1',2',3',1r,1l,2r,2l,3r,3l,1'r,1'l,2'r,2'l,3'r,3'l, 1''r,1''l);
+
+ symbolpath0 := z1--z0--z3--z2;
charbox; endchar;
-beginchar("L",decrwidth(3),ht#,dp#); "SSSK";
+beginchar("L",decrwidth(3,1),ht#,dp#); "SSSK";
+
+ %draw subpath(0,2) of symbolpath0;
+ %draw point 3 of symbolpath0--point 1 of symbolpath0;
fliphoriz(symbolpic0)(currentpicture);
+ %currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("r",decrwidth(3),ht#,dp#); "LRC";
+beginchar("r",decrwidth(3,1),ht#,dp#); "LRC";
pickup symbol_pen;
bot lft z1 = (0.5w-0.5 biggerheight-ho,-d+small_bottomgap-o);
top rt z2 = (0.5w+0.5 biggerheight+ho,h-small_topgap+o);
bot rt z3 = (0.5w+0.5 biggerheight+ho,-d+small_bottomgap-o);
top lft z4 = (0.5w-0.5 biggerheight-ho,h-small_topgap+o);
- z5 = alpha[z1,z2]; z5 = beta[z3,z4];
+ x5 = 0.5w; y5 = 0.53[y1,y4];
x6=x5; y6=y1;
- draw z1--z2;
+ draw z1..z5..z2;
draw z3--z5;
draw z5--z6;
- symbolpic0 := currentpicture;
+
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
+ labels(1,2,3,4,5,6,7);
charbox; endchar;
-beginchar("l",decrwidth(3),ht#,dp#); "RLC";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar("l",decrwidth(3,1),ht#,dp#); "RLC";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
-beginchar("a",decrwidth(3),ht#,dp#); "LRC";
+beginchar("a",decrwidth(3,1),ht#,dp#); "LRC";
pickup symbol_pen;
bot lft z1 = (0.5w-0.5 biggerheight-ho,-d+small_bottomgap-o);
top rt z2 = (0.5w+0.5 biggerheight+ho,h-small_topgap+o);
@@ -800,6 +934,28 @@ beginchar("a",decrwidth(3),ht#,dp#); "LRC";
draw z3--z5;
draw z6--z7;
charbox; endchar;
+
+% Rownumber triangles (modified from manfnt.mf)
+
+trianglecharwd# = 19/3 pt#;
+
+beginchar("}", trianglecharwd#, 6.25pt#, 0); "Triangle pointing right";
+ if (fonttype = foretype) or (fonttype = bothtype) or (fonttype = counttype):
+ x1=x2=w-x3-max(purlextend, 0.5gridwidth)=4/3pt; y3=.5h;
+ y1-y3=y3-y2;
+ y1-y2 = 1.3*(x3-x1);
+ % For an equilateral triangle, use 2/sqrt 3 = 1.1547
+ fill z1--z2--z3--cycle;
+ fi
+ symbolpic0 := currentpicture;
+ labels(1,2,3); endchar;
+
+beginchar("{", trianglecharwd#, 6.25pt#, 0); "Triangle pointing left";
+ fliphoriz(symbolpic0)(currentpicture);
+ endchar;
+
+
+% Wrapped stitches
beginchar("?",wd#,ht#,dp#); "Left end of wrapped stitches";
pickup symbol_pen;
@@ -840,7 +996,7 @@ beginchar("?",wd#,ht#,dp#); "Left end of wrapped stitches";
draw lft z0r--rt (0,y0r);
if wraplines=3: draw lft z1r--rt (0,y1r); fi
draw lft z2r--rt (0,y2r);
- symbolpic1 := currentpicture;
+ symbolpic1 := currentpicture; symbolpicwd1 := w;
currentpicture := nullpicture;
draw lft z0r---rt z0m;
if wraplines=3: draw lft z1r---rt z1m; fi
@@ -854,19 +1010,19 @@ beginchar("?",wd#,ht#,dp#); "Left end of wrapped stitches";
draw bot (w/2,h-small_topgap+o) -- top (w/2, -d+small_bottomgap-o);
fi
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
labels(0r,0m,0l,1r,1m,1l,2r,2m,2l);
charbox; endchar;
beginchar(23,wd#,ht#,dp#); "Middle of wrapped stitches";
pickup symbol_pen;
- currentpicture := symbolpic1;
+ currentpicture := symbolpic1; currentpicture := currentpicture shifted ((w-symbolpicwd1)/2,0);
if gridfont: else:
draw bot (w/2,h-small_topgap+o) -- top (w/2, -d+small_bottomgap-o);
fi
charbox; endchar;
beginchar(24,wd#,ht#,dp#); "Right end of wrapped stitches";
- fliphoriz(symbolpic0)(currentpicture);
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
ligtable "?":
@@ -897,7 +1053,7 @@ beginchar("1",wd#,ht#,dp#); "Left end of single-wrapped stitches";
pickup pensquare scaled symbolwidth;
draw lft z1r--rt (0,y1r);
- symbolpic1 := currentpicture;
+ symbolpic1 := currentpicture; symbolpicwd1 := w;
currentpicture := nullpicture;
draw lft z1r---rt z1m;
pickup symbol_pen;
@@ -907,19 +1063,19 @@ beginchar("1",wd#,ht#,dp#); "Left end of single-wrapped stitches";
draw bot (w/2,h-topgap+o) -- top (w/2, -d+bottomgap-o);
fi
- symbolpic0 := currentpicture;
+ symbolpic0 := currentpicture; symbolpicwd0 := w;
labels(1r,1m,1l);
charbox; endchar;
beginchar(17,wd#,ht#,dp#); "Middle of wrapped stitches";
pickup symbol_pen;
- currentpicture := symbolpic1;
+ currentpicture := symbolpic1; currentpicture := currentpicture shifted ((w-symbolpicwd1)/2,0);
if gridfont: else:
draw bot (w/2,h-small_topgap+o) -- top (w/2, -d+small_bottomgap-o);
fi
charbox; endchar;
-beginchar(18,wd#,ht#,dp#); "Right end of wrapped stitches";
- fliphoriz(symbolpic0)(currentpicture);
+beginchar(18,decrwidth(1,0),ht#,dp#); "Right end of wrapped stitches";
+ fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0);
charbox; endchar;
ligtable "1":
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf
new file mode 100644
index 00000000000..b0af5c39aa4
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf
@@ -0,0 +1,25 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := true;
+boolean slantlines; slantlines = false;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsin*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsin*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-grid-incount";
+fi
+
+string Vtitle; Vtitle := "Knit grid font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_grid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf
new file mode 100644
index 00000000000..1166146ffcd
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf
@@ -0,0 +1,25 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := true;
+boolean slantlines; slantlines = false;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsout*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsout*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-grid-outcount";
+fi
+
+string Vtitle; Vtitle := "Knit grid font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_grid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf b/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf
index 2e8ae81800d..627630fd076 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf b/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf
index cc785ea68bd..c47ef4dc985 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitgp.mf b/Master/texmf-dist/fonts/source/public/knitting/knitgp.mf
index 6f321d5d1ed..37102efd203 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitgp.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitgp.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_in.mf b/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_in.mf
new file mode 100644
index 00000000000..2d66d3ddff8
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_in.mf
@@ -0,0 +1,24 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := false;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsin*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsin*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-nogrid-incount";
+fi
+
+string Vtitle; Vtitle := "Knit nogrid font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_nogrid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_out.mf b/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_out.mf
new file mode 100644
index 00000000000..1f5b40fcfa7
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitn_sc_out.mf
@@ -0,0 +1,24 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := false;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsout*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsout*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-nogrid-outcount";
+fi
+
+string Vtitle; Vtitle := "Knit nogrid font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_nogrid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf b/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf
index 6cdd723b036..6e04a8ee958 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf
@@ -1,4 +1,5 @@
-%mode=localfont;
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := false;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitnn.mf b/Master/texmf-dist/fonts/source/public/knitting/knitnn.mf
index a58accfce10..6667fc5da7b 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitnn.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitnn.mf
@@ -1,4 +1,5 @@
-%mode=localfont;
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := false;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitnp.mf b/Master/texmf-dist/fonts/source/public/knitting/knitnp.mf
index 023cdd9e93c..61da7351076 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitnp.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitnp.mf
@@ -1,4 +1,5 @@
-%mode=localfont;
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := false;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf b/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf
index 5c7d6f2dd8f..081a17f3e2d 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf
@@ -1,4 +1,5 @@
-%mode=localfont;
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := false;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_in.mf b/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_in.mf
new file mode 100644
index 00000000000..c7f4cb7534e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_in.mf
@@ -0,0 +1,25 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := true;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsin*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsin*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+wd# = widewd#;
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-wide-incount";
+fi
+
+string Vtitle; Vtitle := "Knit font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_grid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_out.mf b/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_out.mf
new file mode 100644
index 00000000000..9a0dd7c60bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_out.mf
@@ -0,0 +1,25 @@
+% Date: 2010/08/10
+
+mode_setup;
+
+boolean gridfont; gridfont := true;
+fonttype = counttype;
+
+def incrwidth (expr stsin, stsout) = stsout*wd# enddef;
+def decrwidth (expr stsin, stsout) = stsout*wd# enddef;
+boolean incrwidthdefined; incrwidthdefined = true;
+
+wd# = widewd#;
+input knit_dimens;
+
+if known ps_output:
+ font_identifier := "KnittingSymbols-wide-outcount";
+fi
+
+string Vtitle; Vtitle := "Knit wide font for checking stitch counts";
+
+input knit_symbols;
+
+input knit_grid_cables;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitwg.mf b/Master/texmf-dist/fonts/source/public/knitting/knitwg.mf
index 5fb5bd7efa0..7af89fe103c 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitwg.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitwg.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitwn.mf b/Master/texmf-dist/fonts/source/public/knitting/knitwn.mf
index 8470efbde72..4c1ac2266eb 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitwn.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitwn.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitwp.mf b/Master/texmf-dist/fonts/source/public/knitting/knitwp.mf
index 3b5e821655a..abe4307ac4f 100644
--- a/Master/texmf-dist/fonts/source/public/knitting/knitwp.mf
+++ b/Master/texmf-dist/fonts/source/public/knitting/knitwp.mf
@@ -1,4 +1,5 @@
-%mode=localfont; % Run mf knit_grid; then run gftopk knit_grid.600gf
+% Date: 2010/08/10
+
mode_setup;
boolean gridfont; gridfont := true;
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm
new file mode 100644
index 00000000000..49c0da3a07e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfm
new file mode 100644
index 00000000000..802c5232784
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm
index f125e18fb63..77262c7bdbe 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm
index f125e18fb63..77262c7bdbe 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm
index f125e18fb63..77262c7bdbe 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfm
new file mode 100644
index 00000000000..fa5c2d6fee6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfm
new file mode 100644
index 00000000000..8c617c9a2f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm
index 6fd0ba1ade5..d6906e22e46 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm
index b9f2defbce2..5bce8e5e278 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm
index d720a216236..fa6d0f9f467 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm
index 8b43438d8fc..834647d22c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_in.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_in.tfm
new file mode 100644
index 00000000000..b2fe229faac
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_in.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_out.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_out.tfm
new file mode 100644
index 00000000000..cc893d64225
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_out.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm
index bb174a4d1da..779e4dede72 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm
index bb174a4d1da..779e4dede72 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm
index bb174a4d1da..779e4dede72 100644
--- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfb
new file mode 100644
index 00000000000..bfdd320cfca
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfb
new file mode 100644
index 00000000000..a6e3b0e7e63
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb
index 710e783893f..2dce948a1e5 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb
index a211caa86eb..034eb86655d 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb
index d06186a2f19..419bebb5029 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfb
new file mode 100644
index 00000000000..09fbb76e866
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfb
new file mode 100644
index 00000000000..39b0db6024b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb
index 54eef7cda7e..567eec256d1 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb
index d0ff5aa6e03..903ba909cb6 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb
index b98e80db6fc..375508e755f 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb
index 6c230159d21..badc1df682c 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_in.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_in.pfb
new file mode 100644
index 00000000000..ab0b55b26a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_in.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_out.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_out.pfb
new file mode 100644
index 00000000000..ec559203d2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_out.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb
index 4e969f807f5..dd6da7fe8d5 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb
index 2a6e0e372ae..668f09a7ee0 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb
index 0154903a8c5..9a9f7e31c4b 100644
--- a/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb
+++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/knitting/knitting.sty b/Master/texmf-dist/tex/latex/knitting/knitting.sty
index b6912d21c4b..7a8410c8791 100644
--- a/Master/texmf-dist/tex/latex/knitting/knitting.sty
+++ b/Master/texmf-dist/tex/latex/knitting/knitting.sty
@@ -22,127 +22,157 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
+% Version: 2
-\ProvidesPackage{knitting}[2010/01/17]
+\ProvidesPackage{knitting}[2010/08/29]
%\pdfmapfile{+knitfont.map}
+\newif \ifchartsonly \chartsonlyfalse
+\newif \ifgrid
+\newif \ifresetrn \resetrntrue
+\newif \ifleftrn@knit
+\newif \ifshowrn@knit \showrn@knittrue
+\newif \ifpdf@knit
+\newif \ifcountingout@knit
+\pdf@knittrue
+\ifx \pdfoutput \undefined \pdf@knitfalse \fi
+\ifx \pdfoutput \relax \pdf@knitfalse \fi
+
\RequirePackage{color}
\definecolor{purlgray}{gray}{0.65}
\definecolor{knitlinecolor}{rgb}{0.7,0,0}
\definecolor{gridcolor}{gray}{0.3}
+\definecolor{rncolor}{rgb}{0.6,0,0}
+\definecolor{rnarrowcolor}{rgb}{0.45,0,0}
-\newif\ifchartsonly\chartsonlyfalse
\DeclareOption{chartsonly}{\chartsonlytrue}
\ProcessOptions
% Every dimension I could think of affecting the
-% main page body. It's an environment instead of a command since I want
+% main page body. It's an environment instead of a command since I want
% a way to switch back to normal pages. Dimensions I don't change are
% \marginparsep,\marginparwidth,\marginparpush,\paperheight,\paperwidth
\newenvironment{fullpages}{
- \clearpage
- \pagestyle{plain}
- \setlength{\hoffset}{0pt}
- \setlength{\voffset}{0pt}
- \setlength{\oddsidemargin}{0pt}
- \setlength{\evensidemargin}{0pt}
- \setlength{\topmargin}{0pt}
- \setlength{\headheight}{0pt}
- \setlength{\headsep}{0pt}
- \setlength{\textheight}{\paperheight}
- \addtolength{\textheight}{-\footskip}
- \addtolength{\textheight}{-2in}
- \setlength{\textwidth}{\paperwidth}
- \addtolength{\textwidth}{-2in}
- % This bit is borrowed from Peter Wilson's chngpage.sty
- % package. I didn't want to just \usepackage{chngpage} because it
- % behaves like \addtolength and I wanted \setlength, and loading the
- % whole package for one eight-line snippet of code just seemed
- % needlessly complicated.
- \setlength{\@colht}{\textheight}\setlength{\@colroom}{\textheight}%
- \setlength{\vsize}{\textheight}\setlength{\columnwidth}{\textwidth}%
- \if@twocolumn%
- \advance\columnwidth-\columnsep \divide\columnwidth\tw@%
- \@firstcolumntrue%
- \fi%
- \setlength{\hsize}{\columnwidth}%
- \setlength{\linewidth}{\hsize}%
- }
- {\clearpage}
-
-\newif \ifpdf@knit
-\pdf@knittrue
-\ifx \pdfoutput \undefined \pdf@knitfalse \fi
-\ifx \pdfoutput \relax \pdf@knitfalse \fi
-
-\newif \ifgrid
-\newif \ifresetrn \resetrntrue
-\newif \ifleftrn@knit
-
-\newlength\leftgap@knit
-\newlength\bgshift@knit
-\newlength\chartwidth@knit
+ \clearpage
+ \pagestyle{plain}
+ \setlength{\hoffset}{0pt}
+ \setlength{\voffset}{0pt}
+ \setlength{\oddsidemargin}{0pt}
+ \setlength{\evensidemargin}{0pt}
+ \setlength{\topmargin}{0pt}
+ \setlength{\headheight}{0pt}
+ \setlength{\headsep}{0pt}
+ \setlength{\textheight}{\paperheight}
+ \addtolength{\textheight}{-\footskip}
+ \addtolength{\textheight}{-2in}
+ \setlength{\textwidth}{\paperwidth}
+ \addtolength{\textwidth}{-2in}
+ % This bit is borrowed from Peter Wilson's chngpage.sty
+ % package. I didn't want to just \usepackage{chngpage} because it
+ % behaves like \addtolength and I wanted \setlength, and loading the
+ % whole package for one eight-line snippet of code just seemed
+ % needlessly complicated.
+ \setlength{\@colht}{\textheight}\setlength{\@colroom}{\textheight}%
+ \setlength{\vsize}{\textheight}\setlength{\columnwidth}{\textwidth}%
+ \if@twocolumn%
+ \advance\columnwidth-\columnsep \divide\columnwidth\tw@%
+ \@firstcolumntrue%
+ \fi%
+ \setlength{\hsize}{\columnwidth}%
+ \setlength{\linewidth}{\hsize}%
+ }
+ {\clearpage}
+
+\newlength \leftgap@knit
+\newlength \bgshift@knit
+\newlength \chartwidth@knit
+\newlength \stitchcountwidth@knit
+\newlength \rnleftwd@knit
+\newlength \rnrightwd@knit
\newbox\bgbox@knit
\newbox\fgbox@knit
\newbox\ggbox@knit
-\newcounter{rownumber}
-\newcounter{tempcounterknit}
+\newcounter{rownumber}
+\newcounter{tempcount@knit}
\newcounter{rownumberskip} \setcounter{rownumberskip}{1}
-\def\passnum@knit{2}
-
-\newcommand\stitchwd{\fontdimen6\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\stitchdp{\fontdimen8\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\stitchht{\fontdimen9\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\gridwidth{\fontdimen10\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\knitlinewd{\fontdimen11\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\narrowincraise@knit{\fontdimen12\the\font} % The rest of them aren't \the\font because I want them to still work outside of a chart
-\newcommand\fontvoffset@knit{\fontdimen13\the\font}
-\newcommand\purlextend@knit{\fontdimen14\csname U/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\rownumberwd{\fontdimen6\csname U/knit/\series@knit/n/10\endcsname}
+\newcounter{stitchcountin}
+\newcounter{stitchcountinprev}
+\newcounter{stitchcountout}
+
+\newcommand \passnum@knit{2}
+\newcommand \stitchwd{\fontdimen6\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \stitchdp{\fontdimen8\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \stitchht{\fontdimen9\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \gridwidth{\fontdimen10\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \knitlinewd{\fontdimen11\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \narrowincraise@knit{\fontdimen12\the\font}
+\newcommand \fontvoffset@knit{\fontdimen13\the\font}
+\newcommand \purlextend@knit{\fontdimen14\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand \rownumberwd{\fontdimen6\csname U/knit/\series@knit/n/10\endcsname}
+% The rest of them aren't \the\font because I want them to still work outside of a chart
+
+\newcommand \ff@knit{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}
+\newcommand \gf@knit{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{g}\selectfont}
+\newcommand \pf@knit{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{p}\selectfont}
\DeclareTextFontCommand {\knitsfsmall@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.8\dimen0}{\f@baselineskip}\selectfont}
\DeclareTextFontCommand {\cablesf@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.8\dimen0}{\f@baselineskip}\selectfont}
\DeclareTextFontCommand{\cablesfsmall@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.6\dimen0}{\f@baselineskip}\selectfont}
-\newcommand\knitnogrid{\gridfalse\def\series@knit{n}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
-\newcommand \knitgrid{\gridtrue \def\series@knit{g}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
-\newcommand \knitwide{\gridtrue \def\series@knit{w}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
-% Some extra effort is made to make sure that the fonts actually exist.
+\newcommand \purlpass[2][]{\ifnum\passnum@knit = 0 #2\else #1\fi}
+\newcommand \gridpass[2][]{\ifnum\passnum@knit = 1 #2\else #1\fi}
+\newcommand \mainpass[2][]{\ifnum\passnum@knit = 2 #2\else #1\fi}
+\newcommand \countpass[2][]{\ifnum\passnum@knit = 3 #2\else #1\fi}
+
+% Some extra effort (the {\ff@knit}) is made to make sure that the fonts % actually exist.
% This is done so that the fonts are defined before they are used,
% which is necessary to make \gridwidth work
-
-\newcommand\purlpass[2][]{\ifnum\passnum@knit = 0 #2\else #1\fi}
-\newcommand\gridpass[2][]{\ifnum\passnum@knit = 1 #2\else #1\fi}
-\newcommand\mainpass[2][]{\ifnum\passnum@knit = 2 #2\else #1\fi}
+\newcommand \knitnogrid{\gridfalse\def\series@knit{n}{\ff@knit}}
+\newcommand \knitgrid{\gridtrue \def\series@knit{g}{\ff@knit}}
+\newcommand \knitwide{\gridtrue \def\series@knit{w}{\ff@knit}}
\knitgrid
-\newcommand\textknit[1]{\mbox{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}%
- \rlap{\def\passnum@knit{0}\color{purlgray}\fontshape{n}\selectfont\fontshape{p}\selectfont#1}%
- \ifgrid\rlap{\def\passnum@knit{1}\color{gridcolor}\fontshape{g}\selectfont#1}\fi
- \def\passnum@knit{2}\fontshape{n}\selectfont#1}}
+\newcommand \textknit[1]{\mbox{\ff@knit
+ \rlap{\pf@knit \color{purlgray}\def\passnum@knit{0}#1}%
+ \ifgrid\rlap{\gf@knit \color{gridcolor}\def\passnum@knit{1}#1}\fi
+ \def\passnum@knit{2}#1}}
-\def\do@endofpar@knit#1{\def\par{#1\endgraf\let\par\endgraf}}
+\newcommand \do@endofpar@knit[1]{\def\par{#1\endgraf\let\par\endgraf}}
% Special symbols
-\newcommand \narrowdecrease[1]{\char1\ifnum \passnum@knit = 2 \llap{\lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vskip-\narrowincraise@knit\vss}}\fi}
-\newcommand\pnarrowdecrease[1]{\char2\ifnum \passnum@knit = 2 \llap{\lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vskip-\narrowincraise@knit\vss}}\fi}
-\newcommand \narrowincrease[1]{\char3\ifnum \passnum@knit = 2 \llap{\lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vskip \narrowincraise@knit\vss}}\fi}
-\newcommand\pnarrowincrease[1]{\char4\ifnum \passnum@knit = 2 \llap{\lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vskip \narrowincraise@knit\vss}}\fi}
-\newcommand\bobble[1]{\char0 \ifnum \passnum@knit = 2 \llap{\lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vss}}\fi}
-
-\newcommand\wideincrease[1]{\strut@knit%
- \hbox to #1\stitchwd{\char25\leaders\hbox{\char22}\hfil\char29\leaders\hbox{\char22}\hfil\char26}}
-\newcommand\widedecrease[1]{\strut@knit%
- \ifnum #1 = 5 \char31\else
- \hbox to #1\stitchwd{\char27\leaders\hbox{\char22}\hfil\char30\leaders\hbox{\char22}\hfil\char28}\fi}
+\newcommand \narrowdecrease[1]{\genbobble@knit{#1}{1}{-\narrowincraise@knit}\adjuststitchcount[#1]{0}\adjuststitchcount[-1]{0}}
+\newcommand \pnarrowdecrease[1]{\genbobble@knit{#1}{2}{-\narrowincraise@knit}\adjuststitchcount[#1]{0}\adjuststitchcount[-1]{0}}
+\newcommand \narrowincrease[1]{\genbobble@knit{#1}{3}{\narrowincraise@knit}\adjuststitchcount[0]{#1}\adjuststitchcount[0]{-1}}
+\newcommand \pnarrowincrease[1]{\genbobble@knit{#1}{4}{\narrowincraise@knit}\adjuststitchcount[0]{#1}\adjuststitchcount[0]{-1}}
+\newcommand \bobble[1]{\genbobble@knit{#1}{0}{0pt}}
+
+\newcommand \genbobble@knit[3]{\char#2 \ifnum \passnum@knit = 2
+ \llap{\lower\stitchdp\vbox to\stitchht{\vss \vskip\fontvoffset@knit \hbox to \stitchwd{\hfil\knitsfsmall@knit{#1}\hfil}\vskip #3\vss}}\fi}
+
+
+\newcommand \wideincrease[1]{\strut@knit
+ \ifnum\passnum@knit = 3 \narrowincrease{#1}\else
+ \hbox to #1\stitchwd{\char25
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char29
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char26}\fi}
+\newcommand \widedecrease[1]{\strut@knit
+ \ifnum #1 = 5 \char31 \else
+ \ifnum\passnum@knit = 3 \narrowdecrease{#1}\else
+ \hbox to #1\stitchwd{\char27
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char30
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char28}\fi\fi}
% Standard chart commands
@@ -151,381 +181,561 @@
{\catcode`\^^M = \active \catcode`\| = \active
\global\def\commands@knit{%
- \let\[\pnarrowincrease
- \let\]\pnarrowdecrease
- \let\<\narrowincrease
- \let\>\narrowdecrease
- \let\@\bobble
- \let \! \barthin@knit
- \let \| \bar@knit
- \let | \bar@knit
- \let\par\endgraf %Just in case someone's redefined it
- \leftgap@knit=0pt
- \def~{\ifvmode \advance \leftgap@knit by \stitchwd
- \else \kern \stitchwd \fi}%
- \def^^M{\par}%
- \def\\{\par}%
- \let\_\horizline@knit
- \let\=\horizlinewide@knit
- \let\-\horizlinenarrow@knit
- \let\overline\overline@knit
- \let\underline\underline@knit
- \let\rn\rn@knit
- \let\rnbox\rnbox@knit
- \let\rnboxleft\rnboxleft@knit
- \let\rnboxright\rnboxright@knit
- \let\rnleft\rnleft@knit
- \let\rnright\rnright@knit
- \let\rncore@save@knit \rncore@knit
- \let\nonumber\relax
- }%
+ \setlength{\fboxsep}{0pt}%
+ \let\[\pnarrowincrease
+ \let\]\pnarrowdecrease
+ \let\<\narrowincrease
+ \let\>\narrowdecrease
+ \let\@\bobble
+ \let \! \barthin@knit
+ \let \| \bar@knit
+ \let | \bar@knit
+ \let \_ \horizline@knit
+ \let \= \horizlinewide@knit
+ \let \- \horizlinenarrow@knit
+ \let\overline\overline@knit
+ \let\underline\underline@knit
+ \let\rn\rn@knit
+ \let\rnbox\rnbox@knit
+ \let\rnboxleft\rnboxleft@knit
+ \let\rnboxright\rnboxright@knit
+ \let\rnleft\rnleft@knit
+ \let\rnright\rnright@knit
+ \let\nonumber\relax
+ \let\par\endgraf %Just in case someone's redefined it
+ \leftgap@knit=0pt
+ \def~{\ifnum\passnum@knit=3 \else \ifvmode \advance \leftgap@knit by \stitchwd
+ \else \kern \stitchwd \fi \fi}%
+ \def^^M{\par}%
+ \def\\{\par}%
+ }%
}
-\def\strut@knit{\rule[-\stitchdp]{0pt}{\stitchht}}
+\newcommand \strut@knit{\rule[-\stitchdp]{0pt}{\stitchht}}
% Drawing lines on the chart
-\def \horizline@knit{\ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd
- \ifnum\passnum@knit = 2
- \hskip -0.5\knitlinewd\smash{{\color{knitlinecolor}\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\knitlinewd
- \else\hskip \stitchwd \fi}
-\def\horizlinenarrow@knit#1{\ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \gridwidth
- \ifnum\passnum@knit = 2
- \hskip -0.5\gridwidth \smash{{\color{knitlinecolor}\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\gridwidth
- \else\hskip #1\stitchwd \fi}
-\def \horizlinewide@knit#1{\ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \knitlinewd
- \ifnum\passnum@knit = 2
+\newcommand \horizline@knit{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd
+ \ifnum\passnum@knit = 2
+ \hskip -0.5\knitlinewd\smash{{\color{knitlinecolor}\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\knitlinewd
+ \else\hskip \stitchwd \fi\fi}
+\newcommand \horizlinenarrow@knit[1]{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \gridwidth
+ \ifnum\passnum@knit = 2
+ \hskip -0.5\gridwidth \smash{{\color{knitlinecolor}\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\gridwidth
+ \else\hskip #1\stitchwd \fi\fi}
+\newcommand \horizlinewide@knit[1]{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \knitlinewd
+ \ifnum\passnum@knit = 2
\smash{{\color{knitlinecolor}\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}
- \else\hskip \dimen0 \fi}
-
-\def\bar@knit{\ifvmode\leavevmode\fi\ifgrid
- \ifnum \passnum@knit = 0
- \hbox{\color{knitlinecolor}\rule[-\stitchdp]{\knitlinewd}{\stitchht}}%
- \else
- \kern \knitlinewd
- \fi
- \else
- \ifnum \passnum@knit = 2
- \hbox{\color{knitlinecolor}\rule[-\stitchdp]{\knitlinewd}{\stitchht}}%
- \else
- \kern \knitlinewd
- \fi
- \fi}
-
-\def\barthin@knit{\ifvmode\leavevmode\fi
- \ifnum \passnum@knit = 2
- \hbox to 0pt{\hss\color{knitlinecolor}\rule[-\stitchdp]{\knitlinewd}{\stitchht}\hss}%
- \else \strut@knit\fi}
-
-\def\overline@knit#1{\setbox0 = \hbox{#1}%
- \leavevmode
- \ifgrid
- \ifnum \passnum@knit = 0
+ \else\hskip \dimen0 \fi\fi}
+
+\newcommand \bar@knit{\ifnum\passnum@knit < 3 \leavevmode
+ \ifgrid
+ \ifnum \passnum@knit = 0
+ \hbox{\color{knitlinecolor}\rule[-\stitchdp]{\knitlinewd}{\stitchht}}%
+ \else
+ \kern \knitlinewd
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
+ \hbox{\color{knitlinecolor}\rule[-\stitchdp]{\knitlinewd}{\stitchht}}%
+ \else
+ \kern \knitlinewd
+ \fi
+ \fi\fi}
+
+\newcommand \barthintop@knit{0pt}
+\newcommand \barthinbot@knit{0pt}
+
+\newcommand \barthin@knit{\leavevmode\strut@knit
+ \ifnum \passnum@knit = 2
+ \dimen2 = \stitchht \advance \dimen2 \barthintop@knit \advance \dimen2 \barthinbot@knit
+ \dimen3 = \stitchdp \advance \dimen3 \barthinbot@knit
+ \smash{\hbox to 0pt{\hss \color{knitlinecolor}\rule[-\dimen3]{\knitlinewd}{\dimen2}\hss}}%
+ \fi}
+
+\newcommand \overline@knit{\@ifstar \overlinestar@knit \overlinenostar@knit}
+\newcommand \underline@knit{\@ifstar \underlinestar@knit \underlinenostar@knit}
+
+\newcommand \overlinenostar@knit[1]{\leavevmode{\def\barthintop@knit{\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifgrid
+ \ifnum \passnum@knit = 0
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ {\rlap{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[\ht0]{\dimen1}{\knitlinewd}}}
+ \else
+ \rule[\ht0]{0pt}{\knitlinewd}
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ {\rlap{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[\ht0]{\dimen1}{\knitlinewd}}}%
+ \else
+ \rule[\ht0]{0pt}{\knitlinewd}
+ \fi \fi
+ #1}}
+
+\newcommand \overlinestar@knit[1]{\leavevmode{\def\barthintop@knit{0.5\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \dimen2=\ht0 \advance\dimen2 by -0.5\knitlinewd
+ \smash{\rlap{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[\dimen2]{\dimen1}{\knitlinewd}}}%
+ \fi
+ #1}}
+
+\newcommand \underlinenostar@knit[1]{\leavevmode{\def\barthinbot@knit{\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifgrid
+ \ifnum \passnum@knit = 0
\dimen1=\wd0 \advance\dimen1 by \gridwidth
- {\rlap{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[\ht0]{\dimen1}{\knitlinewd}}}
- \else
- \rule[\ht0]{0pt}{\knitlinewd}
- \fi
- \else
- \ifnum \passnum@knit = 2
+ \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-\knitlinewd]{\dimen1}{\knitlinewd}\hskip -0.5\gridwidth}}%
+ \else
+ \rlap{\raisebox{-\dp0}{\vrule width 0pt height 0pt depth \knitlinewd}}%
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
\dimen1=\wd0 \advance\dimen1 by \gridwidth
- {\rlap{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[\ht0]{\dimen1}{\knitlinewd}}}%
- \else
- \rule[\ht0]{0pt}{\knitlinewd}
- \fi
- \fi
- #1}
-
-\def\underline@knit#1{\setbox0 = \hbox{#1}%
- \leavevmode
- \dimen1=\wd0 \advance\dimen1 by \gridwidth
- \ifgrid
- \ifnum \passnum@knit = 0
- \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-\knitlinewd]{\dimen1}{\knitlinewd}\hskip -0.5\gridwidth}}%
- \else
- \rlap{\raisebox{-\dp0}{\vrule width 0pt height 0pt depth \knitlinewd}}%
- \fi
- \else
- \ifnum \passnum@knit = 2
- \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\vrule width \dimen1 height 0pt depth \knitlinewd \hskip -0.5\gridwidth}}%
- \else
- \rlap{\raisebox{-\dp0}{\vrule width 0pt height 0pt depth \knitlinewd}}%
- \fi
- \fi
- \copy0
- }
+ \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-\knitlinewd]{\dimen1}{\knitlinewd}\hskip -0.5\gridwidth}}%
+ \else
+ \rlap{\raisebox{-\dp0}{\vrule width 0pt height 0pt depth \knitlinewd}}%
+ \fi \fi
+ #1}}
+
+\newcommand \underlinestar@knit[1]{\leavevmode{\def\barthinbot@knit{0.5\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \smash{\rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-0.5\knitlinewd]{\dimen1}{\knitlinewd}}\hskip -0.5\gridwidth}}%
+ \fi
+ #1}}
% Fancy cabling
-\def\overcableleft@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char5}\hfil\hskip\stitchwd\char10}}
-\def\undercableleft@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char6}\hfil\hskip\stitchwd\char9}}
-\def\undercableright@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\char13\char12\hskip\stitchwd\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}
-\def\overcableright@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\char14\char11\hskip\stitchwd\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}
-
-\newcommand\cableleft[2]{{\def\series@knit{n}\fontencoding{U}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
- \ifcase\passnum@knit
- \hbox{\gridfalse \fontshape{p}\selectfont #1#2}
- \or
- \setbox0=\hbox{\gridfalse \fontshape{p}\selectfont #1#2} \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0
- \else
- \hbox{\gridfalse \let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\fontshape{l}\selectfont \overcableleft@knit{#1}}{\fontshape{r}\selectfont \undercableright@knit{#2}}}
- \fi}}
-\newcommand\cableright[2]{{\def\series@knit{n}\fontencoding{U}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
- \ifcase\passnum@knit
- \hbox{\gridfalse \fontshape{p}\selectfont #1#2}
- \or
- \setbox0=\hbox{\gridfalse \fontshape{p}\selectfont #1#2} \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0
- \else
- \hbox{\gridfalse \let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\fontshape{r}\selectfont \undercableleft@knit{#1}}{\fontshape{l}\selectfont \overcableright@knit{#2}}}\fi}}
+\newcommand \overcableleft@knit[1]{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char5}\hfil\hskip\stitchwd\char10}}
+\newcommand \undercableleft@knit[1]{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char6}\hfil\hskip\stitchwd\char9}}
+\newcommand \undercableright@knit[1]{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\char13\char12\hskip\stitchwd\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}
+\newcommand \overcableright@knit[1]{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\char14\char11\hskip\stitchwd\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}
+
+\newcommand \cableleft[2]{\leavevmode{\knitnogrid
+ \ifcase\passnum@knit
+ \hbox{\pf@knit #1#2}
+ \or
+ \setbox0=\hbox{\pf@knit #1#2}
+ \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0
+ \or
+ \hbox{\let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\ff@knit\fontshape{l}\selectfont \overcableleft@knit{#1}}{\ff@knit\fontshape{r}\selectfont \undercableright@knit{#2}}}
+ \else
+ #1#2\fi}}
+\newcommand \cableright[2]{\leavevmode{\knitnogrid
+ \ifcase\passnum@knit
+ \hbox{\pf@knit #1#2}
+ \or
+ \setbox0=\hbox{\pf@knit #1#2} \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0
+ \or
+ \hbox{\let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\ff@knit\fontshape{r}\selectfont \undercableleft@knit{#1}}{\ff@knit\fontshape{l}\selectfont \overcableright@knit{#2}}}
+ \else
+ #1#2\fi}}
% Knit, purl, knitboxes
-\newcommand\knit[1]{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{-}\hfil}}
-\newcommand\purl[1]{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{=}\hfil}}
-
-\newcommand\Knit[2]{\strut@knit%
- \setbox0 = \vbox to\stitchht{\vss\hbox{\fontseries{m}\fontshape{n}\textsf{#1}}\vss}
- \ifcase \passnum@knit
- \rule{#2\stitchwd}{0pt}%
- \or
- \rlap{\hbox to #2\stitchwd{\leaders\hbox{\char5}\hfil}}%
- \hbox to #2\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil\hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
- \or
- \hbox to #2\stitchwd{\leaders\hbox{-}\hfil \lower\stitchdp\box0\leaders\hbox{-}\hfil}
- \fi}
-\newcommand\Purl[2]{\strut@knit%
- \setbox0 = \vbox to\stitchht{\vss\hbox{\fontseries{m}\fontshape{n}\textsf{#1}}\vss}
- \ifcase \passnum@knit
- \purlbackground{\rule[-\stitchdp]{#2\stitchwd}{\stitchht}}%
- \or
- \rlap{\hbox to #2\stitchwd{\leaders\hbox{\char5}\hfil}}%
- \hbox to #2\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil\hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
- \or
- \hbox to #2\stitchwd{\leaders\hbox{=}\hfil \lower\stitchdp\box0\leaders\hbox{=}\hfil}
- \fi}
-
-\newcommand\knitbox[2]{\strut@knit%
- \ifcase \passnum@knit
- \rule{#2\stitchwd}{0pt}%
- \or
- \hbox to #2\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
- \or
- \hbox to #2\stitchwd{\hfil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#1}}\vss}\hfil}%
- \fi}
-\newcommand\purlbox[2]{\strut@knit%
- \ifcase \passnum@knit
- \purlbackground{\rule[-\stitchdp]{#2\stitchwd}{\stitchht}}%
- \or
- \hbox to #2\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
- \or
- \hbox to #2\stitchwd{\hfil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#1}}\vss}\hfil}%
- \fi}
-
-\newcommand\purlbackground[1]{\ifvmode\leavevmode\fi\setbox0=\hbox{#1}%
- \dimen0 = \wd0 \advance\dimen0 2\purlextend@knit
- \dimen1 = \stitchht \advance\dimen1 \purlextend@knit
- \dimen2 = \stitchdp \advance\dimen2 \purlextend@knit
- \ifnum \passnum@knit = 0 \kern-\purlextend@knit
- \vrule width 0pt height \ht0 depth \dp0
- \smash{\rule[-\dimen2]{\dimen0}{\dimen1}}%
- \kern-\purlextend@knit
- \else\box0\fi}
+\newcommand \knit[1]{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{-}\hfil}}
+\newcommand \purl[1]{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{=}\hfil}}
+
+\newcommand \knitboxbackground{}
+\newcommand \purlboxbackground{\color{purlgray}}
+\newcommand \purlboxforeground{}
+\newcommand \knitboxforeground{}
+
+\newcommand \Knit[3][0]{\strut@knit%
+ \setbox0 = \hbox{\fontseries{m}\fontshape{n}\textsf{#2}}%
+ \ifcase \passnum@knit
+ \ifx \empty@knit \knitboxbackground
+ \rule{#3\stitchwd}{0pt}%
+ \else
+ {\knitboxbackground \purlbackground{\rule[-\stitchdp]{#3\stitchwd}{\stitchht}}}\fi
+ \or
+ \rlap{\hbox to #3\stitchwd{\leaders\hbox{\char5}\hfil}}%
+ \hbox to #3\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hskip #1\stitchwd plus 1fil \hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
+ \or
+ \hbox to #3\stitchwd{%
+ {\knitboxforeground\leaders\hbox{-}\hskip #1\stitchwd plus 1fil }%
+ \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss}
+ {\knitboxforeground\leaders\hbox{-}\hfil}}%
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+\newcommand \Purl[3][0]{\strut@knit%
+ \setbox0 = \hbox{\fontseries{m}\fontshape{n}\textsf{#2}}%
+ \ifcase \passnum@knit
+ \ifx \empty@knit \purlboxbackground
+ \rule{#3\stitchwd}{0pt}%
+ \else
+ {\purlboxbackground \purlbackground{\rule[-\stitchdp]{#3\stitchwd}{\stitchht}}}\fi
+ \or
+ \rlap{\hbox to #3\stitchwd{\leaders\hbox{\char5}\hfil}}%
+ \hbox to #3\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hskip #1\stitchwd plus 1fil \hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
+ \or
+ \hbox to #3\stitchwd{%
+ {\purlboxforeground\leaders\hbox{=}\hskip #1\stitchwd plus 1fil }%
+ \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss}
+ {\purlboxforeground\leaders\hbox{=}\hfil}}%
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+
+\newcommand \knitbox[3][0]{\strut@knit%
+ \ifcase \passnum@knit
+ \ifx \empty@knit \knitboxbackground
+ \rule{#3\stitchwd}{0pt}%
+ \else
+ {\knitboxbackground \purlbackground{\rule[-\stitchdp]{#3\stitchwd}{\stitchht}}}\fi
+ \or
+ \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
+ \or
+ \hbox to #3\stitchwd{\hskip #1\stitchwd plus 1fil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss}\hfil}%
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+\newcommand \purlbox[3][0]{\strut@knit%
+ \ifcase \passnum@knit
+ \ifx \empty@knit \purlboxbackground
+ \rule{#3\stitchwd}{0pt}%
+ \else
+ {\purlboxbackground \purlbackground{\rule[-\stitchdp]{#3\stitchwd}{\stitchht}}}\fi
+ \or
+ \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
+ \or
+ \hbox to #3\stitchwd{\hskip #1\stitchwd plus 1fil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss}\hfil}%
+ \or
+ \hbox to #3\stitchwd{\hfil}%
+ \fi}
+
+\newcommand \purlbackground[1]{\leavevmode\setbox0=\hbox{#1}%
+ \dimen0 = \wd0 \advance\dimen0 2\purlextend@knit
+ \dimen1 = \stitchht \advance\dimen1 \purlextend@knit
+ \dimen2 = \stitchdp \advance\dimen2 \purlextend@knit
+ \ifnum \passnum@knit = 0 \kern-\purlextend@knit
+ \vrule width 0pt height \ht0 depth \dp0
+ \smash{\rule[-\dimen2]{\dimen0}{\dimen1}}%
+ \kern-\purlextend@knit
+ \else\box0\fi}
% Row number commands
-\newcommand\numberrow[3]{\ifvmode\nonumber\leavevmode\fi
- \strut@knit
- \count255=#1
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \textnormal{#1}\fi\hss}%
- \advance\count255 -1
- \loop \ifnum \count255>#3
- \c@tempcounterknit = \count255
- \divide\c@tempcounterknit #2
- \multiply \c@tempcounterknit #2
- \ifnum\c@tempcounterknit = \count255
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \textnormal{\the\count255}\fi \hss}%
- \else
- \kern\stitchwd
- \fi
- \advance\count255 -1
- \repeat
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \textnormal{#3}\fi \hss}%
- }
-
-\newcommand\rnoddonly{\def\rncore@knit{\ifnum \passnum@knit = 2 \ifodd\value{rownumber}\textnormal{\arabic{rownumber}}\fi\fi \rnstep@knit}}
-\newcommand\rnevenonly{\def\rncore@knit{\ifnum \passnum@knit = 2 \ifodd\value{rownumber}\else\textnormal{\arabic{rownumber}}\fi\fi \rnstep@knit}}
-\newcommand\rnnormal{\def\rncore@knit{\ifnum \passnum@knit = 2 \textnormal{\arabic{rownumber}}\fi \rnstep@knit}}
-
-\def\rncore@knit{\ifnum \passnum@knit = 2 \textnormal{\arabic{rownumber}}\fi \rnstep@knit}
-\def\rnstep@knit{\ifnum \passnum@knit = 2 \addtocounter{rownumber}{-\value{rownumberskip}}\fi
- \ifnum \passnum@knit = 0 \addtocounter{rownumber}{-\value{rownumberskip}}\fi}
-
-\def\rn@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rncore@knit\hss}}
-\def\rnleft@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\rncore@knit}\hss}}
-\def\rnright@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rlap{\rncore@knit}\rnmiddle@knit\hss}}
-\def\rnbox@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\mainpass{\textnormal{#1}}\hss}}
-\def\rnboxleft@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\mainpass{\textnormal{#1}}}\hss}}
-\def\rnboxright@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\mainpass{\textnormal{#1}}}\hss}}
+\newcommand \numberrow[3]{\ifnum\passnum@knit=3 \ifvmode\vskip\stitchht\fi\else
+ \ifvmode\nonumber\leavevmode\fi
+ \strut@knit
+ \count255=#1
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \color{rncolor}\textnormal{#1}\fi\hss}%
+ \ifnum #1 > #3
+ \advance\count255 -1
+ \loop \ifnum \count255>#3
+ \c@tempcount@knit = \count255
+ \divide\c@tempcount@knit #2
+ \multiply \c@tempcount@knit #2
+ \ifnum\c@tempcount@knit = \count255
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \color{rncolor}\textnormal{\the\count255}\fi \hss}%
+ \else
+ \kern\stitchwd
+ \fi
+ \advance\count255 -1
+ \repeat
+ \else
+ \advance\count255 1
+ \loop \ifnum \count255<#3
+ \c@tempcount@knit = \count255
+ \divide\c@tempcount@knit #2
+ \multiply \c@tempcount@knit #2
+ \ifnum\c@tempcount@knit = \count255
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \color{rncolor}\textnormal{\the\count255}\fi \hss}%
+ \else
+ \kern\stitchwd
+ \fi
+ \advance\count255 1
+ \repeat
+ \fi
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \color{rncolor}\textnormal{#3}\fi \hss}%
+ \fi}
+
+\newcommand \rnoddonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\value{rownumber}\csname print##1rownumber\endcsname{\therownumber}\fi\fi}}
+\newcommand \rnevenonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\value{rownumber}\else\csname print##1rownumber\endcsname{\therownumber}\fi\fi}}
+\newcommand \rnnormal{\def\rncore@knit##1{\ifshowrn@knit \csname print##1rownumber\endcsname{\therownumber}\fi}}
+
+\newcommand \rncore@knit[1]{\ifshowrn@knit \csname print#1rownumber\endcsname{\therownumber}\fi}
+\newcommand \rnstep@knit{\ifshowrn@knit
+ \ifnum \passnum@knit = 2 \addtocounter{rownumber}{-\value{rownumberskip}}\fi
+ \ifnum \passnum@knit = 0 \addtocounter{rownumber}{-\value{rownumberskip}}\fi
+ \else\global\showrn@knittrue\fi}
+
+\newcommand \printrownumber[1]{{\color{rncolor}\textnormal{#1}}}
+\newcommand \printrightrownumber[1]{\knitleftarrowhead{\color{rncolor}\textnormal{#1}}}
+\newcommand \printleftrownumber[1]{{\color{rncolor}\textnormal{#1}}\knitrightarrowhead}
+\newcommand \knitrightarrowhead{{\color{rnarrowcolor}\char125}}
+\newcommand \knitleftarrowhead{{\color{rnarrowcolor}\char123}}
+
+%\newcommand \therownumber{\arabic{rownumber}}
+% \newcount automatically generates a \therownumber command
+
+\newcommand \rn@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \hbox to \rownumberwd{\hss\ifnum \passnum@knit = 2 \rncore@knit{}\fi\rnstep@knit\hss}\fi}
+\newcommand \rnleft@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 \rncore@knit{left}\fi\rnstep@knit}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnleftwd@knit \global\rnleftwd@knit = \dimen0 \fi
+ \hbox to 0pt{\hss\box0}\fi}
+\newcommand \rnright@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 \rncore@knit{right}\fi\rnstep@knit}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi
+ \hbox to 0pt{\box0\hss}\fi}
+
+\newcommand \rnbox@knit[1]{\ifnum \passnum@knit < 3 \leavevmode
+ \hbox to \rownumberwd{\hss\ifnum \passnum@knit = 2 {\printrownumber{#1}}\fi\hss}\fi}
+\newcommand \rnboxleft@knit[1]{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 {\printleftrownumber{#1}}\fi}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnleftwd@knit \global\rnleftwd@knit = \dimen0 \fi
+ \hbox to 0pt{\hss\box0}\fi}
+\newcommand \rnboxright@knit[1]{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 {\printrightrownumber{#1}}\fi}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly \advance \dimen0 1pt \fi
+ \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi
+ \hbox to 0pt{\box0\hss}\fi}
% The chart commands
-\newcommand\chart[1][]{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit{#1}}
+\newcommand \chart[1][]{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit{#1}}
% Some special stuff for chartsonly mode
\let\extracommands@knit\relax
-\def\smallpage@knit{\ifvmode\noindent\fi\hbox\bgroup}
+\newcommand \smallpage@knit{\noindent\hbox\bgroup}
\let\endsmallpage@knit\egroup
% The chart command proper
-\long\def\chart@knit#1#2{%
- \global \chartwidth@knit = 0pt
- \ifresetrn \setcounter{rownumber}{0}\else \setcounter{tempcounterknit}{\value{rownumber}}\fi
- \setbox1=\hbox{\textnormal{5}}%
- \edef\rnmiddle@knit{\hskip \the\wd1}%
- \setbox\bgbox@knit=\vbox{\def\passnum@knit{0}\hsize=\maxdimen
- \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont % This is kind of silly, but to make \stitchht work, we need to be sure that the foreground font exists.
- \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{p}\selectfont
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \ifresetrn\else\let\rnstep@knit\relax\fi
- \commands@knit\extracommands@knit
- \global \bgshift@knit = \rownumberwd
- \csname auto#1@knit\endcsname #2\par}%
- \ifresetrn \setcounter{rownumber}{-\value{rownumber}}\else
- \setcounter{rownumber}{\value{tempcounterknit}}\fi
- \csname setbgshift#1@knit\endcsname
- \ifgrid
- \setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen
- \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{g}\selectfont
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \commands@knit\extracommands@knit
- \csname auto#1@knit\endcsname #2\par}%
- \fi
- \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen
- \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \commands@knit\extracommands@knit
- \csname auto#1@knit\endcsname #2\par}%
- \hbox to \chartwidth@knit{%
- \rlap{\color{purlgray}\hskip -\bgshift@knit \box\bgbox@knit}%
- \ifgrid\rlap{\color{gridcolor}\box\ggbox@knit}\fi
- \box\fgbox@knit%
- \hss}%
- \ifchartsonly \vskip 0.5\gridwidth \fi \endsmallpage@knit
- }
+\newcommand \chart@knit[2]{%
+ \global \chartwidth@knit = 0pt
+ \ifresetrn \setcounter{rownumber}{0}\else \setcounter{tempcount@knit}{\value{rownumber}}\fi
+ \setbox\bgbox@knit=\vbox{\def\passnum@knit{0}\hsize=\maxdimen
+ \ff@knit % This is kind of silly, but to make \stitchht work, we need to be sure that the foreground font exists.
+ \pf@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \ifresetrn\else\let\rnstep@knit\relax\fi
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \ifresetrn \setcounter{tempcount@knit}{-\value{rownumber}}\fi
+ \ifgrid
+ \setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen
+ \gf@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \fi
+ \setcounter{rownumber}{\value{tempcount@knit}}%
+ \global \rnleftwd@knit = 0pt
+ \global \rnrightwd@knit = 0pt
+ \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen
+ \ff@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \global\advance \chartwidth@knit \rnleftwd@knit
+ \global\advance \chartwidth@knit \rnrightwd@knit
+ \hbox to \chartwidth@knit{\hskip \rnleftwd@knit
+ \rlap{\color{purlgray}\box\bgbox@knit}%
+ \ifgrid\rlap{\color{gridcolor}\box\ggbox@knit}\fi
+ \ifchartsonly
+ \dimen2 = \dp \fgbox@knit \dimen3 = \ht \fgbox@knit
+ \advance\dimen2 0.5\gridwidth \advance\dimen3 0.5\gridwidth
+ \vrule width 0pt height \dimen3 depth \dimen2
+ \fi
+ % If we are doing charts only, we want to enlarge things enough that
+ % we can see the grid on all sides.
+ % But if we aren't, we want adjacent charts to merge seamlessly
+ % because using separate charts is the only way to allow charts to
+ % break across pages.
+ \box\fgbox@knit%
+ \hss}%
+ \endsmallpage@knit
+ }
% Special charts only macros
\ifchartsonly
- \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi%
- \hoffset=-1in
- \voffset=-1in
- \oddsidemargin=0pt
- \evensidemargin=0pt
- \topmargin=0pt
- \headheight=0pt
- \headsep=0pt
- \footskip=0pt
- \textheight = 120in
- \newenvironment{smallpage}{\clearpage \hsize=\textwidth \columnwidth = \textwidth
- \global\chartwidth@knit=0pt \setbox0 = \vbox\bgroup}
- {\egroup%
- %
- \ifdim\chartwidth@knit>0pt \pdfpagewidth = \chartwidth@knit \else
- \pdfpagewidth=\wd0 \fi
- %
- \dimen0=\ht0 \advance \dimen0 by \dp0
- \pdfpageheight=\dimen0
- %
- \ifdim\pdfpageheight>\textheight
- \typeout{}
- \typeout{You need to increase \string\textheight\space in the preamble.}
- \typeout{What do you want such a big chart for, anyway?}
- \typeout{}
- \fi
- %
- \box0
- \vfil\break
- }
- \let\smallpage@knit\smallpage
- \let\endsmallpage@knit\endsmallpage
- \def\extracommands@knit{\hsize=\maxdimen
- \leftskip = 0.5\gridwidth
- \rightskip = 0.5\gridwidth
- \vskip 0.5\gridwidth
- }
+ \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi%
+ \hoffset=-1in
+ \voffset=-1in
+ \oddsidemargin=0pt
+ \evensidemargin=0pt
+ \topmargin=0pt
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=0pt
+ \textheight=120in
+ \newenvironment{smallpage}{\clearpage
+ \hsize=\textwidth \columnwidth = \textwidth
+ \global\chartwidth@knit=0pt
+ \setbox0 = \vbox\bgroup
+ \def\smallpage@knit{\let\endsmallpage@knit\egroup \noindent \hbox\bgroup}%
+ }
+ {\egroup%
+ %
+ \pdfpagewidth=\wd0
+ %
+ \dimen0=\ht0 \advance \dimen0 by \dp0
+ \pdfpageheight=\dimen0
+ %
+ \ifdim\pdfpageheight>\textheight
+ \typeout{}
+ \typeout{You need to increase \string\textheight\space in the preamble.}
+ \typeout{What do you want such a big chart for, anyway?}
+ \typeout{}
+ \fi
+ %
+ \box0
+ \clearpage
+ }
+ \let\smallpage@knit\smallpage
+ \let\endsmallpage@knit\endsmallpage
+ \def\extracommands@knit{%
+ \leftskip = 0.5\gridwidth
+ \rightskip = 0.5\gridwidth
+ }
\else
- \let\smallpage\begingroup
- \let\endsmallpage\endgroup
+ \let\smallpage\begingroup
+ \let\endsmallpage\endgroup
\fi
% Autonumbering macros
-\def\everypar@knit{\hskip\leftgap@knit \leftgap@knit=0pt \relax}
-
-\def \auto@knit{\let\nonumber\relax \everypar={\everypar@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
-\def \autoleft@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
-\def \autoright@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
-\def \autooddleft@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\ifodd \value{rownumber}\relax \rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\else\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\kern\rownumberwd\fi}}
-\def\autooddright@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\ifodd \value{rownumber}\relax \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\kern\rownumberwd\else\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\fi}}
+\newcommand \everypar@knit{\hskip\leftgap@knit \leftgap@knit=0pt \relax}
+
+\newcommand \auto@knit{\let\nonumber\relax \everypar={\everypar@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
+\newcommand \autoleft@knit{\everypar={\everypar@knit\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
+\newcommand \autoright@knit{\everypar={\everypar@knit\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
+\newcommand \autooddleft@knit{\everypar={\everypar@knit
+ \ifodd \value{rownumber}\relax
+ \rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}%
+ \else %\hskip\rownumberwd
+ \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\fi}}
+\newcommand \autooddright@knit{\everypar={\everypar@knit
+ \ifodd \value{rownumber}\relax %\hskip\rownumberwd
+ \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}%
+ \else\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\fi}}
+\newcommand \autoboth@knit{\everypar={\everypar@knit\rnleft@knit\global\advance\rownumber 1 \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
\let\autoevenleft@knit\autooddright@knit
\let\autoevenright@knit\autooddleft@knit
-\def \setbgshift@knit{\leftrn@knitfalse \global \bgshift@knit = 0pt}
-\def \setbgshiftleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftright@knit{\leftrn@knitfalse\resetrnwidth@knit \global \bgshift@knit = 0pt}
-\def \setbgshiftoddleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftoddright@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftevenleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def\setbgshiftevenright@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-
-% Make wider boxes if we've got autonumbered rows.
-% We don't do this for \chart so that the rownumbers on the left
-% can be aligned to with ~.
-\def\resetrnwidth@knit{%
- \setbox1=\hbox{\textnormal{5}}%
- \setbox0=\hbox{\hskip \bgshift@knit \hskip -\wd1 \textnormal{\arabic{rownumber}}}%
- \edef\rownumberwd{\the\wd0}
- \setbox1=\hbox{\textnormal{\arabic{rownumber}}}%
- \edef\rnmiddle@knit{\hskip\the\wd1}}
-
-\def\adjustchartwidth@knit{\endgraf
- \ifnum \passnum@knit = 2 \setbox0=\lastbox
- \setbox1=\hbox{\unhcopy0\unskip}%
- \box0
- \ifdim\wd1 >\chartwidth@knit \global\chartwidth@knit=\wd1\fi\fi}
+\newcommand \adjustchartwidth@knit{\endgraf
+ \ifnum \passnum@knit = 2 \setbox0=\lastbox
+ \setbox1=\hbox{\unhcopy0\unskip}%
+ \box0
+ \ifdim\wd1 >\chartwidth@knit \global\chartwidth@knit=\wd1\fi\fi}
+
+% Stitch-counting macros
+
+\newcommand \adjuststitchcount[2][\temp@knit]{\def\temp@knit{#2}%
+ \leavevmode\ifnum\passnum@knit=3 \null
+ \ifcountingout@knit \kern #2\stitchwd \else \kern #1\stitchwd \fi \null\fi}
+
+\newcommand \stitchcountwarningbar{\ifnum \c@stitchcountinprev = \c@stitchcountout \else \vrule width \overfullrule \fi}
+
+\newcommand \countstitches[1]{%
+ \global\c@stitchcountinprev = \c@stitchcountin
+ \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \fontshape{out}\selectfont #1}%
+ \c@stitchcountout = \wd0
+ \dimen0 = 0.5\stitchwd \advance \c@stitchcountout \dimen0
+ \global\divide \c@stitchcountout \stitchwd
+ \setbox1 = \hbox{\def\passnum@knit{3}\countingout@knitfalse \fontshape{in}\selectfont #1}%
+ \c@stitchcountin = \wd1
+ \dimen1 = 0.5\stitchwd \advance \c@stitchcountin \dimen1
+ \global\divide \c@stitchcountin \stitchwd
+ \ifnum\c@stitchcountinprev < -99
+ \global\c@stitchcountinprev = \c@stitchcountout
+ \fi
+ }
+
+\newcommand \stitchcountchart[1][]{\begingroup \catcode`\|=\active \def\chartrn@knit{#1}\obeylines \afterassignment \printstitchcountchart@knit \toks0 =}
+
+\newcommand \printstitchcountchart@knit{\smallpage@knit\hbox{%
+ \ifx\relax\printleftstitchcount\else\ifx \empty@knit \printleftstitchcount\else
+ \let\printstitchcount@knit\printleftstitchcount \def\stitchcountside@knit{0}\makestitchcounts@knit \fi\fi
+ \chart[\chartrn@knit]{\the\toks0}%
+ \ifx\relax\printrightstitchcount\else\ifx \empty@knit \printrightstitchcount\else
+ \let\printstitchcount@knit\printrightstitchcount
+ \def\stitchcountside@knit{1}\makestitchcounts@knit\fi\fi
+ }\endsmallpage@knit
+ \endgroup}
+
+{\obeylines
+\gdef\countstitcheseachrow@knit#1^^M{%
+ \countstitches{#1}%
+ \setbox0=\hbox{\def\passnum@knit{2}\strut@knit \printstitchcount@knit\stitchcountwarningbar}%
+ \setbox1=\hbox{#1}%
+ \ifdim \wd0 > \stitchcountwidth@knit \global\stitchcountwidth@knit = \wd0 \fi
+ \hbox to 0pt{\ifnum\stitchcountside@knit = 0 \hss\fi
+ \vrule width 0pt height \ht1 depth \dp1 \smash{\box0}%
+ \ifnum\stitchcountside@knit = 1 \hss\fi}%
+ \par}}
+
+\def\makestitchcounts@knit{\hbox{\setbox1=\vbox{\c@stitchcountin = -1001 \global\stitchcountwidth@knit=0pt
+ \parindent=0pt
+ \def\passnum@knit{3}
+ \ff@knit
+ \commands@knit
+ \everypar={\countstitcheseachrow@knit} \offinterlineskip
+ \the\toks0
+ }%
+ \ifnum\stitchcountside@knit = 0
+ \hskip \stitchcountwidth@knit\rlap{\box1}%
+ \else
+ \rlap{\box1}\hskip \stitchcountwidth@knit
+ \fi
+}}
+
+\newcommand \empty@knit{}
+% This is needed because the plain TeX \empty is
+% defined with \def and not \newcommand
+
+\newcommand \printleftstitchcount{{\color{rncolor}\textnormal{(\thestitchcountout\ sts) }}}
+\newcommand \printrightstitchcount{}
+
diff --git a/Master/texmf-dist/tex/latex/knitting/uknit.fd b/Master/texmf-dist/tex/latex/knitting/uknit.fd
index 31f05b0dd6d..4291ea68280 100644
--- a/Master/texmf-dist/tex/latex/knitting/uknit.fd
+++ b/Master/texmf-dist/tex/latex/knitting/uknit.fd
@@ -1,16 +1,22 @@
-\ProvidesFile{T1knit.fd}[2010/1/17 Knit fonts]
+\ProvidesFile{T1knit.fd}[2010/08/09 Knit fonts]
\DeclareFontFamily{U}{knit}{}
-\DeclareFontShape{U}{knit}{g}{n}{<-> knitgn}{}
-\DeclareFontShape{U}{knit}{g}{p}{<-> knitgp}{}
-\DeclareFontShape{U}{knit}{g}{g}{<-> knitgg}{}
-
\DeclareFontShape{U}{knit}{n}{n}{<-> knitnn}{}
\DeclareFontShape{U}{knit}{n}{p}{<-> knitnp}{}
\DeclareFontShape{U}{knit}{n}{r}{<-> knitnr}{}
\DeclareFontShape{U}{knit}{n}{l}{<-> knitnl}{}
+\DeclareFontShape{U}{knit}{n}{in}{<-> knitn_sc_in}{}
+\DeclareFontShape{U}{knit}{n}{out}{<-> knitn_sc_out}{}
+
+\DeclareFontShape{U}{knit}{g}{n}{<-> knitgn}{}
+\DeclareFontShape{U}{knit}{g}{p}{<-> knitgp}{}
+\DeclareFontShape{U}{knit}{g}{g}{<-> knitgg}{}
+\DeclareFontShape{U}{knit}{g}{in}{<-> knitg_sc_in}{}
+\DeclareFontShape{U}{knit}{g}{out}{<-> knitg_sc_out}{}
\DeclareFontShape{U}{knit}{w}{n}{<-> knitwn}{}
\DeclareFontShape{U}{knit}{w}{p}{<-> knitwp}{}
\DeclareFontShape{U}{knit}{w}{g}{<-> knitwg}{}
+\DeclareFontShape{U}{knit}{w}{in}{<-> knitw_sc_in}{}
+\DeclareFontShape{U}{knit}{w}{out}{<-> knitw_sc_out}{}
diff --git a/Master/texmf-dist/tex/plain/knitting/knitting.tex b/Master/texmf-dist/tex/plain/knitting/knitting.tex
index a78175d7935..509d291a7ca 100644
--- a/Master/texmf-dist/tex/plain/knitting/knitting.tex
+++ b/Master/texmf-dist/tex/plain/knitting/knitting.tex
@@ -20,8 +20,9 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
+% Version: 2
-% Date: 2010/01/17
+% Date: 2010/08/29
%\pdfmapfile{+knitfont.map}
@@ -31,8 +32,12 @@
\fi
\newif \ifchartsonly \chartsonlyfalse
-
+\newif \ifgrid
+\newif \ifresetrn \resetrntrue
+\newif \ifleftrn@knit
+\newif \ifshowrn@knit \showrn@knittrue
\newif \ifpdf@knit
+\newif \ifcountingout@knit
\pdf@knittrue
\ifx \pdfoutput \undefined \pdf@knitfalse \fi
\ifx \pdfoutput \relax \pdf@knitfalse \fi
@@ -41,128 +46,164 @@
% Change them to use your driver's syntax if you insist on
% not using pdfTeX.
-% For black lines, just say \let\knitlinecolor\relax
-\ifpdf
- \ifnum \pdftexversion < 140
- \def\purlgray{\pdfliteral {0.65 g 0.65 G}\aftergroup\makenormal@knit}
- \def\gridcolor{\pdfliteral {0.3 g 0.3 G}\aftergroup\makenormalkp@knit}
- \def\knitlinecolor{\pdfliteral {0.7 0 0 rg 0.7 0 0 RG}\aftergroup\makenormalkp@knit}
- \def\makenormal@knit{\pdfliteral {0 g 0 G}}
- \def\makenormalkp@knit{\ifnum \passnum@knit = 0 \pdfliteral {0.65 g 0.65 G}\else\pdfliteral {0 g 0 G}\fi}
- \else
- \def\purlgray{\pdfcolorstack 0 push {0.65 g 0.65 G}\aftergroup\makenormal@knit}
- \def\gridcolor{\pdfcolorstack 0 push {0.3 g 0.3 G}\aftergroup\makenormal@knit}
- \def\knitlinecolor{\pdfcolorstack 0 push {0.7 0 0 rg 0.7 0 0 RG}\aftergroup\makenormal@knit}
- \def\makenormal@knit{\pdfcolorstack 0 pop}
- \fi
+% For black lines, just say \let\knitlinecolor \relax
+\ifpdf@knit
+ \ifnum \pdftexversion < 140
+ \def\purlgray {\pdfliteral {0.65 g 0.65 G}\aftergroup\makenormalcolorknit}
+ \def\gridcolor {\pdfliteral {0.3 g 0.3 G}\aftergroup\makenormalcolorknit}
+ \def\knitlinecolor {\pdfliteral {0.7 0 0 rg 0.7 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\rncolor{\pdfliteral {0.55 0 0 rg 0.55 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\rnarrowcolor{\pdfliteral {0.35 0 0 rg 0.35 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\makenormalcolorknit{\ifcase \passnum@knit \pdfliteral {0.65 g 0.65 G}\or \pdfliteral {0.3 g 0.3 G}\else \pdfliteral {0 g 0 G}\fi}
+ \else
+ \def\purlgray {\pdfcolorstack 0 push {0.65 g 0.65 G}\aftergroup\makenormalcolorknit}
+ \def\gridcolor {\pdfcolorstack 0 push {0.3 g 0.3 G}\aftergroup\makenormalcolorknit}
+ \def\knitlinecolor {\pdfcolorstack 0 push {0.7 0 0 rg 0.7 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\rncolor{\pdfcolorstack 0 push {0.55 0 0 rg 0.55 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\rnarrowcolor{\pdfcolorstack 0 push {0.35 0 0 rg 0.35 0 0 RG}\aftergroup\makenormalcolorknit}
+ \def\makenormalcolorknit{\pdfcolorstack 0 pop}
+ \fi
\else
- \def\purlgray{\special{color push gray 0.65}\aftergroup\makenormal@knit}
- \def\gridcolor{\special{color push gray 0.3}\aftergroup\makenormal@knit}
- \def\knitlinecolor{\special{color push rgb 0.7 0 0}\aftergroup\makenormal@knit}
- \def\makenormal@knit{\special{color pop}}
+ \def\purlgray {\special{color push gray 0.65}\aftergroup\makenormalcolorknit}
+ \def\gridcolor {\special{color push gray 0.3}\aftergroup\makenormalcolorknit}
+ \def\knitlinecolor {\special{color push rgb 0.7 0 0}\aftergroup\makenormalcolorknit}
+ \def\rncolor{\special{color push rgb 0.55 0 0}\aftergroup\makenormalcolorknit}
+ \def\rnarrowcolor{\special{color push rgb 0.35 0 0}\aftergroup\makenormalcolorknit}
+ \def\makenormalcolorknit{\special{color pop}}
\fi
% If grayscale really just isn't working at all,
% go down and redefine \changeknitsize
-\newif \ifgrid
-\newif \ifresetrn \resetrntrue
-\newif \ifleftrn@knit
-
-\newdimen\leftgap@knit
-\newdimen\bgshift@knit
-\newdimen\chartwidth@knit
-
-\newdimen\fontsize@knit
+\newdimen \leftgap@knit
+\newdimen \bgshift@knit
+\newdimen \chartwidth@knit
+\newdimen \stitchcountwidth@knit
+\newdimen \rnleftwd@knit
+\newdimen \rnrightwd@knit
+\newdimen \fontsize@knit
\newbox\bgbox@knit
\newbox\fgbox@knit
\newbox\ggbox@knit
-\newcount\rownumber
-\newcount\tempcount@knit
-\newcount\rownumberskip \rownumberskip = 1
-\def\passnum@knit{2}
-
-\def\stitchwd{\fontdimen6\ff@knit}
-\def\stitchht{\fontdimen5\ff@knit}
-\def\stitchdp{\fontdimen8\ff@knit}
+\newcount \rownumber
+\newcount \tempcount@knit
+\newcount \rownumberskip \rownumberskip = 1
+\newcount \stitchcountin
+\newcount \stitchcountinprev
+\newcount \stitchcountout
+
+\def \passnum@knit{2}
+\def \stitchwd{\fontdimen6\ff@knit}
+\def \stitchht{\fontdimen5\ff@knit}
+\def \stitchdp{\fontdimen8\ff@knit}
% fontdimen9 is the LaTeX stitch height
-\def\gridwidth{\fontdimen10\ff@knit}
-\def\knitlinewd{\fontdimen11\ff@knit}
-\def\narrowincraise@knit{\fontdimen12\the\font}
-\def\fontvoffset@knit{\fontdimen13\the\font}
-\def\purlextend@knit{\fontdimen14\ff@knit}
-\def\rownumberwd{\fontdimen6\ff@knit}
-
-\def\changeknitsize#1{\fontsize@knit = #1
- \font\knitsf = cmss10 at \fontsize@knit
- \font\rmten@knit = cmr10 at \fontsize@knit
- \font\knitsfsmall@knit = cmss8 at 0.8\fontsize@knit
- \font\cablesf@knit = cmss8 at 0.8\fontsize@knit
- \font\cablesfsmall@knit = ecss0600 at 0.6\fontsize@knit
- % I would use cmss as the sans serif font here,
- % but cmss6 doesn't exist.
- %
- \font\gridff@knit = knitgn at \fontsize@knit
- \font\wideff@knit = knitwn at \fontsize@knit
- \font\nogridff@knit = knitnn at \fontsize@knit
- %
- \font\gridgf@knit = knitgg at \fontsize@knit
- \font\widegf@knit = knitwg at \fontsize@knit
- \font\raiseff@knit = knitnr at \fontsize@knit
- \font\lowerff@knit = knitnl at \fontsize@knit
- %
- \font\gridpf@knit = knitgp at \fontsize@knit
- \font\widepf@knit = knitwp at \fontsize@knit
- \font\nogridpf@knit = knitnp at \fontsize@knit
- %
- %%% Use if you can't get the grays to work.
- %%% In this case, don't use \Purl or \purlbox.
- % \let \gridpf@knit \nullfont
- % \let \widepf@knit \nullfont
- % \let \nogridpf@knit \nullfont
- % \let \purlgray \relax
+\def \gridwidth{\fontdimen10\ff@knit}
+\def \knitlinewd{\fontdimen11\ff@knit}
+\def \narrowincraise@knit{\fontdimen12\the\font}
+\def \fontvoffset@knit{\fontdimen13\the\font}
+\def \purlextend@knit{\fontdimen14\ff@knit}
+\def \rownumberwd{\fontdimen6\ff@knit}
+
+\def \changeknitsize#1{\fontsize@knit = #1
+ \font\knitsf = cmss10 at \fontsize@knit
+ \font\knitrm = cmr10 at \fontsize@knit
+ \font\knitsfsmall@knit = cmss8 at 0.8\fontsize@knit
+ \font\cablesf@knit = cmss8 at 0.8\fontsize@knit
+ \font\cablesfsmall@knit = ecss0600 at 0.6\fontsize@knit
+ % I would use cmss as the sans serif font here,
+ % but cmss6 doesn't exist.
+ %
+ \font\gff@knit = knitgn at \fontsize@knit
+ \font\wff@knit = knitwn at \fontsize@knit
+ \font\nff@knit = knitnn at \fontsize@knit
+ %
+ \font\ggf@knit = knitgg at \fontsize@knit
+ \font\wgf@knit = knitwg at \fontsize@knit
+ \font\raiseff@knit = knitnr at \fontsize@knit
+ \font\lowerff@knit = knitnl at \fontsize@knit
+ %
+ \font\gpf@knit = knitgp at \fontsize@knit
+ \font\wpf@knit = knitwp at \fontsize@knit
+ \font\npf@knit = knitnp at \fontsize@knit
+ %
+ \font \nstsout@knit = knitn_sc_out at \fontsize@knit
+ \font \nstsin@knit = knitn_sc_in at \fontsize@knit
+ \font \gstsout@knit = knitg_sc_out at \fontsize@knit
+ \font \gstsin@knit = knitg_sc_in at \fontsize@knit
+ \font \wstsout@knit = knitw_sc_out at \fontsize@knit
+ \font \wstsin@knit = knitw_sc_in at \fontsize@knit
+ %
+ %%% Use the following if you can't get the grays to work.
+ %%% In this case, don't use \Purl or \purlbox.
+ % \let \gridpf@knit \nullfont
+ % \let \widepf@knit \nullfont
+ % \let \nogridpf@knit \nullfont
+ % \let \purlgray \relax
}
-
-\def\knitnogrid{\gridfalse\def\ff@knit{\nogridff@knit}\def\pf@knit{\nogridpf@knit}\def\gf@knit{\nullfont }}
-\def\knitgrid{\gridtrue \def\ff@knit{\gridff@knit }\def\pf@knit{\gridpf@knit }\def\gf@knit{\gridgf@knit}}
-\def\knitwide{\gridtrue \def\ff@knit{\wideff@knit }\def\pf@knit{\widepf@knit }\def\gf@knit{\widegf@knit}}
-
-\def\purlpass{\futurelet\next@knit\purlpass@@knit}
-\def\gridpass{\futurelet\next@knit\gridpass@@knit}
-\def\mainpass{\futurelet\next@knit\mainpass@@knit}
-\def\purlpass@@knit{\ifx\next@knit[\def\nextstep@knit{\purlpass@knit}\else\def\nextstep@knit{\purlpass@knit[]}\fi\nextstep@knit}
-\def\gridpass@@knit{\ifx\next@knit[\def\nextstep@knit{\gridpass@knit}\else\def\nextstep@knit{\gridpass@knit[]}\fi\nextstep@knit}
-\def\mainpass@@knit{\ifx\next@knit[\def\nextstep@knit{\mainpass@knit}\else\def\nextstep@knit{\mainpass@knit[]}\fi\nextstep@knit}
-\def\purlpass@knit[#1]#2{\ifnum\passnum@knit = 0 #2\else #1\fi}
-\def\gridpass@knit[#1]#2{\ifnum\passnum@knit = 1 #2\else #1\fi}
-\def\mainpass@knit[#1]#2{\ifnum\passnum@knit = 2 #2\else #1\fi}
+\let \ngf@knit \nullfont
+
+\def \ff@knit{\csname \series@knit ff@knit\endcsname}
+\def \gf@knit{\csname \series@knit gf@knit\endcsname}
+\def \pf@knit{\csname \series@knit pf@knit\endcsname}
+\def \stsout@knit{\csname \series@knit stsout@knit\endcsname}
+\def \stsin@knit{\csname \series@knit stsin@knit\endcsname}
+
+\def \purlpass{\futurelet\next@knit\purlpass@@knit}
+\def \gridpass{\futurelet\next@knit\gridpass@@knit}
+\def \mainpass{\futurelet\next@knit\mainpass@@knit}
+\def \countpass{\futurelet\next@knit\mainpass@@knit}
+\def \purlpass@@knit{\ifx\next@knit[\def\nextstep@knit{\purlpass@knit}\else\def\nextstep@knit{\purlpass@knit[]}\fi\nextstep@knit}
+\def \gridpass@@knit{\ifx\next@knit[\def\nextstep@knit{\gridpass@knit}\else\def\nextstep@knit{\gridpass@knit[]}\fi\nextstep@knit}
+\def \mainpass@@knit{\ifx\next@knit[\def\nextstep@knit{\mainpass@knit}\else\def\nextstep@knit{\mainpass@knit[]}\fi\nextstep@knit}
+\def \countpass@@knit{\ifx\next@knit[\def\nextstep@knit{\countpass@knit}\else\def\nextstep@knit{\countpass@knit[]}\fi\nextstep@knit}
+\def \purlpass@knit[#1]#2{\ifnum\passnum@knit = 0 #2\else #1\fi}
+\def \gridpass@knit[#1]#2{\ifnum\passnum@knit = 1 #2\else #1\fi}
+\def \mainpass@knit[#1]#2{\ifnum\passnum@knit = 2 #2\else #1\fi}
+\def \countpass@knit[#1]#2{\ifnum\passnum@knit = 3 #2\else #1\fi}
\changeknitsize{10pt}
+\def \knitnogrid{\gridfalse\def\series@knit{n}}
+\def \knitgrid{\gridtrue \def\series@knit{g}}
+\def \knitwide{\gridtrue \def\series@knit{w}}
+
\knitgrid
-\def\textknit#1{\ifvmode\leavevmode\fi\hbox{%
- \rlap{\pf@knit\purlgray\def\passnum@knit{0}#1}%
- \ifgrid\rlap{\gf@knit\gridcolor\def\passnum@knit{1}#1}\fi
- \ff@knit\def\passnum@knit{2}#1}}
+\def \textknit#1{\leavevmode\hbox{\ff@knit
+ \rlap{\pf@knit \purlgray \def\passnum@knit{0}#1}%
+ \ifgrid\rlap{\gf@knit \gridcolor \def\passnum@knit{1}#1}\fi
+ \def\passnum@knit{2}#1}}
-\def\do@endofpar@knit#1{\def\par{#1\endgraf\let\par\endgraf}}
+\def \do@endofpar@knit#1{\def\par{#1\endgraf\let\par\endgraf}}
% Special symbols
-\def \narrowdecrease#1{\char1\ifnum \passnum@knit = 2 \llap{\vbox to\stitchht{\vss\vskip\stitchdp\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vskip-\narrowincraise@knit\vss}}\fi}
-\def\pnarrowdecrease#1{\char2\ifnum \passnum@knit = 2 \llap{\vbox to\stitchht{\vss\vskip\stitchdp\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vskip-\narrowincraise@knit\vss}}\fi}
-\def \narrowincrease#1{\char3\ifnum \passnum@knit = 2 \llap{\vbox to\stitchht{\vss\vskip\stitchdp\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vskip \narrowincraise@knit\vss}}\fi}
-\def\pnarrowincrease#1{\char4\ifnum \passnum@knit = 2 \llap{\vbox to\stitchht{\vss\vskip\stitchdp\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vskip \narrowincraise@knit\vss}}\fi}
-\def\bobble#1{\char0 \ifnum \passnum@knit = 2 \llap{\vbox to\stitchht{\vss\vskip\stitchdp\vskip\fontvoffset@knit\hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vss}}\fi}
-
-\def\wideincrease#1{\strut@knit
- \hbox to #1\stitchwd{\char25\leaders\hbox{\char22}\hfil\char29\leaders\hbox{\char22}\hfil\char26}}
-\def\widedecrease#1{\strut@knit\ifnum #1 = 5
- \char31\else
- \hbox to #1\stitchwd{\char27\leaders\hbox{\char22}\hfil\char30\leaders\hbox{\char22}\hfil\char28}\fi}
+\def \narrowdecrease#1{\genbobble@knit{#1}{1}{-\narrowincraise@knit}\adjuststitchcount[#1]{0}\adjuststitchcount[-1]{0}}
+\def \pnarrowdecrease#1{\genbobble@knit{#1}{2}{-\narrowincraise@knit}\adjuststitchcount[#1]{0}\adjuststitchcount[-1]{0}}
+\def \narrowincrease#1{\genbobble@knit{#1}{3}{\narrowincraise@knit}\adjuststitchcount[0]{#1}\adjuststitchcount[0]{-1}}
+\def \pnarrowincrease#1{\genbobble@knit{#1}{4}{\narrowincraise@knit}\adjuststitchcount[0]{#1}\adjuststitchcount[0]{-1}}
+\def \bobble#1{\genbobble@knit{#1}{0}{0pt}}
+
+\def\genbobble@knit#1#2#3{\char#2 \ifnum \passnum@knit = 2
+ \llap{\vbox to\stitchht{\vss \vskip\stitchdp \vskip\fontvoffset@knit \hbox to \stitchwd{\hfil\knitsfsmall@knit #1\hfil}\vskip #3\vss}}\fi}
+
+\def \wideincrease#1{\strut@knit
+ \ifnum\passnum@knit = 3 \narrowincrease{#1}\else
+ \hbox to #1\stitchwd{\char25
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char29
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char26}\fi}
+\def \widedecrease#1{\strut@knit
+ \ifnum #1 = 5 \char31 \else
+ \ifnum\passnum@knit = 3 \narrowdecrease{#1}\else
+ \hbox to #1\stitchwd{\char27
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char30
+ \hskip-0.1pt\leaders\hbox{\char22}\hfil\hskip-0.1pt
+ \char28}\fi\fi}
% Standard chart commands
@@ -171,378 +212,582 @@
{\catcode`\^^M = \active \catcode`\| = \active
\global\def\commands@knit{%
- \let\[\pnarrowincrease
- \let\]\pnarrowdecrease
- \let\<\narrowincrease
- \let\>\narrowdecrease
- \let\@\bobble
- \let \! \barthin@knit
- \let \| \bar@knit
- \let | \bar@knit
- \let\par\endgraf %Just in case someone's redefined it
- \leftgap@knit=0pt
- \def~{\ifvmode \advance \leftgap@knit by \stitchwd
- \else \kern \stitchwd \fi}%
- \def^^M{\par}%
- \def\\{\par}%
- \let\_\horizline@knit
- \let\=\horizlinewide@knit
- \let\-\horizlinenarrow@knit
- \let\overline\overline@knit
- \let\underline\underline@knit
- \let\rn\rn@knit
- \let\rnbox\rnbox@knit
- \let\rnboxleft\rnboxleft@knit
- \let\rnboxright\rnboxright@knit
- \let\rnleft\rnleft@knit
- \let\rnright\rnright@knit
- \let\rncore@save@knit \rncore@knit
- \let\nonumber\relax
- }%
+ \let\[\pnarrowincrease
+ \let\]\pnarrowdecrease
+ \let\<\narrowincrease
+ \let\>\narrowdecrease
+ \let\@\bobble
+ \let \! \barthin@knit
+ \let \| \bar@knit
+ \let | \bar@knit
+ \let \_ \horizline@knit
+ \let \= \horizlinewide@knit
+ \let \- \horizlinenarrow@knit
+ \let\overline\overline@knit
+ \let\underline\underline@knit
+ \let\rn\rn@knit
+ \let\rnbox\rnbox@knit
+ \let\rnboxleft\rnboxleft@knit
+ \let\rnboxright\rnboxright@knit
+ \let\rnleft\rnleft@knit
+ \let\rnright\rnright@knit
+ \let\nonumber\relax
+ \let\par\endgraf %Just in case someone's redefined it
+ \leftgap@knit=0pt
+ \def~{\ifnum\passnum@knit=3 \else \ifvmode \advance \leftgap@knit by \stitchwd
+ \else \kern \stitchwd \fi \fi}%
+ \def^^M{\par}%
+ \def\\{\par}%
+ }%
}
-\def\strut@knit{\vrule width 0pt height \stitchht depth \stitchdp}
+\def \strut@knit{\vrule width 0pt height \stitchht depth \stitchdp}
% Drawing lines on the chart
-\def \horizline@knit{\ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd
- \ifnum\passnum@knit = 2
- \hskip -0.5\knitlinewd\smash{{\knitlinecolor\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\knitlinewd
- \else\hskip \stitchwd \fi}
-\def\horizlinenarrow@knit#1{\ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \gridwidth
- \ifnum\passnum@knit = 2
- \hskip -0.5\gridwidth \smash{{\knitlinecolor\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\gridwidth
- \else\hskip #1\stitchwd \fi}
-\def \horizlinewide@knit#1{\ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \knitlinewd
- \ifnum\passnum@knit = 2
- \smash{{\knitlinecolor\vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}
- \else\hskip \dimen0 \fi}
-
-\def\bar@knit{\ifvmode\leavevmode\fi\ifgrid
- \ifnum \passnum@knit = 0
- \hbox{\knitlinecolor\vrule width \knitlinewd depth \stitchdp height \stitchht}%
- \else
- \kern \knitlinewd
- \fi
- \else
- \ifnum \passnum@knit = 2
- \hbox{\knitlinecolor\vrule width \knitlinewd depth \stitchdp height \stitchht}%
- \else
- \kern \knitlinewd
- \fi
- \fi}
-
-\def\barthin@knit{\ifvmode\leavevmode\fi
- \ifnum \passnum@knit = 2
- \hbox to 0pt{\hss\knitlinecolor\vrule width \knitlinewd depth \stitchdp height \stitchht\hss}%
- \else \strut@knit\fi}
-
-\def\overline@knit#1{\setbox0 = \hbox{#1}%
- \leavevmode
- \ifgrid
- \ifnum \passnum@knit = 0
- \dimen1=\wd0 \advance\dimen1 by \gridwidth
- {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitlinecolor\vrule width \dimen1 height \knitlinewd depth 0pt}}}%
- \else
- \raise\ht0\hbox{\vrule width 0pt height \knitlinewd depth 0pt}%
- \fi
- \else
- \ifnum \passnum@knit = 2
- \dimen1=\wd0 \advance\dimen1 by \gridwidth
- {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitlinecolor\vrule width \dimen1 height \knitlinewd depth 0pt}}}%
- \else
- \dimen0=\ht0 \advance \dimen0 \knitlinewd
- \vrule width 0pt height \dimen0 depth 0pt
- \fi
- \fi
- #1}
-
-\def\underline@knit#1{\setbox0 = \hbox{#1}%
- \leavevmode
- \dimen1=\wd0 \advance\dimen1 by \gridwidth
- \ifgrid
- \ifnum \passnum@knit = 0
- \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitlinecolor\vrule width \dimen1 height 0pt depth \knitlinewd \hskip -0.5\gridwidth}}%
- \else
- \rlap{\raise-\dp0\hbox{\vrule width 0pt height 0pt depth \knitlinewd}}%
- \fi
- \else
- \ifnum \passnum@knit = 2
- \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitlinecolor\vrule width \dimen1 height 0pt depth \knitlinewd \hskip -0.5\gridwidth}}%
- \else
- \rlap{\raise-\dp0\hbox{\vrule width 0pt height 0pt depth \knitlinewd}}%
- \fi
- \fi
- \copy0
- }
+\def \horizline@knit{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd
+ \ifnum\passnum@knit = 2
+ \hskip -0.5\knitlinewd\smash{{\knitlinecolor \vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\knitlinewd
+ \else\hskip \stitchwd \fi\fi}
+\def \horizlinenarrow@knit#1{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \gridwidth
+ \ifnum\passnum@knit = 2
+ \hskip -0.5\gridwidth \smash{{\knitlinecolor \vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}\hskip -0.5\gridwidth
+ \else\hskip #1\stitchwd \fi\fi}
+\def \horizlinewide@knit#1{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = #1\stitchwd \advance \dimen0 \knitlinewd
+ \ifnum\passnum@knit = 2
+ \smash{{\knitlinecolor \vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}}
+ \else\hskip \dimen0 \fi\fi}
+
+\def \bar@knit{\ifnum\passnum@knit < 3 \leavevmode
+ \ifgrid
+ \ifnum \passnum@knit = 0
+ \hbox{\knitlinecolor \vrule width \knitlinewd depth \stitchdp height \stitchht}%
+ \else
+ \kern \knitlinewd
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
+ \hbox{\knitlinecolor \vrule width \knitlinewd depth \stitchdp height \stitchht}%
+ \else
+ \kern \knitlinewd
+ \fi
+ \fi\fi}
+
+\def \barthintop@knit{0pt}
+\def \barthinbot@knit{0pt}
+
+\def \barthin@knit{\leavevmode\strut@knit
+ \ifnum \passnum@knit = 2
+ \dimen2 = \stitchht \advance \dimen2 \barthintop@knit
+ \dimen3 = \stitchdp \advance \dimen3 \barthinbot@knit
+ \smash{\hbox to 0pt{\hss \knitlinecolor \vrule width \knitlinewd depth \dimen3 height \dimen2\hss}}%
+ \fi}
+
+\def \overline@knit{\futurelet\next@knit\overline@@knit}
+\def \overline@@knit{\ifx\next@knit*%
+ \def\nextstep@knit{\overlinestar@knit}\else
+ \def\nextstep@knit{\overlinenostar@knit}\fi\nextstep@knit}
+
+\def \overlinenostar@knit#1{\leavevmode{\def\barthintop@knit{\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifgrid
+ \ifnum \passnum@knit = 0
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height \knitlinewd depth 0pt}}}%
+ \else
+ \raise\ht0\hbox{\vrule width 0pt height \knitlinewd depth 0pt}%
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height \knitlinewd depth 0pt}}}%
+ \else
+ \dimen0=\ht0 \advance \dimen0 \knitlinewd
+ \vrule width 0pt height \dimen0 depth 0pt
+ \fi \fi
+ #1}}
+
+\def \overlinestar@knit#1#2{\leavevmode{\def\barthintop@knit{0.5\knitlinewd}% The #1 is to eat the *
+ \setbox0 = \hbox{#2}%
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \smash{\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height 0.5\knitlinewd depth 0.5\knitlinewd}}}%
+ \fi
+ #2}}
+
+\def \underline@knit{\futurelet\next@knit\underline@@knit}
+\def \underline@@knit{\ifx\next@knit*%
+ \def\nextstep@knit{\underlinestar@knit}\else
+ \def\nextstep@knit{\underlinenostar@knit}\fi\nextstep@knit}
+
+\def \underlinenostar@knit#1{\leavevmode{\def\barthinbot@knit{\knitlinewd}%
+ \setbox0 = \hbox{#1}%
+ \ifgrid
+ \ifnum \passnum@knit = 0
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height 0pt depth \knitlinewd \hskip -0.5\gridwidth}}%
+ \else
+ \rlap{\raise-\dp0\hbox{\vrule width 0pt height 0pt depth \knitlinewd}}%
+ \fi
+ \else
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height 0pt depth \knitlinewd \hskip -0.5\gridwidth}}%
+ \else
+ \rlap{\raise-\dp0\hbox{\vrule width 0pt height 0pt depth \knitlinewd}}%
+ \fi \fi
+ #1}}
+
+\def \underlinestar@knit#1#2{\leavevmode{\def\barthinbot@knit{0.5\knitlinewd}%
+ \setbox0 = \hbox{#2}%
+ \ifnum \passnum@knit = 2
+ \dimen1=\wd0 \advance\dimen1 by \gridwidth
+ \smash{\rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitlinecolor \vrule width \dimen1 height 0.5\knitlinewd depth 0.5\knitlinewd \hskip -0.5\gridwidth}}}%
+ \fi
+ #2}}
% Fancy cabling
-\def\overcableleft@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char5}\hfil\hskip\stitchwd\char10}}
-\def\undercableleft@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char6}\hfil\hskip\stitchwd\char9}}
-\def\undercableright@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\char13\char12\hskip\stitchwd\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}
-\def\overcableright@knit#1{%
- \setbox0=\hbox{#1}%
- \rlap{#1}%
- \hbox to \wd0{\char14\char11\hskip\stitchwd\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}
-
-\def\cableleft#1#2{\ifvmode\leavevmode\fi
- \ifcase\passnum@knit
- \hbox{\gridfalse \nogridpf@knit #1#2}
- \or
- \setbox0=\hbox{\gridfalse \nogridpf@knit #1#2} \vrule width \wd0 height 0pt depth 0pt \vrule width 0pt height \ht0 depth \dp0
- \else
- \hbox{\def\ff@knit{\nogridff@knit}\gridfalse \let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\lowerff@knit\overcableleft@knit{#1}}{\raiseff@knit\undercableright@knit{#2}}}\fi}
-\def\cableright#1#2{\ifvmode\leavevmode\fi
- \ifcase\passnum@knit
- \hbox{\gridfalse \nogridpf@knit #1#2}
- \or
- \setbox0=\hbox{\gridfalse \nogridpf@knit #1#2} \vrule width \wd0 height 0pt depth 0pt \vrule width 0pt height \ht0 depth \dp0
- \else
- \hbox{\def\ff@knit{\nogridff@knit}\gridfalse \let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\raiseff@knit\undercableleft@knit{#1}}{\lowerff@knit\overcableright@knit{#2}}}\fi}
+\def \overcableleft@knit#1{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char5}\hfil\hskip\stitchwd\char10}}
+\def \undercableleft@knit#1{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\leaders\hbox to \stitchwd{\hfil\char6}\hfil\hskip\stitchwd\char9}}
+\def \undercableright@knit#1{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\char13\char12\hskip\stitchwd\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}
+\def \overcableright@knit#1{%
+ \setbox0=\hbox{#1}%
+ \rlap{#1}%
+ \hbox to \wd0{\char14\char11\hskip\stitchwd\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}
+
+\def \cableleft#1#2{\leavevmode{\knitnogrid
+ \ifcase\passnum@knit
+ \hbox{\pf@knit #1#2}
+ \or
+ \setbox0=\hbox{\pf@knit #1#2}
+ \vrule width \wd0 height 0pt depth 0pt \vrule width 0pt height \ht0 depth \dp0
+ \or
+ \hbox{\let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\lowerff@knit \overcableleft@knit{#1}}{\raiseff@knit \undercableright@knit{#2}}}
+ \else
+ #1#2\fi}}
+\def \cableright#1#2{\leavevmode{\knitnogrid
+ \ifcase\passnum@knit
+ \hbox{\pf@knit #1#2}
+ \or
+ \setbox0=\hbox{\pf@knit #1#2} \vrule width \wd0 height 0pt depth 0pt \vrule width 0pt height \ht0 depth \dp0
+ \or
+ \hbox{\let \knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\raiseff@knit \undercableleft@knit{#1}}{\lowerff@knit \overcableright@knit{#2}}}
+ \else
+ #1#2\fi}}
% Knit, purl, knitboxes
-\def\knit#1{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{-}\hfil}}
-\def\purl#1{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{=}\hfil}}
-
-\def\Knit#1#2{\strut@knit
- \setbox0 = \vbox to\stitchht{\vss\hbox{\knitsf #1}\vss\vskip\stitchdp}
- \ifcase \passnum@knit
- \vrule width #2\stitchwd height 0pt depth 0pt
- \or
- \rlap{\hbox to #2\stitchwd{\leaders\hbox{\char5}\hfil}}%
- \hbox to #2\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil\hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
- \or
- \hbox to #2\stitchwd{\leaders\hbox{-}\hfil \lower\stitchdp\box0\leaders\hbox{-}\hfil}
- \fi}
-\def\Purl#1#2{\strut@knit
- \setbox0 = \vbox to\stitchht{\vss\hbox{\knitsf #1}\vss\vskip\stitchdp}%
- \ifcase \passnum@knit
- \purlbackground{\vrule width #2\stitchwd depth \stitchdp height \stitchht}%
- \or
- \rlap{\hbox to #2\stitchwd{\leaders\hbox{\char5}\hfil}}%
- \hbox to #2\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil\hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
- \or
- \hbox to #2\stitchwd{\leaders\hbox{=}\hfil \lower\stitchdp\box0\leaders\hbox{=}\hfil}
- \fi}
-
-\def\knitbox#1#2{\strut@knit
- \ifcase \passnum@knit
- \vrule width #2\stitchwd height 0pt depth 0pt
- \or
- \hbox to #2\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
- \or
- \hbox to #2\stitchwd{\hfil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #1}\vss\vskip\stitchdp}\hfil}
- \fi}
-\def\purlbox#1#2{\strut@knit
- \ifcase \passnum@knit
- \purlbackground{\vrule width #2\stitchwd height \stitchht depth \stitchdp}
- \or
- \hbox to #2\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
- \or
- \hbox to #2\stitchwd{\hfil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #1}\vss\vskip\stitchdp}\hfil}
- \fi}
-
-\def\purlbackground#1{\ifvmode\leavevmode\fi\setbox0=\hbox{#1}%
- \dimen0 = \wd0 \advance\dimen0 2\purlextend@knit
- \dimen1 = \stitchht \advance\dimen1 \purlextend@knit
- \dimen2 = \stitchdp \advance\dimen2 \purlextend@knit
- \ifnum \passnum@knit = 0 \kern-\purlextend@knit
- \vrule width 0pt height \ht0 depth \dp0
- \smash{\vrule width \dimen0 height \dimen1 depth \dimen2}%
- \kern-\purlextend@knit
- \else\box0\fi}
+\def \knit#1{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{-}\hfil}}
+\def \purl#1{\strut@knit\hbox to #1\stitchwd{\leaders\hbox{=}\hfil}}
+
+\def \knitboxbackground{}
+\def \purlboxbackground{\purlgray }
+\def \purlboxforeground{}
+\def \knitboxforeground{}
+
+\def \Knit{\futurelet\next@knit\Knit@knit}
+\def \Knit@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\Knit@@knit}\else
+ \def\nextstep@knit{\Knit@@knit[0]}\fi\nextstep@knit}
+\def \Knit@@knit[#1]#2#3{\strut@knit
+ \setbox0 = \hbox{\knitsf #2}%
+ \ifcase \passnum@knit
+ \ifx \empty \knitboxbackground
+ \vrule width #3\stitchwd height 0pt depth 0pt
+ \else
+ {\knitboxbackground \purlbackground{\vrule width #3\stitchwd depth \stitchdp height \stitchht}}\fi
+ \or
+ \rlap{\hbox to #3\stitchwd{\leaders\hbox{\char5}\hfil}}%
+ \hbox to #3\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hskip #1\stitchwd plus 1fil \hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
+ \or
+ \hbox to #3\stitchwd{%
+ {\knitboxforeground\leaders\hbox{-}\hskip #1\stitchwd plus 1fil }%
+ \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp}
+ {\knitboxforeground\leaders\hbox{-}\hfil}}%
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+\def \Purl{\futurelet\next@knit\Purl@knit}
+\def \Purl@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\Purl@@knit}\else
+ \def\nextstep@knit{\Purl@@knit[0]}\fi\nextstep@knit}
+\def \Purl@@knit[#1]#2#3{\strut@knit
+ \setbox0 = \hbox{\knitsf #2}%
+ \ifcase \passnum@knit
+ \ifx \empty \purlboxbackground
+ \vrule width #3\stitchwd height 0pt depth 0pt
+ \else
+ {\purlboxbackground \purlbackground{\vrule width #3\stitchwd depth \stitchdp height \stitchht}}\fi
+ \or
+ \rlap{\hbox to #3\stitchwd{\leaders\hbox{\char5}\hfil}}%
+ \hbox to #3\stitchwd{\leaders\hbox to \stitchwd{\char6\hfil\char6}\hskip #1\stitchwd plus 1fil \hskip\wd0\leaders\hbox to \stitchwd{\char6\hfil\char6}\hfil}%
+ \or
+ \hbox to #3\stitchwd{%
+ {\purlboxforeground\leaders\hbox{=}\hskip #1\stitchwd plus 1fil }%
+ \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp}
+ {\purlboxforeground\leaders\hbox{=}\hfil}}%
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+
+\def \knitbox{\futurelet\next@knit\knitbox@knit}
+\def \knitbox@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\knitbox@@knit}\else
+ \def\nextstep@knit{\knitbox@@knit[0]}\fi\nextstep@knit}
+\def \knitbox@@knit[#1]#2#3{\strut@knit
+ \ifcase \passnum@knit
+ \ifx \empty \knitboxbackground
+ \vrule width #3\stitchwd height 0pt depth 0pt
+ \else
+ {\knitboxbackground \purlbackground{\vrule width #3\stitchwd depth \stitchdp height \stitchht}}\fi
+ \or
+ \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
+ \or
+ \hbox to #3\stitchwd{\hskip #1\stitchwd plus 1fil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp}\hfil}
+ \or
+ \hbox to #3\stitchwd{\hfil}
+ \fi}
+\def \purlbox{\futurelet\next@knit\purlbox@knit}
+\def \purlbox@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\purlbox@@knit}\else
+ \def\nextstep@knit{\purlbox@@knit[0]}\fi\nextstep@knit}
+\def \purlbox@@knit[#1]#2#3{\strut@knit
+ \ifcase \passnum@knit
+ \ifx \empty \purlboxbackground
+ \vrule width #3\stitchwd height 0pt depth 0pt
+ \else
+ {\purlboxbackground \purlbackground{\vrule width #3\stitchwd depth \stitchdp height \stitchht}}\fi
+ \or
+ \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}%
+ \or
+ \hbox to #3\stitchwd{\hskip #1\stitchwd plus 1fil \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp}\hfil}%
+ \or
+ \hbox to #3\stitchwd{\hfil}%
+ \fi}
+
+\def \purlbackground#1{\leavevmode\setbox0=\hbox{#1}%
+ \dimen0 = \wd0 \advance\dimen0 2\purlextend@knit
+ \dimen1 = \stitchht \advance\dimen1 \purlextend@knit
+ \dimen2 = \stitchdp \advance\dimen2 \purlextend@knit
+ \ifnum \passnum@knit = 0 \kern-\purlextend@knit
+ \vrule width 0pt height \ht0 depth \dp0
+ \smash{\vrule width \dimen0 height \dimen1 depth \dimen2}%
+ \kern-\purlextend@knit
+ \else\box0\fi}
% Row number commands
-\def\numberrow#1#2#3{\ifvmode\nonumber\leavevmode\fi
- \strut@knit
- \count255=#1
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rmten@knit#1\fi\hss}%
- \advance\count255 -1
- \loop \ifnum \count255>#3
- \tempcount@knit = \count255
- \divide\tempcount@knit #2
- \multiply \tempcount@knit #2
- \ifnum\tempcount@knit = \count255
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rmten@knit\the\count255 \fi \hss}%
- \else
- \kern\stitchwd
- \fi
- \advance\count255 -1
- \repeat
- \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rmten@knit#3\fi \hss}%
- }
-
-\def\rnoddonly{\def\rncore@knit{\ifnum \passnum@knit = 2 \ifodd\rownumber\rmten@knit\the\rownumber\fi\fi \rnstep@knit}}
-\def\rnevenonly{\def\rncore@knit{\ifnum \passnum@knit = 2 \ifodd\rownumber\else\rmten@knit\the\rownumber\fi\fi \rnstep@knit}}
-\def\rnnormal{\def\rncore@knit{\ifnum \passnum@knit = 2 \rmten@knit\the\rownumber\fi \rnstep@knit}}
-
-\def\rncore@knit{\ifnum \passnum@knit = 2 \rmten@knit\the\rownumber\fi \rnstep@knit}
-\def\rnstep@knit{\ifnum \passnum@knit = 2 \global\advance\rownumber -\rownumberskip\relax\fi
- \ifnum \passnum@knit = 0 \global\advance\rownumber -\rownumberskip\relax\fi}
-
-\def\rn@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rncore@knit\hss}}
-\def\rnleft@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\rncore@knit}\hss}}
-\def\rnright@knit{\ifvmode\leavevmode\fi
- \hbox to \rownumberwd{\hss\rlap{\rncore@knit}\rnmiddle@knit\hss}}
-\def\rnbox@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\mainpass{\rmten@knit #1}\hss}}
-\def\rnboxleft@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\mainpass{\rmten@knit #1}}\hss}}
-\def\rnboxright@knit#1{\ifvmode\leavevmode\fi\hbox to \rownumberwd{\hss\rnmiddle@knit\llap{\mainpass{\rmten@knit #1}}\hss}}
+\def \numberrow#1#2#3{\ifnum\passnum@knit=3 \ifvmode\vskip\stitchht\fi\else
+ \ifvmode\nonumber\leavevmode\fi
+ \strut@knit
+ \count255=#1
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rncolor \knitrm#1\fi\hss}%
+ \ifnum #1 > #3
+ \advance\count255 -1
+ \loop \ifnum \count255>#3
+ \tempcount@knit = \count255
+ \divide\tempcount@knit #2
+ \multiply \tempcount@knit #2
+ \ifnum\tempcount@knit = \count255
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rncolor \knitrm\the\count255 \fi \hss}%
+ \else
+ \kern\stitchwd
+ \fi
+ \advance\count255 -1
+ \repeat
+ \else
+ \advance\count255 1
+ \loop \ifnum \count255<#3
+ \tempcount@knit = \count255
+ \divide\tempcount@knit #2
+ \multiply \tempcount@knit #2
+ \ifnum\tempcount@knit = \count255
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rncolor \knitrm\the\count255 \fi \hss}%
+ \else
+ \kern\stitchwd
+ \fi
+ \advance\count255 1
+ \repeat
+ \fi
+ \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \rncolor \knitrm#3\fi \hss}%
+ \fi}
+
+\def \rnoddonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\rownumber\csname print##1rownumber\endcsname{\therownumber}\fi\fi}}
+\def \rnevenonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\rownumber\else\csname print##1rownumber\endcsname{\therownumber}\fi\fi}}
+\def \rnnormal{\def\rncore@knit##1{\ifshowrn@knit \csname print##1rownumber\endcsname{\therownumber}\fi}}
+
+\def \rncore@knit#1{\ifshowrn@knit \csname print#1rownumber\endcsname{\therownumber}\fi}
+\def \rnstep@knit{\ifshowrn@knit
+ \ifnum \passnum@knit = 2 \global\advance\rownumber -\rownumberskip\relax\fi
+ \ifnum \passnum@knit = 0 \global\advance\rownumber -\rownumberskip\relax\fi
+ \else\global\showrn@knittrue\fi}
+
+\def \printrownumber#1{{\rncolor \knitrm #1}}
+\def \printrightrownumber#1{\knitleftarrowhead{\rncolor \knitrm #1}}
+\def \printleftrownumber#1{{\rncolor \knitrm #1}\knitrightarrowhead}
+\def \knitrightarrowhead{{\rnarrowcolor \char125}}
+\def \knitleftarrowhead{{\rnarrowcolor \char123}}
+
+\def \therownumber{\number\rownumber}
+
+\def \rn@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \hbox to \rownumberwd{\hss\ifnum \passnum@knit = 2 \rncore@knit{}\fi\rnstep@knit\hss}\fi}
+\def \rnleft@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 \rncore@knit{left}\fi\rnstep@knit}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnleftwd@knit \global\rnleftwd@knit = \dimen0 \fi
+ \hbox to 0pt{\hss\box0}\fi}
+\def \rnright@knit{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 \rncore@knit{right}\fi\rnstep@knit}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi
+ \hbox to 0pt{\box0\hss}\fi}
+
+\def \rnbox@knit#1{\ifnum \passnum@knit < 3 \leavevmode
+ \hbox to \rownumberwd{\hss\ifnum \passnum@knit = 2 {\printrownumber{#1}}\fi\hss}\fi}
+\def \rnboxleft@knit#1{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 {\printleftrownumber{#1}}\fi}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly\advance \dimen0 1pt\fi
+ \ifdim \dimen0 > \rnleftwd@knit \global\rnleftwd@knit = \dimen0 \fi
+ \hbox to 0pt{\hss\box0}\fi}
+\def \rnboxright@knit#1{\ifnum \passnum@knit < 3 \leavevmode
+ \setbox0 = \hbox{\ifnum \passnum@knit = 2 {\printrightrownumber{#1}}\fi}
+ \dimen0 = \wd0 %\advance \dimen0 -\rownumberwd
+ \ifchartsonly \advance \dimen0 1pt \fi
+ \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi
+ \hbox to 0pt{\box0\hss}\fi}
% The chart commands
-\def\chart{\futurelet\next@knit\chart@@knit}
-\def\chart@@knit{\ifx\next@knit[%
- \def\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit}\else
- \def\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit[]}\fi\nextstep@knit}
+\def \chart{\futurelet\next@knit\chart@@knit}
+\def \chart@@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit}\else
+ \def\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit[]}\fi\nextstep@knit}
% Some special stuff for chartsonly mode
\let\extracommands@knit\relax
-\def\smallpage@knit{\ifvmode\noindent\fi\hbox\bgroup}
+\def \smallpage@knit{\noindent\hbox\bgroup}
\let\endsmallpage@knit\egroup
% The chart command proper
\long\def\chart@knit[#1]#2{%
- \global \chartwidth@knit = 0pt
- \ifresetrn \rownumber = 0 \else \tempcount@knit = \rownumber \fi
- \setbox1=\hbox{\rmten@knit 5}%
- \edef\rnmiddle@knit{\hskip \the\wd1}%
- \setbox\bgbox@knit=\vbox{\def\passnum@knit{0}\hsize=\maxdimen
- \pf@knit
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \ifresetrn\else\let\rnstep@knit\relax\fi
- \commands@knit\extracommands@knit
- \global \bgshift@knit = \rownumberwd
- \csname auto#1@knit\endcsname #2\par}%
- \ifresetrn \rownumber = -\rownumber \else
- \rownumber = \tempcount@knit \fi
- \csname setbgshift#1@knit\endcsname
- \ifgrid
- \setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen
- \gf@knit
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \commands@knit\extracommands@knit
- \csname auto#1@knit\endcsname #2\par}%
- \fi
- \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen
- \ff@knit
- \lineskip=0pt
- \parskip=0pt
- \baselineskip=0pt
- \parindent=0pt
- \emergencystretch = \stitchwd
- \leftskip=0pt
- \rightskip=0pt
- \parfillskip = 0pt plus 1fil
- \commands@knit\extracommands@knit
- \csname auto#1@knit\endcsname #2\par}%
- \hbox to \chartwidth@knit{%
- \rlap{\purlgray\hskip -\bgshift@knit \box\bgbox@knit}%
- \ifgrid\rlap{\gridcolor\box\ggbox@knit}\fi
- \box\fgbox@knit%
- \hss}%
- \ifchartsonly \vskip 0.5\gridwidth \fi \endsmallpage@knit
- }
+ \global \chartwidth@knit = 0pt
+ \ifresetrn \rownumber = 0 \else \tempcount@knit = \rownumber \fi
+ \setbox\bgbox@knit=\vbox{\def\passnum@knit{0}\hsize=\maxdimen
+ \pf@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \ifresetrn\else\let\rnstep@knit\relax\fi
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \ifresetrn \tempcount@knit = -\rownumber \fi
+ \ifgrid
+ \setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen
+ \gf@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \fi
+ \rownumber = \tempcount@knit
+ \global \rnleftwd@knit = 0pt
+ \global \rnrightwd@knit = 0pt
+ \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen
+ \ff@knit
+ \lineskip=0pt
+ \parskip=0pt
+ \baselineskip=0pt
+ \parindent=0pt
+ \emergencystretch = \stitchwd
+ \leftskip=0pt
+ \rightskip=0pt
+ \parfillskip=0pt plus 1fil
+ \commands@knit\extracommands@knit
+ \def\nonumber{\global\showrn@knitfalse}%
+ \csname auto#1@knit\endcsname #2\par}%
+ \global\advance \chartwidth@knit \rnleftwd@knit
+ \global\advance \chartwidth@knit \rnrightwd@knit
+ \hbox to \chartwidth@knit{\hskip \rnleftwd@knit
+ \rlap{\purlgray \box\bgbox@knit}%
+ \ifgrid\rlap{\gridcolor \box\ggbox@knit}\fi
+ \ifchartsonly
+ \dimen2 = \dp \fgbox@knit \dimen3 = \ht \fgbox@knit
+ \advance\dimen2 0.5\gridwidth \advance\dimen3 0.5\gridwidth
+ \vrule width 0pt height \dimen3 depth \dimen2
+ \fi
+ % If we are doing charts only, we want to enlarge things enough that
+ % we can see the grid on all sides.
+ % But if we aren't, we want adjacent charts to merge seamlessly
+ % because using separate charts is the only way to allow charts to
+ % break across pages.
+ \box\fgbox@knit%
+ \hss}%
+ \endsmallpage@knit
+ }
% Special charts only macros
-\def\chartsonly{\chartsonlytrue
- \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi%
- \hoffset=-1in
- \voffset=-1in
- \vsize = 120in
- \def\smallpage{\vfil\break
- \global\chartwidth@knit=0pt \setbox0 = \vbox\bgroup}
- \def\endsmallpage{\egroup%
- %
- \ifdim\chartwidth@knit>0pt \pdfpagewidth = \chartwidth@knit \else
- \pdfpagewidth=\wd0 \fi
- %
- \dimen0=\ht0 \advance \dimen0 by \dp0
- \pdfpageheight=\dimen0
- %
- \ifdim \pdfpageheight > \vsize
- {\newlinechar=`|
- \message{||You need to increase \string\vsize.}
- \message{What do you want such a big chart for, anyway?0||}}
- \fi
- %
- \box0
- \vfil\break
- }
- \let\smallpage@knit\smallpage
- \let\endsmallpage@knit\endsmallpage
- \def\extracommands@knit{\hsize=\maxdimen
- \leftskip = 0.5\gridwidth
- \rightskip = 0.5\gridwidth
- \vskip 0.5\gridwidth
- }
+\def \chartsonly{\chartsonlytrue
+ \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi%
+ \hoffset=-1in
+ \voffset=-1in
+ \vsize = 120in
+ \def\smallpage{\vfil\break
+ \global\chartwidth@knit=0pt
+ \setbox0 = \vbox\bgroup
+ \def\smallpage@knit{\let\endsmallpage@knit\egroup \noindent \hbox\bgroup}%
+ }
+ \def\endsmallpage{\egroup%
+ %
+ \pdfpagewidth=\wd0
+ %
+ \dimen0=\ht0 \advance \dimen0 by \dp0
+ \pdfpageheight=\dimen0
+ %
+ \ifdim \pdfpageheight > \vsize
+ {\newlinechar=`|
+ \message{||You need to increase \string\vsize.}
+ \message{What do you want such a big chart for, anyway?||}}
+ \fi
+ %
+ \box0
+ \vfil\break
+ }
+ \let\smallpage@knit\smallpage
+ \let\endsmallpage@knit\endsmallpage
+ \def\extracommands@knit{%
+ \leftskip = 0.5\gridwidth
+ \rightskip = 0.5\gridwidth
+ }
}
\let\smallpage\begingroup
\let\endsmallpage\endgroup
% Autonumbering macros
-\def\everypar@knit{\hskip\leftgap@knit \leftgap@knit=0pt \relax}
-
-\def \auto@knit{\let\nonumber\relax \everypar={\everypar@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
-\def \autoleft@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
-\def \autoright@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
-\def \autooddleft@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\ifodd \rownumber \rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\else\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\kern\rownumberwd\fi}}
-\def\autooddright@knit{\def\nonumber{\def\rncore@knit{\global\let\rncore@knit\rncore@save@knit}}\everypar={\everypar@knit\ifodd \rownumber \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\kern\rownumberwd\else\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\fi}}
+\def \everypar@knit{\hskip\leftgap@knit \leftgap@knit=0pt \relax}
+
+\def \auto@knit{\let\nonumber\relax \everypar={\everypar@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
+\def \autoleft@knit{\everypar={\everypar@knit\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}}}
+\def \autoright@knit{\everypar={\everypar@knit\do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
+\def \autooddleft@knit{\everypar={\everypar@knit
+ \ifodd \rownumber
+ \rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}%
+ \else %\hskip\rownumberwd
+ \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}\fi}}
+\def \autooddright@knit{\everypar={\everypar@knit
+ \ifodd \rownumber %\hskip\rownumberwd
+ \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}%
+ \else\rnleft@knit\do@endofpar@knit{\adjustchartwidth@knit}\fi}}
+\def \autoboth@knit{\everypar={\everypar@knit\rnleft@knit\global\advance\rownumber 1 \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}}
\let\autoevenleft@knit\autooddright@knit
\let\autoevenright@knit\autooddleft@knit
-\def \setbgshift@knit{\leftrn@knitfalse \global \bgshift@knit = 0pt}
-\def \setbgshiftleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftright@knit{\leftrn@knitfalse\resetrnwidth@knit \global \bgshift@knit = 0pt}
-\def \setbgshiftoddleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftoddright@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def \setbgshiftevenleft@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-\def\setbgshiftevenright@knit{\leftrn@knittrue \resetrnwidth@knit \global \advance \bgshift@knit -\rownumberwd}
-
-% Make wider boxes if we've got autonumbered rows.
-% We don't do this for \chart so that the rownumbers on the left
-% can be aligned to with ~.
-\def\resetrnwidth@knit{%
- \setbox1=\hbox{\rmten@knit 5}%
- \setbox0=\hbox{\hskip \bgshift@knit \hskip -\wd1 \rmten@knit \the\rownumber}%
- \edef\rownumberwd{\the\wd0}
- \setbox1=\hbox{\rmten@knit \the\rownumber}%
- \edef\rnmiddle@knit{\hskip\the\wd1}}
-
-\def\adjustchartwidth@knit{\endgraf
- \ifnum \passnum@knit = 2 \setbox0=\lastbox
- \setbox1=\hbox{\unhcopy0\unskip}%
- \box0
- \ifdim\wd1 >\chartwidth@knit \global\chartwidth@knit=\wd1\fi\fi}
+\def \adjustchartwidth@knit{\endgraf
+ \ifnum \passnum@knit = 2 \setbox0=\lastbox
+ \setbox1=\hbox{\unhcopy0\unskip}%
+ \box0
+ \ifdim\wd1 >\chartwidth@knit \global\chartwidth@knit=\wd1\fi\fi}
+
+% Stitch-counting macros
+
+\def \adjuststitchcount{\futurelet\next@knit\adjuststitchcount@knit}
+\def \adjuststitchcount@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\adjuststitchcount@@knit}\else
+ \def\nextstep@knit{\adjuststitchcount@@knit[\relax]}\fi\nextstep@knit}
+\def \adjuststitchcount@@knit[#1]#2{%
+ \leavevmode\ifnum\passnum@knit=3 \null
+ \ifcountingout@knit \kern #2\stitchwd \else \ifx#1\relax \kern#2\stitchwd \else \kern #1\stitchwd \fi \fi \null\fi}
+
+\def \stitchcountwarningbar{\ifnum \stitchcountinprev = \stitchcountout \else \vrule width \overfullrule \fi}
+
+\def \countstitches#1{%
+ \global\stitchcountinprev = \stitchcountin
+ \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \stsout@knit #1}%
+ \stitchcountout = \wd0
+ \dimen0 = 0.5\stitchwd \advance \stitchcountout \dimen0
+ \global\divide \stitchcountout \stitchwd
+ \setbox1 = \hbox{\def\passnum@knit{3}\countingout@knitfalse \stsin@knit #1}%
+ \stitchcountin = \wd1
+ \dimen1 = 0.5\stitchwd \advance \stitchcountin \dimen1
+ \global\divide \stitchcountin \stitchwd
+ \ifnum\stitchcountinprev < -99
+ \global\stitchcountinprev = \stitchcountout
+ \fi
+ }
+
+\def \stitchcountchart{\futurelet\next@knit\stitchcountchart@knit}
+\def \stitchcountchart@knit{\ifx\next@knit[%
+ \def\nextstep@knit{\stitchcountchart@@knit}\else
+ \def\nextstep@knit{\stitchcountchart@@knit[]}\fi\nextstep@knit}
+\def \stitchcountchart@@knit[#1]{\begingroup \catcode`\|=\active \def\chartrn@knit{#1}\obeylines \afterassignment \printstitchcountchart@knit \toks0 =}
+
+\def \printstitchcountchart@knit{\smallpage@knit\hbox{%
+ \ifx\relax\printleftstitchcount\else\ifx \empty \printleftstitchcount\else
+ \let\printstitchcount@knit\printleftstitchcount
+ \def\stitchcountside@knit{0}\makestitchcounts@knit \fi\fi
+ \chart[\chartrn@knit]{\the\toks0}%
+ \ifx\relax\printrightstitchcount\else\ifx \empty \printrightstitchcount\else
+ \let\printstitchcount@knit\printrightstitchcount
+ \def\stitchcountside@knit{1}\makestitchcounts@knit\fi\fi
+ }\endsmallpage@knit
+ \endgroup}
+
+{\obeylines
+\gdef\countstitcheseachrow@knit#1^^M{%
+ \countstitches{#1}%
+ \setbox0=\hbox{\def\passnum@knit{2}\strut@knit \printstitchcount@knit\stitchcountwarningbar}%
+ \setbox1=\hbox{#1}%
+ \ifdim \wd0 > \stitchcountwidth@knit \global\stitchcountwidth@knit = \wd0 \fi
+ \hbox to 0pt{\ifnum\stitchcountside@knit = 0 \hss\fi
+ \vrule width 0pt height \ht1 depth \dp1 \smash{\box0}%
+ \ifnum\stitchcountside@knit = 1 \hss\fi}%
+ \par}}
+
+\def\makestitchcounts@knit{\hbox{\setbox1=\vbox{\stitchcountin = -1001 \global\stitchcountwidth@knit=0pt
+ \parindent=0pt
+ \def\passnum@knit{3}
+ \ff@knit
+ \commands@knit
+ \everypar={\countstitcheseachrow@knit} \offinterlineskip
+ \the\toks0
+ }%
+ \ifnum\stitchcountside@knit = 0
+ \hskip \stitchcountwidth@knit\rlap{\box1}%
+ \else
+ \rlap{\box1}\hskip \stitchcountwidth@knit
+ \fi
+}}
+
+\def \printleftstitchcount{{\rncolor \knitrm(\the\stitchcountout\ sts) }}
+\def \printrightstitchcount{}
\catcode`\@=\catcountknit