diff options
Diffstat (limited to 'Master/texmf-dist')
91 files changed, 4364 insertions, 2553 deletions
diff --git a/Master/texmf-dist/doc/fonts/knitting/README b/Master/texmf-dist/doc/fonts/knitting/README index b4b2f9e3a25..649dead8457 100644 --- a/Master/texmf-dist/doc/fonts/knitting/README +++ b/Master/texmf-dist/doc/fonts/knitting/README @@ -2,9 +2,14 @@ This package is written to make it possible to write cable and lace charts for knitting patterns using plain TeX or LaTeX. It provides fonts of appropriate symbols and macros for their use. -This package is released under the LaTeX Project Public License. See -http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for -the details of that license. +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3 of this license or (at your option) any +later version. +The latest version of the license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2003/06/01 or later. As per the LPPL, no restrictions are placed on running this package. In particular, no restrictions are placed by the package author on selling diff --git a/Master/texmf-dist/doc/fonts/knitting/knitexamples.pdf b/Master/texmf-dist/doc/fonts/knitting/knitexamples.pdf Binary files differnew file mode 100644 index 00000000000..952bacbfc0d --- /dev/null +++ b/Master/texmf-dist/doc/fonts/knitting/knitexamples.pdf diff --git a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex index 6b98fcfbae8..e9e4e3ea223 100644 --- a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex +++ b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex @@ -24,9 +24,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'. % -% Date: 2010/08/29 +% Date: 2019/04/03 % -% Version: 2 +% Version: 3 \documentclass[draft]{article} @@ -191,38 +191,47 @@ \definecolor{lightgreen}{rgb}{0.5,1,0.5} \definecolor{yellow}{rgb}{1,1,0.35} -\catcode `\^=\active -% Since we aren't using math, we turn ^ into an active character -\renewcommand{^}{\noindent{\purlpass{\color{lightgreen}}=}} -% And then we can define it like a command -% The \noindent is there to keep the row numbering working. - -\chart[right]{{ -\purlpass{\color{blue}} % = produces blue --|--------------| --|=--=--=--=--=-| -=|--=--=-=--=--=| -^|^=^^=^^^=^^=^^| -^|=^^=^^=^^=^^=^| -\purlpass{\color{green}} % = produces green -=|^^=^^=^=^^=^^=| -^|^=^^=^^^=^^=^^| -\renewcommand{^}{\noindent{\purlpass{\color{yellow}}=}} -% ^ produces yellow -^|=^^=^^=^^=^^=^| -=|^^=^^=^=^^=^^=| -^|=^^=^^=^^=^^=^| -\renewcommand{^}{\noindent{\purlpass{\color{lightgreen}}=}} -% ^ produces light green -^|^=^^=^^^=^^=^^| -=|^^=^^=^=^^=^^=| -\purlpass{\color{blue}} % = produces blue -^|=^^=^^=^^=^^=^| -^|^=^^=^^^=^^=^^| -=|--=--=-=--=--=| --|=--=--=--=--=-| --|--------------| -}} + +% Enclosing the \catcode `\^=\active and the chart in braces +% means that ^ will go back to its usual math meaning after the chart +{ + %We turn ^ into an active character + \catcode `\^=\active + % And then we can define it like a command + \renewcommand{^}{\noindent{\purlpass{\color{lightgreen}}\purlbackground{-}}} + + \chart[right]{ + \purlpass{\color{blue}} + % = produces blue + -|--------------| + -|=--=--=--=--=-| + =|--=--=-=--=--=| + ^|^=^^=^^^=^^=^^| + ^|=^^=^^=^^=^^=^| + \purlpass{\color{green}} + % = produces green + =|^^=^^=^=^^=^^=| + ^|^=^^=^^^=^^=^^| + \renewcommand{^}{\noindent{\purlpass{\color{yellow}}\purlbackground{-}}} + % ^ produces yellow + ^|=^^=^^=^^=^^=^| + =|^^=^^=^=^^=^^=| + ^|=^^=^^=^^=^^=^| + \renewcommand{^}{\noindent{\purlpass{\color{lightgreen}}\purlbackground{-}}} + % ^ produces light green + ^|^=^^=^^^=^^=^^| + =|^^=^^=^=^^=^^=| + \purlpass{\color{blue}} + % = produces blue + ^|=^^=^^=^^=^^=^| + ^|^=^^=^^^=^^=^^| + =|--=--=-=--=--=| + -|=--=--=--=--=-| + -|--------------| + } +} + +\ifchartsonly \else Repeats \fi \renewcommand{\printrightrownumber}[1]{% \knitleftarrowhead diff --git a/Master/texmf-dist/doc/fonts/knitting/knitkey.pdf b/Master/texmf-dist/doc/fonts/knitting/knitkey.pdf Binary files differnew file mode 100644 index 00000000000..e86cbe4c20a --- /dev/null +++ b/Master/texmf-dist/doc/fonts/knitting/knitkey.pdf diff --git a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex index 046dbdd054e..fc50643144a 100644 --- a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex +++ b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex @@ -25,17 +25,18 @@ % 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/08/29 +% Date: 2019/04/03 % -% Version: 2 +% Version: 3 -\documentclass{article} +\documentclass{amsart} \usepackage{knitting} \usepackage[colorlinks]{hyperref} % Choose your chart symbol font \knitnogrid \knitwide +\knitmixed \knitgrid % \ifdesigner lets me easily hide all my comments to the designer and @@ -124,11 +125,17 @@ exact definition should vary from pattern to pattern. \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}} @@ -140,11 +147,15 @@ for double decreases (and 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 +\clearpage + \section{General symbols} \ifdesigner @@ -156,6 +167,8 @@ substitute \textknit{\knitbox{B}{1}} for \textknit{b}. \textknit{(} and \textknit{)} are meant to indicate biased stitches, that is, stitches worked between increases and decreases. These are needed in charts for machine knitting; they also can make the chart easier to visualize. +%If you use bobbles, be sure to define ssp tbl somewhere. + \medskip \fi @@ -173,6 +186,11 @@ substitute \textknit{\knitbox{B}{1}} for \textknit{b}. \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.} +\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.} +\dblkeyrow{\textknit{[} or \textknit{]}}{Slip one as if to knit with yarn held to the wrong side.} +\dblkeyrow{\textknit{\purlbackground{[}} or \textknit{\purlbackground{]}}}{Slip one as if to knit with yarn held to the right side.} \keyrow{\textknit{\bobble{3}}} {(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} @@ -184,23 +202,19 @@ If you use bobbles, be sure to define ssp tbl somewhere. \keyrow{\textknit{\bobble{5}}} {(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.} -\dblkeyrow{\textknit{[} or \textknit{]}}{Slip one as if to knit with yarn held to the wrong side.} -\dblkeyrow{\textknit{\purlbackground{[}} or \textknit{\purlbackground{]}}}{Slip one as if to knit with yarn held to the right side.} \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 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.} +\keyrow{\textknit{\widesymbol{*}{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.} +\keyrow{\textknit{111}}{Slip 1 as if to knit, knit 2, pass slipped stitch over both knitted stitches}{Slip 1 as if to purl, purl 2, pass slipped stitch over both purled stitches} +\dblkeyrow{\textknit{???}}{Wrapped stitches: Knit 3 (RS) or purl 3 (WS) and then slide these three stitches to a cable needle. Move yarn to the right side and wrap yarn from left to right across these three stitches, then move yarn to wrong side and wrap yarn from right to left across these three stitches. You have just wrapped the yarn all the way around these three stitches once. Wrap yarn in this direction 2 more times, then slip stitches from cable needle to right needle and continue knitting.} \hrule \clearpage \setcolwidths{3\stitchwd} -\keyrow{\textknit{111}}{Slip 1 as if to knit, knit 2, pass slipped stitch over both knitted stitches}{Slip 1 as if to purl, purl 2, pass slipped stitch over both purled stitches} -\dblkeyrow{\textknit{???}}{Wrapped stitches: Knit 3 (RS) or purl 3 (WS) and then slide these three stitches to a cable needle. Move yarn to the right side and wrap yarn from left to right across these three stitches, then move yarn to wrong side and wrap yarn from right to left across these three stitches. You have just wrapped the yarn all the way around these three stitches once. Wrap yarn in this direction 2 more times, then slip stitches from cable needle to right needle and continue knitting.} + \keyrow{\textknit{+++}} {Horizontal cable (worked throughout with yarn held to back): \par\emph{First stitch}: 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. @@ -222,7 +236,7 @@ A horizontal cable should (usually) be preceded by a yarn over and followed by a \medskip \setcolwidths{\stitchwd} -{\knitgrid +{\ifgrid\else \knitgrid\fi \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.}{Purl 2 together} @@ -239,7 +253,8 @@ A horizontal cable should (usually) be preceded by a yarn over and followed by a \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``}}}. +\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|\widesymbol{W}{3}|. +The symbols \textknit{0} and \textknit{\#} have no predetermined definitions; use them for whatever you need. \medskip @@ -267,6 +282,7 @@ A horizontal cable should (usually) be preceded by a yarn over and followed by a \dblkeyrow{\textknit{w}}{Make 3 from 1: Knit (RS) or purl (WS) 1 through back loop, then through front loop of the same stitch, and slide stitch off the left needle. Then pick up the front strand of the stitch just worked, twist it and knit or purl it.} \dblkeyrow{\textknit{W}}{As for \textknit{w}, but purl all stitches on RS and knit all stitches on WS.} \keyrow{\textknit{E}}{(Knit 1, purl 1, knit 1) in next stitch}{(Purl 1, knit 1, purl 1) in next stitch} +\keyrow{\textknit{\&}}{(Purl 1, knit 1, purl 1) in next stitch}{(Knit 1, purl 1, knit 1) in next stitch} \keyrow{\textknit{Y}}{(Knit 1, yarn over, knit 1) in next stitch}{(Purl 1, yarn over, purl 1) in next stitch} \hrule @@ -321,7 +337,7 @@ first stitch, return first stitch on right needle to left needle.* Repeat from * \ifdesigner This is a comprehensive list of the cable symbols available in the grid -fonts; more non-grid cable symbols are possible. (A few examples are at the end of this document. +fonts; more non-grid cable symbols are possible. (A few examples are at the end of this document.) \medskip @@ -333,9 +349,9 @@ fonts; more non-grid cable symbols are possible. (A few examples are at the end % These macros make it easy to change our keys to show more than one set of definitions. % Key showing two or three symbols -%\newcommand\cableset[3]{\textknit{#1}\ifgrid\par\vspace{3pt}\textknit{#2}\par\vspace{3pt}\textknit{#3}\fi} -\newcommand\cableset[3]{\textknit{#1}\ifgrid\hspace{3pt}\textknit{#2}\fi} -\newcommand\twistset[2]{\textknit{#1}\ifgrid\hspace{3pt}\textknit{#2}\fi} +%\newcommand\cableset[3]{\textknit{#1}\ifknitsymbol\else\par\vspace{3pt}\textknit{#2}\par\vspace{3pt}\textknit{#3}\fi} +\newcommand\cableset[3]{\textknit{#1}\ifknitsymbol\else\hspace{3pt}\textknit{#2}\fi} +\newcommand\twistset[2]{\textknit{#1}\ifknitsymbol\else\hspace{3pt}\textknit{#2}\fi} % Most basic key %\newcommand\cableset[3]{\textknit{#1}} @@ -428,7 +444,7 @@ fonts; more non-grid cable symbols are possible. (A few examples are at the end \setcolwidths{6\stitchwd} %\newcommand\cablepair[2]{\textknit{#1}} -\newcommand\cablepair[2]{\textknit{#1}\ifgrid \par\vspace{7pt}\par\textknit{#2}\fi} +\newcommand\cablepair[2]{\textknit{#1}\ifknitsymbol\else \par\vspace{7pt}\par\textknit{#2}\fi} \noindent \keyrow{\cablepair{Kpk}{Kpd}}{ diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf Binary files differindex f8d154687dd..c721277ffee 100644 --- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf +++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex index bf6d09ab5bc..da025bef971 100644 --- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex +++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex @@ -1,10 +1,10 @@ % knitting-doc.tex % -% Provides documentation for the knitting package (knitting.sty) +% Provides documentation for the knitting package % % author: Ariel Barton % -% Copyright Ariel Barton, 2010 +% Copyright Ariel Barton, 2010-2019 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -20,12 +20,12 @@ % The complete list of files considered part of this work is in % the file `knitting-doc.pdf' and later in this file. % -% Date: 2010/08/29 +% Date: 2019/04/03 % -% Version: 2 +% Version: 3 \documentclass[draft]{amsart} -% Do not remove the [draft] option; we need it to explain something +% Do not remove the [draft] option; we need it to explain something % in Section 5. \usepackage{knitting} @@ -39,6 +39,7 @@ \hyphenation{auto-number-chart} \usepackage[draft=false,pdfborder={0 0 0}]{hyperref} +\DeclareRobustCommand{\SkipTocEntry}[5]{} \title{The \textsf{knitting} package} @@ -51,6 +52,12 @@ \maketitle +\tableofcontents + +%\listoffigures + +%\listoftables + This package was written to make knitting charts using \LaTeX\ or plain \TeX. It consists of several PostScript fonts of knitting symbols, font-support documents, and packages of commands. @@ -58,7 +65,7 @@ font-support documents, and packages of commands. Here's an example of the code and output: \begin{center} \begin{minipage}[b]{108pt} -\obeylines\parindent=0pt\tt +\obeylines\parindent=0pt\tt \verb|\chart{| =CCppggKKCCppggKK= ===KKkk====KKkk=== @@ -86,13 +93,13 @@ Here's an example of the code and output: \end{minipage} \end{center} -More examples may be found in the file \texttt{knitexamples.tex} and in +More examples may be found in the file \texttt{knitexamples.tex} and in later sections of this document. \section{License} -This work (the \textsf{knitting} package) consists of all files listed -in \autoref{se:manifest}. It is copyright Ariel Barton, 2010. +This work (the \textsf{knitting} package) consists of all files listed +in \autoref{sec:manifest}. It is copyright Ariel Barton, 2011--2019. This work may be distributed and/or modified under the conditions of the \LaTeX\ Project Public License, either @@ -100,7 +107,7 @@ version 1.3 of this license or (at your option) any later version. The latest version of the license is in \begin{quote} -\href {http://www.latex-project.org/lppl.txt} +\href {http://www.latex-project.org/lppl.txt} {http://www.latex-project.org/lppl.txt} \end{quote} and version 1.3 or later is part of all distributions of @@ -110,12 +117,12 @@ 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 -\autoref{se:manifest}. This license (loosely speaking) allows you to +\autoref{sec: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 -files only}, may be freely copied, verbatim or modified, into any -document you write, without restriction. +entirety. In addition, any part, no matter how large or small, of the +files \texttt{knitkey.tex} and \texttt{knitexamples.tex}, \emph{and +these two files only}, may be freely copied, verbatim or modified, into +any document you write, without restriction. As per the conditions of the LPPL, no restrictions are placed on running this package (i.e., compiling \LaTeX\ documents that use this package). @@ -125,7 +132,7 @@ all \LaTeX\ packages may be used in commercial products; if you use other packages to produce a PDF or paper document, you must check their documentation to see if you are allowed to sell the result. -Suggestions and questions may be sent to the package author at +Suggestions and questions may be sent to the package author at \texttt{origamist@\allowbreak gmail.com}. \section{Installation} @@ -142,15 +149,15 @@ there, create it. If you're using MiK\TeX, it is possible to designate any folder you like as the root of your local tree, that is, the place where you store -supporting files. Instructions may be found at +supporting files. Instructions may be found at \href{http://docs.miktex.org/manual/localadditions.html\#id573803} {\texttt{http:/\slash docs.miktex.org\slash manual\slash localadditions.html\allowbreak\#id573803}} or through the manual which should have come with MiKTeX. Any time you add supporting files to a local MiKTeX root, you have to -refresh the file name database; see +refresh the file name database; see \href{http://docs.miktex.org/manual/configuring.html\#fndbupdate} -{\texttt{http:/\slash docs.miktex.org\slash manual\slash configuring.html\allowbreak\#fndbupdate}}. } +{\texttt{http:/\slash docs.miktex.org\slash manual\slash configuring.html\allowbreak\#fndbupdate}}. } All supporting files should be sorted into specific subfolders of \texttt{texmf}. The sorting rules are: \begin{itemize} @@ -176,29 +183,24 @@ documentation should tell you where. If you really can't figure out where to put the files, if you're in a hurry, or if you're using someone else's computer and don't want to mess with their \texttt{texmf} folder, just dump every file you think you -might need into the same folder as the document that uses the package. (This is probably all the \texttt{.tfm}, \texttt{.pfb}, and \texttt{.map} files, plus the \texttt{.sty} and \texttt{.fd} files if you are using \LaTeX\ or the \texttt{.tex} file if you are using plain \TeX.) - -You aren't done! \TeX\ now knows everything it needs to do its job and \emph{arrange} the characters in the font, and so your document will compile, but the postprocessing software (your DVI viewer, your printer, or the PDF files that pdf\/\TeX\ produces) don't know about the fonts themselves. +might need into the same folder as the document that uses the package. +(This is probably all the \texttt{.tfm}, \texttt{.pfb}, and +\texttt{.map} files, plus the \texttt{.sty} and \texttt{.fd} files if +you are using \LaTeX\ or the \texttt{.tex} file if you are using plain +\TeX.) + +You aren't done! \TeX\ now knows everything it needs to do its job and +\emph{arrange} the characters in the font, and so your document will +compile, but the postprocessing software (your DVI viewer, your printer, +or the PDF files that pdf\/\TeX\ produces) don't know about the fonts +themselves. There's a simple way to tell pdf\/\TeX\ about the fonts: use the command \begin{quote}\verb|\pdfmapfile{+knitfont.map}|\end{quote} -or the lines -\begin{quote} -\verb|\pdfmapline{+knitgn\space <knitgn.pfb}|\\ -\verb|\pdfmapline{+knitwn\space <knitwn.pfb}|\\ -\verb|\pdfmapline{+knitnn\space <knitnn.pfb}|\\ -\verb|\pdfmapline{+knitgp\space <knitgp.pfb}|\\ -\verb|\pdfmapline{+knitwp\space <knitwp.pfb}|\\ -\verb|\pdfmapline{+knitnp\space <knitnp.pfb}|\\ -\verb|\pdfmapline{+knitnl\space <knitnl.pfb}|\\ -\verb|\pdfmapline{+knitnr\space <knitnr.pfb}|\\ -\verb|\pdfmapline{+knitgg\space <knitgg.pfb}|\\ -\verb|\pdfmapline{+knitwg\space <knitwg.pfb}| -\end{quote} -These map lines can go in \texttt{uknit.fd}, -\texttt{knitting.sty}, or the file that uses the package. +This map line can go in +\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 +%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} @@ -207,11 +209,7 @@ These map lines can go in \texttt{uknit.fd}, %It goes in \texttt{texmf/fonts/enc}. The advantage to this is that it involves nothing outside of the -document you are compiling. Also, the \verb.\pdfmapline. command is -part of pdf\/\TeX, and has been since 2004 (and \verb.\pdfmapfile. is -even older); any distribution of \TeX\ installed or updated in the last -five years will be able to deal with the exact syntax above. - +document you are compiling. On the other hand, it can be annoying to have to say that everywhere. And this doesn't work at all if you decide you want to produce DVI files and use a postprocessor such as \textsf{dvips}. @@ -221,235 +219,548 @@ cause \textsf{dvips}, \textsf{dvipdfm}, and pdf\/\TeX\ to know about these fonts by opening a Terminal window (command prompt) and typing {\tt updmap -{}-enable Map=knitfont.map}. -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. +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. +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: +Here is a minimal \LaTeX\ document that will produce a knitting pattern with a chart: -\begin{itemize} +\bigskip -\item \verb|\chart|, the command that draws a chart. +\begin{minipage}{0.45\textwidth} +\begin{verbatim} +\documentclass{article} +\usepackage{knitting} +\begin{document} +Here is my chart: +\chart{ +--OAO-- +<O---O> +-<O-O>- +} +\end{document} +\end{verbatim} +\end{minipage} +\hfill +\begin{minipage}{0.45\textwidth} +Here is my chart: +\chart{ +--OAO-- +<O---O> +-<O-O>- +} +\end{minipage} -\item \verb|\textknit|. This command is meant to be used for writing chart keys. It typesets its argument using knitting symbols and puts it in an unbreakable box, which may appear in a table or even in the middle \textknit{Kp} of a paragraph. +\bigskip -\end{itemize} +Here is a minimal plain \TeX\ document that will do the same thing: -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. +\bigskip -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. +\begin{minipage}{0.45\textwidth} +\begin{verbatim} +\input knitting +Here is my chart: +\chart{ +--OAO-- +<O---O> +-<O-O>- +} +\bye +\end{verbatim} +\end{minipage} +\hfill +\begin{minipage}{0.45\textwidth} +Here is my chart: +\chart{ +--OAO-- +<O---O> +-<O-O>- +} +\end{minipage} -These redefined commands do \emph{not} work in concert with \verb|\textknit|. +\bigskip -\subsection{Commands affecting overall appearance} +\begin{figure} +\caption{The normal symbols}\label{fig:symbols} +\newcommand\knitrow[1]{\texttt{#1}&\knitgrid\textknit{#1}&\knitnogrid \textknit{#1}\\} +\newcommand\displaypair[2]{\texttt{#2}&\knitgrid\textknit{#1}&\knitnogrid \textknit{#1}\\} +\begin{tabular}[t]{|ccc|} +\hline +\knitrow{-} +\knitrow{=} +\knitrow{<} +\knitrow{>} +\knitrow{;} +\knitrow{:} +\knitrow{L} +\knitrow{R} +\knitrow{l} +\knitrow{r} +\knitrow{A} +\knitrow{a} +\knitrow{!} +\knitrow{2} +\knitrow{3} +\knitrow{4} +\knitrow{5} +\knitrow{m} +\knitrow{M} +\knitrow{O} +\knitrow{*} +\hline +\end{tabular} +\hfill +\begin{tabular}[t]{|ccc|} +\hline +\knitrow{t} +\knitrow{T} +\knitrow{x} +\knitrow{X} +\knitrow{b} +\knitrow{B} +\knitrow{q} +\knitrow{Q} +\knitrow{v} +\knitrow{V} +\knitrow{y} +\knitrow{u} +\knitrow{0} +\knitrow{\#} +\knitrow{w} +\knitrow{W} +\knitrow{E} +\knitrow{\&} +\knitrow{Y} +\knitrow{6} +\knitrow{@} +%\knitrow{0} +\hline +\end{tabular} +\hfill +\begin{tabular}[t]{|ccc|} +\hline +\knitrow{(} +\knitrow{)} +\knitrow{i} +\knitrow{I} +\knitrow{j} +\knitrow{J} +\knitrow{h} +\knitrow{H} +\knitrow{s} +\knitrow{S} +\knitrow{[} +\knitrow{]} +\knitrow{z} +\knitrow{Z} +\knitrow{9} +\knitrow{U} +\knitrow{f} +\knitrow{F} +\knitrow{7} +\knitrow{8} +\knitrow{"} +\hline +\end{tabular} +\hfill +\begin{tabular}[t]{|ccc|} +\hline +\knitrow{""} +\knitrow{,.,} +\knitrow{'`'} +\knitrow{111} +\knitrow{???} +\knitrow{+++} +\knitrow{+/+} +\displaypair{\|}{\char`\\|} +\displaypair{\!}{\char`\\!} +\knitrow{kK} +\knitrow{pK} +\displaypair{\bobble 5}{\char`\\\char`\@5} +\displaypair{\narrowincrease 5}{\char`\\<5} +\displaypair{\narrowdecrease 5}{\char`\\>5} +\displaypair{\pnarrowincrease 5}{\char`\\[5} +\displaypair{\pnarrowdecrease 5}{\char`\\]5} +\displaypair{\wideincrease{4}}{} +\displaypair{\widedecrease{4}}{} +&\knitgrid\textknit{\knitbox{3}{3}}&\knitmixed\textknit{\Knit{3}{3}}\\ +\hline +\multicolumn{3}{p{1.85in}}{\rule{0pt}{10pt}See \autoref{sec:fancystitches} for the commands for the last eight rows.} +\end{tabular} +\end{figure} -\begin{itemize} +To draw your own chart, you first need access to various knitting symbols. They are produced inside charts using normal letters: \texttt{A} produces \textknit{A}, \texttt{O} produces \textknit{O}, and so on. An almost-complete typing key is provided in \autoref{fig:symbols}. The file \texttt{knitkey.tex} contains my suggested meanings for all the available symbols. -\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. +Ways to modify these symbols are described in \autoref{sec:fancystitches}. -\item In \LaTeX, you can change the sizes of the chart symbols with the usual commands \verb|\small|, \verb|\large|, etc. +Some commands to change the overall appearance of the charts or the document are given in \autoref{sec:fourfonts}. -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. +Sometimes a part of a knitting chart (usually a repeat) should be outlined; the machinery to do so is described in \autoref{sec:outline}. -\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. +Some miscellaneous commands, including control over the various grays and colors used in knitting charts, are described in \autoref{sec:color}. The behavior of spaces and carriage returns in the input is described in \autoref{sec:spacein}. -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). +Cable symbols such as {\knitgrid\textknit{Kk} or \knitmixed\textknit{Kk}} are complicated; they are described in \autoref{sec:cables}. -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). +Finally, \textsf{knitting} will count rows and stitches for you automatically; the machinery to do so is described in +\autoref{sec:rowcount} and +\autoref{sec:counting}. -For some reason, \verb|smallpage| won't work if your small page only has one line. Also, your PDF viewer may cut off a few pixels around the edges. -This command doesn't work with dvi-\TeX; this is a pdf\/\TeX\ command only. +These sections describe the commands defined by \textsf{knitting}. +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. -\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.) +The command \verb|\chart| is fairly complicated, and as such, may be prone to strange behavior when used with other commands. An alternative command, \verb|\textknit|, may be used inside of, for example, a tabular environment with less risk of unexpected behavior. This is useful for writing chart keys. -\end{itemize} +Most of the commands labeled with $\star$ do \emph{not} work in concert +with \verb|\textknit|. Also, \textknit{\#} and +\textknit{\&} must be accessed with \verb|\textknit{\#}| and +\verb|\textknit{\&}|, not \verb|\textknit{#}| and \verb|\textknit{&}|. +(Unadorned \verb|#| and~\verb|&| may be used with \verb|\chart|.) -\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} +\subsection{Stitch symbols produced or modified with commands} +\label{sec:fancystitches} + +You can generate new symbols with the command \verb|\knitbox|: \textknit{\knitbox{a}{1}} \textknit{\knitbox{Cable 6 left}{6}}. A great many strange symbols are available by using math symbols: +\begin{quote} +\verb|\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}| \chart{\knitbox{$\vspace{-1.5pt}\heartsuit$}{1}}. \end{quote} +However, these may look a little incongruous with the rest of the font, so use with care. + +Here are some other commands that produce particular symbols: + +\medskip + +\newcommand\myminitable[1]{\begin{tabular}[t]{@{}lc@{}}#1 +\end{tabular}} + + +\noindent +\begin{tabular}{lcc} +Command&\texttt{\char`\\chart}-only shorthand&Symbol\\ +\texttt{\char`\\wideincrease\char`\{3\char`\}}& & \textknit{\wideincrease{3}}\\ +\texttt{\char`\\widedecrease\char`\{3\char`\}}& & \textknit{\widedecrease{3}}\\ +\texttt{\char`\\bobble\char`\{3\char`\}}&\verb|\@| & \textknit{\bobble{3}}\\ +\texttt{\char`\\narrowincrease\char`\{3\char`\}}&\verb|\<| & \textknit{\narrowincrease{3}}\\ +\texttt{\char`\\narrowdecrease\char`\{3\char`\}}&\verb|\>| & \textknit{\narrowdecrease{3}}\\ +\texttt{\char`\\pnarrowincrease\char`\{3\char`\}}&\verb|\[| & \textknit{\pnarrowincrease{3}}\\ +\texttt{\char`\\pnarrowdecrease\char`\{3\char`\}}&\verb|\]| & \textknit{\pnarrowdecrease{3}}\\ +& $\sim$& Empty space +\end{tabular} + +\medskip + +The arguments to \verb|\wideincrease| and \verb|\widedecrease| must be numbers; they are the width (in stitches). The arguments to \verb|\bobble| and so on may be any text (although you will probably use numbers). The \texttt{\char`\\chart}-only shorthand may be used inside \verb|\chart|s but not inside \verb|\textknit|. + +The $\sim$ should be used on the edges of non-rectangular charts: +\bigskip + +\begin{minipage}{0.45\textwidth} +\begin{verbatim} +==== +~=== +~~== +~~~= +\end{verbatim} \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} +\begin{minipage}{0.45\textwidth} +\chart{ +==== +~=== +~~== +~~~= } \end{minipage} -\end{figure} + +\bigskip +You can also use $\sim$ inside a chart, although \verb|`|, \verb|'| or \verb|.| may be better choices. (Do not use $\sim$ on its own line; if you need a blank line in a cable chart, use~\verb|`|.) + +Here are some commands that modify or reaarrange existing symbols in odd ways: \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}. -For better results, use \verb|\rnleft| on the left edge and \verb|\rnright| on -the right edge. +\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}|. -If you want to skip a few row numbers, you can say -\verb|\addtocounter|\allowbreak\verb|{rownumber}{-3}| (\LaTeX) or \verb|\global| -\verb|\advance| \verb|\rownumber| \verb|by -3| (plain \TeX). +\item \verb|\widesymbol| places a symbol or sequence of symbols in a box of a given width: {\knitgrid \verb|\widesymbol{W}{2}| \textknit{\widesymbol{W}{2}}}. In other words, \verb|\widesymbol| behaves like \verb|\knitbox|, but typesets its first argument using the knit symbol font rather than a Roman font. -\verb|\chart| will usually automatically arrange things so that the -last \verb|\rn| produces a~1. If you want numbers in different charts -to be numbered consecutively (e.g., if they are pieces of one big -chart), you can turn this behavior off with \verb|\resetrnfalse| and -back on with \verb|\resetrntrue|. You can then reset the row numbers -with \verb|\setcounter{rownumber}{20}|; all future charts will count -down from there. +\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{sec: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}}}. \verb|\cableforeground| and \verb|\cablebackground| may be used for similar effects. -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.) +\end{itemize} -\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. +\noindent +And here are some commands designed to deal with long sequences of knits and purls in a chart, although \verb|\knitbox| can be used to generate other symbols: -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. +\begin{itemize} -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. +\item \verb|\knit| and \verb|\purl|. These macros take one argument each and type out that many plain knit or plain purl symbols. -\item[$\star$] Inside an auto-numbered chart, \verb|\nonumber| skips the next row number. +\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''. The first argument is text to appear inside the box; the second is the desired width of the box (in units of one stitch). -\item[$\star$] To number the stitches (by producing a \emph{row} of stitch numbers), you can use the command \verb|\numberrow|. It takes three arguments: the first number to be printed, the countdown (how often to print intermediate numbers), and the last number to be printed. +They look like this: +\begin{quote}\raggedright +\knitgrid +\verb|\knitgrid|\\ +\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}} +\knitmixed +\verb|\knitmixed|\\ +\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|\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} -\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. +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. -\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. +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 +\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} \end{itemize} -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} +\subsection[Overall appearance]{The four knitting fonts and other commands affecting overall appearance} -\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. +\label{sec:fourfonts} +\begin{itemize} + +\item There are four available knitting fonts. They are selected with +the commands \verb|\knitgrid|, \verb|\knitnogrid|, \verb|\knitwide|, +\verb|\knitmixed|. These commands should be used outside the chart they +are to affect. See \autoref{fig:fourfonts} or the end of this section for a discussion of when each +font should be used. + +\item In \LaTeX, you can change the sizes of the chart symbols with the +usual commands \verb|\small|, \verb|\large|, etc. + +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. + +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). + +For some reason, \verb|smallpage| won't work if your small page only has +one line. Also, your PDF viewer may cut off a few pixels around the +edges. + +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 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.) + +The \textsf{geometry} package now has the ability to change page +dimensions mid-document, which affords much more flexibility than the +\texttt{fullpages} environment; the \texttt{fullpages} environment is +retained only for reasons of backwards compatibility. + +\end{itemize} + +\begin{figure} +\caption{Suggested use of the fonts} +\label{fig:fourfonts} +\medskip +\small +\begin{tabular}[b]{lcp{220pt}} +Font & Example & Suggested use \\ +\texttt{\char`\\knitgrid} & \knitgrid \textknit{A-Kp-} & Most simple patterns\\ +\texttt{\char`\\knitwide} & \knitwide \textknit{AKp-} & Colorwork\\ +\texttt{\char`\\knitmixed} & \knitmixed \textknit{A-Kp-} & Patterns with complicated cables; patterns that use \texttt{\char`\\Knit} and \texttt{\char`\\Purl} to deal with altered stitch counts \\ +\texttt{\char`\\knitnogrid} & \knitnogrid \textknit{A-Kp-} & Patterns that use empty squares (``no stitch'' symbols) to deal with altered stitch counts\\ +\end{tabular} +\end{figure} + + +The suggested uses of the four knitting fonts are summarized in \autoref{fig:fourfonts}. +I prefer to draw most charts with \texttt{\char`\\knitgrid}. However, there are some situations where each of the other four fonts is more useful. -\subsection{Repeat outlines} +The cells in the \texttt{\char`\\knitwide} fonts are the approximate dimensions of a knit stitch, so a colorwork chart done using the \texttt{\char`\\knitwide} font will look more like the finished piece than a colorwork chart done using \texttt{\char`\\knitgrid}. +However, if a chart does not display wrong-side rows, the chart will not have the same proportions as the finished result. Also, lace is often blocked severely, and cables pull in. Thus, such charts will not have the same proportions as the finished piece, even if drawn with \texttt{\char`\\knitwide}; \texttt{\char`\\knitgrid} is probably a better choice. + +The \texttt{\char`\\knitgrid} cables look better than the \texttt{\char`\\knitnogrid} cables; however, wide cables, as well as cables involving increases, decreases, ribbing, and so on, can be expressed much more clearly with \texttt{\char`\\knitnogrid} or \texttt{\char`\\knitmixed}. + +Finally, many knitting patterns exist that have more stitches in some rows than in others. This is usually expressed by using special ``no stitch'' symbols: + +\bigskip + +\noindent +\begin{minipage}[t]{60pt} +\knitnogrid +\chart{ +-.A.- +----- +-.w.-} +\end{minipage} +\hfill +\begin{minipage}[t]{60pt} +\knitmixed +\chart{ +-.A.- +----- +-.w.-} +\end{minipage} +\hfill +\begin{minipage}[t]{60pt} +\knitgrid +\chart{ +-.A.- +----- +-.w.-} +\end{minipage} + +\bigskip + +It is my feeling that the empty gaps of \texttt{\char`\\knitnogrid} are the clearest way to express this, and thus \texttt{\char`\\knitnogrid} should be preferred in charts that involve ``no stitch'' blocks. + +However, in some patterns, we can omit knit or purl symbols to keep the chart the same width. This is best done using \texttt{\char`\\purlbox} or \texttt{\char`\\Purl}: + +\bigskip + +\noindent +\begin{minipage}[t]{108pt} +\knitnogrid +\chart{ +====A==== +\purlbox{4}{3}---\purlbox{4}{3} +====w====} +\end{minipage} +\hfill +\begin{minipage}[t]{108pt} +\knitmixed +\chart{ +====A==== +\Purl{4}{3}---\Purl{4}{3} +====w====} +\end{minipage} +\hfill +\begin{minipage}[t]{108pt} +\knitgrid +\chart{ +====A==== +\purlbox{4}{3}---\purlbox{4}{3} +====w====} +\end{minipage} + +\bigskip + +You may feel that such things look better if a grid is involved. (I do.) This is a way to avoid ``no stitch'' boxes with \texttt{\char`\\knitgrid} or \texttt{\char`\\knitmixed}; again, the presence of complicated cables probably determines which you should use. + + +\clearpage\subsection{Repeat outlines} +\label{sec:outline} + +As illustrated in \autoref{fig:outlineex}, there are ways to outline part of a knitting chart. \begin{figure} \caption{Outline examples}\label{fig:outlineex} +%\renewcommand \printrightrownumber[1]{\knitleftarrowhead\smash{\rule[-\stitchdp]{1pt}{\stitchht}}{\color{rncolor}\textnormal{#1}}} + +\medskip + \advance\hsize 60pt \noindent \hskip -30pt -\begin{minipage}[b]{3in} +\begin{minipage}[b]{3.2in} \obeylines -\verb?\definecolor{knitlinecolor}{rgb}{0,0,0.8}? -\verb?\setcounter{rownumberskip}{2}? -\verb?\chart{? +\rlap{\texttt{\char`\\definecolor\char`\{knitlinecolor\char`\}\char`\{rgb\char`\}\char`\{0,0.5,0.8\char`\}}} +\verb?\chart[right]{? \verb? ---|---|- ? \verb? -\overline{--|---|-}? \verb?~\={2}~\={2}~ \\ -|---|--- ? \verb?~\={2}~\={2}~ \\ ---|---|- ? \verb?\vspace{12pt}? -\verb? ---\!---\!-? -\verb? -\overline*{--\!---\!-}? -\verb?~\_\_~\_\_~ \\ -\!---\!--- ? -\verb?~\_\_~\_\_~ \\ ---\!---\!- ? +\verb? -\cableleft{--\!}{--}--? +\verb? \-{7} \\ ---\!---\!-? +\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{ - ---|---|- +\definecolor{knitlinecolor}{rgb}{0,0.5,0.8} +\chart[right]{ + ---|---|- -\overline{--|---|-} -~\={2}~\={2}~ \\ -|---|--- -~\={2}~\={2}~ \\ ---|---|- -\vspace{12pt} ---\!---\!- - -\overline*{--\!---\!-} -~\_\_~\_\_~ \\ -\!---\!--- -~\_\_~\_\_~ \\ ---\!---\!- -\nonumber``} +~\={2}~\={2}~ \\ -|---|--- +~\={2}~\={2}~ \\ ---|---|- +\vspace{12pt} + -\cableleft{--\!}{--}-- + \-{7} \\ ---\!---\!- + -\overline*{--\!---\!-} +~\_\_~\_\_~ \\ -\!---\!--- +~\_\_~\_\_~ \\ ---\!---\!- +\vspace{12pt} +} +\chart{} \vspace{0pt} \end{minipage}% \hfill \begin{minipage}[b]{110pt} \knitgrid -\definecolor{knitlinecolor}{rgb}{0,0,0.8} -\setcounter{rownumberskip}{2} -\chart{ ---|---|- +\definecolor{knitlinecolor}{rgb}{0,0.5,0.8} +\chart[right]{ + \\ ---|---|- -\overline{--|---|-} -~\={2}~\={2}~ \\ -|---|--- -~\={2}~\={2}~ \\ ---|---|- -\vspace{12pt} ---\!---\!- - -\overline*{--\!---\!-} -~\_\_~\_\_~ \\ -\!---\!--- -~\_\_~\_\_~ \\ ---\!---\!- -\nonumber``} +~\={2}~\={2}~ \\ -|---|--- +~\={2}~\={2}~ \\ ---|---|- +\vspace{12pt} +\vspace{12pt} + \-{7} \\ ---\!---\!- + -\overline*{--\!---\!-} +~\_\_~\_\_~ \\ -\!---\!--- +~\_\_~\_\_~ \\ ---\!---\!- +\vspace{12pt} +} \vspace{0pt} \end{minipage} \end{figure} @@ -461,102 +772,51 @@ You can change the appearance of the rownumbers by renewing the commands \texttt 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. +\item[$\star$] A line that goes across the chart can be specified with \verb|\-|, which takes an argument (the width of the overlining in stitches). This has starred forms and unstarred forms, like \verb|\overline|. + \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*|. \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. -You can get short horizontal lines to go with \verb?\!? by using \verb|\_|; it should be positioned using tildes~\texttt{\char`\~}. - -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. +You can get short horizontal lines to go with \verb?\!? by using \verb|\_|; it should be positioned using tildes~\texttt{\char`\~}. -If you use your horizontal lines on the edge of the chart, you should use \verb|\-|, which like \verb|\=| takes an argument. +If you want to use short horizontal lines between two \verb?\|?s, you should use the command \verb|\=|, which like \verb|\-| takes an argument. (This will look wrong if you use it at the edge of a chart; it's better to use \verb|\overline| or \verb|\underline|.) \end{itemize} -\subsection{Colors} - -\begin{itemize} +\clearpage -\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. +\subsection{Colors and miscellaneous commands} +\label{sec:color} -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. +\textsf{knitting} uses several colors and shades of gray to draw charts. You can customize these. -\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. +The \LaTeX\ package \texttt{knitting.sty} loads the \textsf{color} package and uses it to define colors; so the color of purl stitches is accessed via \verb|\color{purlgray}|. 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 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. - -\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.) - -\end{itemize} - -\subsection{Stitch symbols produced or modified with commands} +\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. Redefining colors in plain \TeX\ is complicated and driver-dependent; read \texttt{knitting.tex} itself to get an idea of the color definition syntax. \begin{itemize} -\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 \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} +\item \verb|purlgray| is the color of the purl background. -\item[$\star$] Inside a knitting chart (but not after \verb|\textknit|), the shorter commands \verb|\@|, \verb|\<|, \verb|\>|, \verb|\[|, and \verb|\]| are available. +\item \texttt{gridcolor} is the color of the grid lines in the grid fonts. -\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}}}. +\item \texttt{knitlinecolor} controls the lines produced by \verb?\!?,~\verb?|?, \verb|\=|, \verb|\_|, \verb|\-|, \verb|\overline|, and \verb|\underline|. -\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 -\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} - -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. - -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 -\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} +\item \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. See \autoref{sec:rowcount} and \autoref{sec:counting}. \end{itemize} -\subsection{Miscellaneous commands} +There are also some commands you might want to use: \begin{itemize} -\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: +\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 fonts do 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} -\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 \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. 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.} 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|. @@ -564,209 +824,36 @@ You can change \verb|\knitlinewd| with \verb|\setlength|; however, \verb|\knitli 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. -\item The boolean variables \verb|\ifgrid| and \verb|\ifchartsonly| are standard \TeX\ conditionals: they may be used as +\item The boolean variables \verb|\ifgrid|, \verb|\ifknitsymbol| 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} -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. +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. (\verb|\ifgrid| distinguishes between \verb|\knitnogrid| and the other three options; \verb|\ifknitsymbol| distinguishes between \verb|\knitnogrid|\slash\verb|\knitmixed| and \verb|\knitgrid|\slash\verb|\knitwide|.) \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|. \end{itemize} -%\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}\\} -\newcommand\displaypair[2]{\texttt{#2}&\knitgrid\textknit{#1}&\knitnogrid\textknit{#1}\\} -\begin{tabular}[t]{|ccc|} -\hline -\knitrow{-} -\knitrow{=} -\knitrow{<} -\knitrow{>} -\knitrow{;} -\knitrow{:} -\knitrow{L} -\knitrow{R} -\knitrow{l} -\knitrow{r} -\knitrow{A} -\knitrow{a} -\knitrow{!} -\knitrow{2} -\knitrow{3} -\knitrow{m} -\knitrow{M} -\knitrow{O} -\knitrow{9} -\hline -\end{tabular} -\hfill -\begin{tabular}[t]{|ccc|} -\hline -\knitrow{t} -\knitrow{T} -\knitrow{x} -\knitrow{X} -\knitrow{b} -\knitrow{B} -\knitrow{q} -\knitrow{Q} -\knitrow{v} -\knitrow{V} -\knitrow{y} -\knitrow{u} -\knitrow{4} -\knitrow{5} -\knitrow{w} -\knitrow{W} -\knitrow{E} -\knitrow{Y} -\knitrow{6} -%\knitrow{0} -\hline -\end{tabular} -\hfill -\begin{tabular}[t]{|ccc|} -\hline -\knitrow{(} -\knitrow{)} -\knitrow{i} -\knitrow{I} -\knitrow{j} -\knitrow{J} -\knitrow{h} -\knitrow{H} -\knitrow{s} -\knitrow{S} -\knitrow{[} -\knitrow{]} -\knitrow{z} -\knitrow{Z} -\knitrow{U} -\knitrow{f} -\knitrow{F} -\knitrow{7} -\knitrow{8} -\hline -\end{tabular} -\hfill -\begin{tabular}[t]{|ccc|} -\hline -\knitrow{@} -\knitrow{"} -\knitrow{""} -\knitrow{*} -\displaypair{\bobble 5}{\char`\\\char`\@5} -\displaypair{\narrowincrease 5}{\char`\\<5} -\displaypair{\narrowdecrease 5}{\char`\\>5} -\displaypair{\pnarrowincrease 5}{\char`\\[5} -\displaypair{\pnarrowdecrease 5}{\char`\\]5} -\knitrow{,.,} -\knitrow{'`'} -\knitrow{111} -\knitrow{???} -\knitrow{+++} -\knitrow{+/+} -\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 \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} +\subsection{Spaces in the input} +\label{sec:spacein} 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|.) +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.) (Similarly, \verb?|? and \verb?#? are redefined inside knitting charts, so that \verb?|? produces a colored bar \textknit{\|} and \verb?#? produces a symbol \textknit{\#}. If your chart ends up inside a command, \verb?|? will produce a plain black bar and \verb?#? will produce an error; use \verb?\|? and \verb?\#? instead.) 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} +\begin{figure}[h] \caption{The effects of embedding charts in commands and environments} \par\bigskip\par \begin{minipage}[b]{2.5in} \begin{verbatim} -\newdimen\knitlinewd +\newdimen\knitlinewd \setlength{\knitlinewd}{4pt} \parbox{77pt}{ \chart{ @@ -779,7 +866,7 @@ AA\|% \end{minipage}% \hskip -108pt \begin{minipage}[b]{80pt} -\newdimen\knitlinewd +\newdimen\knitlinewd \setlength{\knitlinewd}{4pt} \parbox{80pt}{ \chart{ @@ -792,7 +879,7 @@ AA\|% \hskip 12pt \begin{minipage}[b]{2.5in} \begin{verbatim} -\newdimen\knitlinewd +\newdimen\knitlinewd \setlength{\knitlinewd}{4pt} \begin{center} \chart{ @@ -805,7 +892,7 @@ AA\|% \end{minipage}% \hskip -84pt \begin{minipage}[b]{55pt} -\newdimen\knitlinewd +\newdimen\knitlinewd \setlength{\knitlinewd}{4pt} \begin{center} \chart{ @@ -820,27 +907,23 @@ AA\|% \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} +\section{Ligatures and cables} +\label{sec:cables} \TeX\ has a built-in ligature mechanism that lets it get {?`fire--fly?} instead of {?{}`f{}ire-{}-f{}ly?} when you type \texttt{?{}`fire--fly?}. \textsf{knitting} uses this for wide horizontal sequences such as \textknit{???}. The ligature mechanism also lets you generate the reverse of \textknit{"}: \texttt{-"}, \texttt{="} and \texttt{""} produce \textknit{-"}, \textknit{="}, and \textknit{""}, respectively. However, the ligature mechanism really comes into its own when making cable symbols. +\subsection{Symbolic cables} \knitnogrid -In the non-grid font, cables look like this: \textknit{kkKK}. The keys \texttt{k},~\texttt{p}, \texttt{K}, and \texttt{P} produce raised or lowered knit and purl symbols, and the ligature mechanism adds in the underbars or slant connectors automatically. +In the fonts which represent ``knit 1'' by a vertical bar symbol (\verb|\knitnogrid|\slash\verb|\knitmixed|), cables look like this: \textknit{kkKK} or {\knitmixed\textknit{kkKK}}. The symbols are a stylized representation of what you must do to produce the cables. + +The keys \texttt{k},~\texttt{p}, \texttt{K}, and \texttt{P} produce raised or lowered knit and purl symbols, and the ligature mechanism adds in the underbars or slant connectors automatically. -So: +So: \begin{quote} \noindent\hfil\parbox{108pt}{ \tt kkKK\\ @@ -853,16 +936,48 @@ kpkpKPKP}} \end{quote} Some allowance for peculiar cables has been made. You can get a front increase or decrease with \texttt{N}~or \texttt{D}, or a back increase or decrease with \texttt{n}, \texttt{d}, \texttt{e}, or~\texttt{o}: -\texttt{nedoND} \textknit{nedoND}. All of the symbols present in the font can be used in cables with the help of \verb|\cableleft| and \verb|\cableright|: \verb|\cableleft{AOA}{=*=}| \textknit{\cableleft{AOA}{=*=}} +\texttt{nedoND} \textknit{nedoND}. -Explaining to \textsf{knitting} when one cable starts and another ends can be hard: \texttt{pKKKKp} probably means \textknit{pKK KKp}, but it could mean \textknit{pK KKKp} or \textknit{pKKK Kp}, and the ligature mechanism isn't smart enough to default to \textknit{pKK KKp}, let alone read your mind. So you have to tell it what you want. (Or you'll get \textknit{pKKKKp}, which is not what you want.) +All of the symbols present in the font can be used in cables with the help of \verb|\cableleft| and \verb|\cableright|: \verb|\cableleft{AOA}{=*=}| \textknit{\cableleft{AOA}{=*=}}. + +If you have a lot of cables involving the same obscure symbol, you may wish to use the commands \verb|\cableforeground| and \verb|\cablebackground| instead: + +\begin{center} +\begin{minipage}[b]{224pt} +\obeylines +\verb?\renewcommand\${\cableforeground{b}}? +\verb?\renewcommand\#{\cablebackground{b}}? +\verb?\chart{? +\verb? -\$\$\#\#-? +\verb? -\$\$kk- ? +\verb? \$\#--\#\$}? +\end{minipage} +\quad +\begin{minipage}[b]{108pt} + \renewcommand\${\cableforeground{b}} + \renewcommand\#{\cablebackground{b}} + \chart{ + -\$\$\#\#- + -\$\$kk- + \$\#--\#\$ + } +\end{minipage} +\end{center} + +Be aware that the implementation of \verb|\cablebackground| is such that only cable connectors are drawn in the main pass; the symbols are drawn during the purl pass, and so \verb|\cablebackground| interacts in unexpected ways with color effects and with \verb|\purlpass|. + +Explaining to \textsf{knitting} when one cable starts and another ends can be hard: \texttt{pKKKKp} probably means \textknit{pKK KKp}, but it could mean \textknit{pK KKKp} or \textknit{pKKK Kp}, and the ligature mechanism isn't smart enough to default to \textknit{pKK KKp}, let alone read your mind. So you have to tell it what you want. There are two ways to do this. You can put a space in: \texttt{ppKK KKpp}. You can also use the characters \texttt{c},~\texttt{g}, \texttt{C}, and~\texttt{G}: these behave just like \texttt{k},~\texttt{p}, \texttt{K}, and~\texttt{P}, except that they are only allowed to show up in the left part of a cable. -So: +Some limited debugging mechanisms are available. A sequence of background cables \texttt{kkp} which is not paired with a sequence of foreground stitches is not a cable; it is an orphaned half-cable. If for some reason you want an orphaned half-cable \textknit{\cableright{==}{}}, use \verb|\cableleft| or \verb|\cableright| with an empty argument. + +Orphaned half-cables produced by other methods (unaccompanied \texttt{pp}) are probably due to a typographical error which must be fixed. So they are made obvious. If you have an orphaned half-cable somewhere, the last square will be shaded: \texttt{ppKKKKpp} produces \textknit{ppKKKKpp} since the terminal \texttt{p}s are not part of a full cable. + +So: \begin{center} \begin{minipage}[b]{108pt} -\obeylines\parindent=0pt\tt +\obeylines\parindent=0pt\tt =DKp,,pKD DKp,,pKD= ===----====----=== ===KKkk====KKkk=== @@ -891,11 +1006,16 @@ So: \end{minipage} \end{center} +\subsection{Stylized cables} \knitgrid -In the grid fonts, cables look like this: \textknit{kkKK}. The letters \texttt{kpcgKPCG} work for simple cables as in the non-grid font. +In the fonts which represent ``knit 1'' by an empty box (\verb|\knitgrid|\slash\verb|\knitwide|), cables look like this: \textknit{kkKK}. The symbols are a stylized sketch of how the cables actually look. -Grid cables are fairly limited. You can cross 1, 2, or 3 stitches over 1, 2, or 3 stitches, going left or right. The letters \texttt{kpcgKPCG} will let you draw purl-over-purl, knit-over-purl, or knit-over-knit cables. +The letters \texttt{kpcgKPCG} work for simple cables as in the non-grid +font. These cables are fairly limited. You can cross 1, 2, or 3 stitches +over 1, 2, or 3 stitches, going left or right. The letters +\texttt{kpcgKPCG} will let you draw purl-over-purl, knit-over-purl, or +knit-over-knit cables. Twelve special cable symbols are also possible: \begin{center} @@ -906,12 +1026,12 @@ You get these by putting \texttt{p}s (not \texttt{g}s) between the \texttt{k}s a 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. -The keys \texttt{N},~\texttt{n}, \texttt{e}, \texttt{o}, \texttt{d} and~\texttt{D} have a different function here. +The keys \texttt{N},~\texttt{n}, \texttt{e}, \texttt{o}, \texttt{d} and~\texttt{D} have a different function here. -If a knit-over-knit cable ends with a \texttt{d} or \texttt{D} instead of \texttt{k} or \texttt{K}, the result will have a solid white background instead of a gray one. The letters \texttt{n}, \texttt{N}, \texttt{e} and \texttt{o} produce symbols that are hybrids of twist and cable symbols.\footnote{A \texttt{k}, \texttt{p}, \texttt{K}, pr \texttt{P} after a \texttt{n}, \texttt{e}, \texttt{o}, \texttt{d}, \texttt{N}, or \texttt{D} starts a new cable; you don't need to use \texttt{C}, \texttt{G}, \texttt{c}, \texttt{g} or spaces to separate them.} +If a knit-over-knit cable ends with a \texttt{d} or \texttt{D} instead of \texttt{k} or \texttt{K}, the result will have a solid white background instead of a gray one. The letters \texttt{n}, \texttt{N}, \texttt{e} and \texttt{o} produce symbols that are hybrids of twist and cable symbols.\footnote{A \texttt{k}, \texttt{p}, \texttt{K}, or \texttt{P} after a \texttt{n}, \texttt{e}, \texttt{o}, \texttt{d}, \texttt{N}, or \texttt{D} starts a new cable; you don't need to use \texttt{C}, \texttt{G}, \texttt{c}, \texttt{g} or spaces to separate them.} \begin{center} \begin{minipage}[b]{108pt} -\obeylines\parindent=0pt\tt +\obeylines\parindent=0pt\tt kkDD~kkNN~ppNN KKdd~KKnn~KKoo \end{minipage} @@ -925,6 +1045,8 @@ KKdd~KKnn~KKoo \end{center} \texttt{e} and \texttt{o} have the same effect. +Again, orphaned half-cables are indicated with diagonal hash marks \textknit{kk}. + 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 @@ -958,42 +1080,143 @@ ppKK} \bigskip -This is enough for most cable patterns. +This is enough for most cable patterns. + + +\section{Counting rows} +\label{sec:rowcount} + +This section describes how to get and modify the little red numbers shown here. + +\par\bigskip\par +\begin{minipage}[b]{3.2in} +\obeylines +\verb?\chart{? +\verb? \rnleft ======? +\verb? \rnleft ======\addtocounter{rownumber}{-1}? +\verb? \rnleft ======? +\verb? \addtocounter{rownumber}{-5}}? +\end{minipage}% +\hfill +\begin{minipage}[b]{1.33in} +\knitgrid +\chart{ +\rnleft====== +\rnleft======\addtocounter{rownumber}{-1} +\rnleft====== +\addtocounter{rownumber}{-5} +``\nonumber} +\end{minipage} +\par\bigskip\par +\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} +\knitgrid +\hskip\stitchwd\chart[right]{ +====== +====== \nonumber +====== +====== +\numberrow{6}{2}{2} +} +\end{minipage} + +\bigskip + +\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}. +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 +\verb|\addtocounter|\allowbreak\verb|{rownumber}{-3}| (\LaTeX) or \verb|\global| +\verb|\advance| \verb|\rownumber| \verb|by -3| (plain \TeX). + +\verb|\chart| will usually automatically arrange things so that the +last \verb|\rn| produces a~1. If you want numbers in different charts +to be numbered consecutively (e.g., if they are pieces of one big +chart), you can turn this behavior off with \verb|\resetrnfalse| and +back on with \verb|\resetrntrue|. You can then reset the row numbers +with \verb|\setcounter{rownumber}{20}|; all future charts will count +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 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|. 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. + +\item[$\star$] Inside an auto-numbered chart, \verb|\nonumber| skips the next row number. + +\item[$\star$] To number the stitches (by producing a \emph{row} of stitch numbers), you can use the command \verb|\numberrow|. It takes three arguments: the first number to be printed, the countdown (how often to print intermediate numbers), and the last number to be printed. + +\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. + +\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{sec:counting} for more details. + +\end{itemize} + +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} + +\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. \section{Counting stitches} -\label{se:counting} +\label{sec: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. +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 \emph{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 +\bigskip \noindent\begin{minipage}[t]{224pt} -\obeylines\parindent=0pt\tt -\verb?\chart{\countstitches{->-}}? +\obeylines\parindent=0pt\tt +\verb?\chart{\countstitches{->-} ->-}? \verb?stitchcountout: \thestitchcountout? \verb?stitchcountin: \thestitchcountin? \end{minipage} \quad \begin{minipage}[t]{108pt} \obeylines -\chart{\countstitches{->-}} +\chart{\countstitches{->-}{->-}} stitchcountout: \thestitchcountout stitchcountin: \thestitchcountin \end{minipage} -\bigskip +\bigskip This can be used to automatically label each row with its stitch count. -\bigskip +\bigskip \noindent\begin{minipage}[b]{350pt} -\obeylines\parindent=0pt\tt +\obeylines\parindent=0pt\tt \verb?\newcommand{\mystitchcount}[1]{\countstitches{#1}#1? \verb? \mainpass{{\color{rncolor}%? \verb? \textnormal{ (\thestitchcountout\ sts)}}}}? @@ -1013,7 +1236,7 @@ This can be used to automatically label each row with its stitch count. \mystitchcount{~-w-~}} \end{minipage} -\bigskip +\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.) @@ -1024,14 +1247,14 @@ By using the command \verb|\stitchcountwarningbar|, we can check to see that sti \bigskip \noindent\begin{minipage}[b]{\textwidth} -\obeylines\parindent=0pt\tt +\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 +\obeylines\parindent=0pt\tt \verb?\chart{? \verb? \setcounter{stitchcountin}{-100}? \verb? \mystitchcount{~-A-~}? @@ -1048,7 +1271,7 @@ By using the command \verb|\stitchcountwarningbar|, we can check to see that sti \mainpass{ (\thestitchcountout\ sts)\stitchcountwarningbar}}} \chart{ \setcounter{stitchcountin}{-100} - \mystitchcount{~-A-~} + \mystitchcount{~-\>3-~} \mystitchcount{-----} \mystitchcount{-->--} \mystitchcount{-----} @@ -1065,49 +1288,141 @@ All of this gives you a lot of control over the stitch-counting mechanism in you \bigskip -\noindent\begin{minipage}[b]{350pt} -\obeylines\parindent=0pt\tt +\noindent\begin{minipage}[b]{300pt} +\obeylines\parindent=0pt\tt \verb?\rnoddonly? \verb?\stitchcountchart[right]{? -\verb? -----? -\verb? ---\adjuststitchcount{2}? -\verb? ---"\adjuststitchcount{2}? -\verb? -----? +\verb? -O-----O-? +\verb? ~-O---O-? +\verb? ~~-O-O-? +\verb? ~~~---? \verb? }? \end{minipage} \hskip -108pt -\begin{minipage}[b]{108pt} +\begin{minipage}[b]{158pt} \rnoddonly \stitchcountchart[right]{ - ----- - ---\adjuststitchcount{2} - ---"\adjuststitchcount{2} - ----- - } + -O-----O- + ~-O---O- + ~~-O-O- + ~~~--- + } \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 +You can customize this with the optional argument (which places row numbers as usual), the command \texttt{\char`\\ knitdebug} (which shows the stitch counts both before and after knitting the row), 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} +\texttt{\char`\\ knitdebug} redefines \texttt{\char`\\ printleftstitchcount} to +\begin{quote} +\verb?\renewcommand \printleftstitchcount{{\color{rncolor}%?\\ +\verb? \textnormal{(\thestitchcountout\ out, ?\\ +\verb? \thestitchcountin\ in) }}}?\\ +\end{quote} + +\bigskip + +\noindent\begin{minipage}[b]{250pt} +\obeylines\parindent=0pt\tt +\verb?\rnoddonly? +\verb?\knitdebug? +\verb?\stitchcountchart[right]{? +\verb? -O-----O-? +\verb? ~-O---O-? +\verb? ~~-O-O-? +\verb? ~~~---? +\verb? }? +\end{minipage} +\hskip -108pt +\begin{minipage}[b]{208pt} +\rnoddonly +\knitdebug +\stitchcountchart[right]{ + -O-----O- + ~-O---O- + ~~-O-O- + ~~~--- + } +\par\strut +\end{minipage} +\bigskip + + + +The commands \verb|\narrowincrease| and so on, when used with the stitch-counting mechanism, do require that their arguments be numbers: if your chart involves the symbol \textknit{\narrowincrease{Z}}, that symbol cannot be counted. -\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. +The commands \verb|\Knit|, \verb|\Purl|, \verb|\knitbox| and \verb|\purlbox| by default are assumed to be as many stitches wide as they take up stitches on the chart: so \verb|\knitbox{A}{2}| is assumed to be two stitches wide. -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: +This means that \verb|\Knit{4}{3}| is assumed to be three, not four, stitches wide. You can change this behavior by redefining the commands \verb|\Knitstitchcount|, \texttt{\char`\\Purl\-stitch\-count}, \verb|\knitboxstitchcount|, \verb|\purlboxstitchcount|: +\begin{quote} +\verb|\renewcommand{\Knitstitchcount}[2]{#1}| +\end{quote} +Redefining \verb|\Knitstitchcount| does mean that you must give \verb|\Knit| a number as its first argument. + +Similarly, \verb|\widesymbol| normally is assumed to be as many stitches as its contents: \textknit{\widesymbol{w}{3}} represents one in-stitch and three out-stitches, just like \textknit{w}. If you prefer for \textknit{\widesymbol{*}{3}} to represent three stitches, redefine \verb|widesymbolspacer|: +\begin{quote} +\verb|\renewcommand{\widesymbolspacer}[2]{\hskip #2\stitchwd}| +\end{quote} +The arguments of \verb|\widesymbolspacer| are the two arguments of \verb|\widesymbol|; the default value is just \begin{quote} -\verb?\newcommand{\myknit}[2]{\Knit{Knit #1}{#2}%?\\ -\verb? \adjuststitchcount{-#2}\adjuststitchcount{#1}}? +\verb|\newcommand{\widesymbolspacer}[2]{#1}|. \end{quote} +There is a way to deal with a series of short rows: put the rows inside the command \verb|\shortrows|, or use the command \verb|\nostitchcount| to omit a stitch count. + +\bigskip + +\noindent\begin{minipage}[b]{300pt} +\obeylines\parindent=0pt\tt +\verb?\rnevenonly? +\verb?\stitchcountchart[right]{? +\verb? \nostitchcount-------? +\verb? -------? +\verb? -------? +\verb? \shortrows{~~~~---? +\verb? ~~~"---}? +\verb? -------? +\verb? \shortrows{-----? +\verb? ~~---"? +\verb? ~"-----}? +\verb? -------? +\verb? }? +\end{minipage} +\hskip -108pt +\begin{minipage}[b]{158pt} +\rnevenonly +\stitchcountchart[right]{ + \nostitchcount------- + ------- + ------- + \shortrows{ + ~~~~--- + ~~~"---} + ------- + \shortrows{ + ----- + ~~---" + ~"-----} + ------- + } +\par\strut +\end{minipage} +\bigskip + + + + +\addtocontents{toc}{\SkipTocEntry}\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. + 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} +\addtocontents{toc}{\SkipTocEntry}\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|). @@ -1119,17 +1434,48 @@ I've added the starred forms of \verb|\overline| and \verb|\underline| and the o 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}. +\addtocontents{toc}{\SkipTocEntry}\subsection*{\today} + +The fonts \verb|knitw_sc_in| and \verb|knitw_sc_out| have been removed, because I realized that \verb|knitg_sc_in| and \verb|knitg_sc_out| could be used instead. + +The commands \verb?\|? and \verb?\!? now work with \verb|\textknit|. + +The following have been added: + +\begin{itemize} +\item The characters \textknit{0}, \textknit{\&} and \textknit{\#}. + +\item The commands +\\ +\verb|\Knitstitchcount|, \verb|\Purlstitchcount|, \\\verb|\knitboxstitchcount|, \verb|\purlboxstitchcount|; +\\ +\verb|\cableforeground|, \verb|\cablebackground|; +\\\verb|\widesymbol|. + +\item The \verb|\knitmixed| fonts. + +\item Support for counting stitches in short rows. + +\item Hash marks to show errors in cables. + +\item Some tweaks to the appearance of cables in the grid font. +\end{itemize} + \section{List of files that are considered part of this package} -\label{se:manifest} +\label{sec:manifest} This package should have come with all the following files, organized into the directories listed. \medskip \begingroup \ttfamily +\noindent README + \noindent knitting/docs \begin{itemize} + \item knitexamples.pdf \item knitexamples.tex + \item knitkey.pdf \item knitkey.tex \item knitting-doc.pdf \item knitting-doc.tex @@ -1137,22 +1483,25 @@ This package should have come with all the following files, organized into the d \noindent knitting/fonts/afm \begin{itemize} - \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 + \item knitg_sc_in.afm + \item knitg_sc_out.afm + \item knitgg.afm + \item knitgn.afm + \item knitgp.afm + \item knitmg.afm + \item knitml.afm + \item knitmn.afm + \item knitmp.afm + \item knitmr.afm + \item knitn_sc_in.afm + \item knitn_sc_out.afm + \item knitnl.afm + \item knitnn.afm + \item knitnp.afm + \item knitnr.afm + \item knitwg.afm + \item knitwn.afm + \item knitwp.afm \end{itemize} \noindent knitting/fonts/map @@ -1162,66 +1511,74 @@ This package should have come with all the following files, organized into the d \noindent knitting/fonts/source \begin{itemize} - \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 + \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 knitmg.mf + \item knitml.mf + \item knitmn.mf + \item knitmp.mf + \item knitmr.mf + \item knitn_sc_in.mf + \item knitn_sc_out.mf + \item knitnl.mf + \item knitnn.mf + \item knitnp.mf + \item knitnr.mf + \item knitwg.mf + \item knitwn.mf + \item knitwp.mf \end{itemize} \noindent knitting/fonts/tfm \begin{itemize} - \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 + \item knitg_sc_in.tfm + \item knitg_sc_out.tfm + \item knitgg.tfm + \item knitgn.tfm + \item knitgp.tfm + \item knitmg.tfm + \item knitml.tfm + \item knitmn.tfm + \item knitmp.tfm + \item knitmr.tfm + \item knitn_sc_in.tfm + \item knitn_sc_out.tfm + \item knitnl.tfm + \item knitnn.tfm + \item knitnp.tfm + \item knitnr.tfm + \item knitwg.tfm + \item knitwn.tfm + \item knitwp.tfm \end{itemize} \noindent knitting/fonts/type1 \begin{itemize} - \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 + \item knitg_sc_in.pfb + \item knitg_sc_out.pfb + \item knitgg.pfb + \item knitgn.pfb + \item knitgp.pfb + \item knitmg.pfb + \item knitml.pfb + \item knitmn.pfb + \item knitmp.pfb + \item knitmr.pfb + \item knitn_sc_in.pfb + \item knitn_sc_out.pfb + \item knitnl.pfb + \item knitnn.pfb + \item knitnp.pfb + \item knitnr.pfb + \item knitwg.pfb + \item knitwn.pfb + \item knitwp.pfb \end{itemize} \noindent knitting/tex/latex 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 index d9aef3790c2..6792bb2ce9a 100644 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_in.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20070915 -Comment Creation Date: Sun Aug 29 08:39:02 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:04:32 2019 FontName KnittingSymbols-grid-incount-Medium FullName KnittingSymbols-grid-incount FamilyName KnittingSymbols-grid-incount @@ -12,248 +12,250 @@ 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 ; +FontBBox -550 -198 1235 842 +CapHeight 622 +XHeight 842 +Ascender 622 +StartCharMetrics 240 +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 0 0 0 ; +C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; +C 4 ; WX 1204 ; N dieresis ; B 0 0 0 0 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; 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 17 ; WX 1204 ; N quotedblright ; B 0 0 0 0 ; +C 18 ; WX 1204 ; N quotedblbase ; B 0 0 0 0 ; 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 20 ; WX 1204 ; N guillemotright ; B 0 0 0 0 ; +C 21 ; WX 0 ; N endash ; B 0 0 0 0 ; +C 22 ; WX 602 ; N emdash ; B 0 252 600 392 ; +C 23 ; WX 1204 ; N compwordmark ; B 0 0 0 0 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 0 0 0 ; +C 25 ; WX 602 ; N dotlessi ; B 190 252 600 842 ; +C 26 ; WX 602 ; N dotlessj ; B 0 252 411 842 ; +C 27 ; WX 602 ; N ff ; B 190 -198 600 392 ; +C 28 ; WX 602 ; N fi ; B 0 -198 411 392 ; +C 29 ; WX 1204 ; N fl ; B 0 -198 1200 392 ; +C 30 ; WX 1204 ; N ffi ; B 0 252 1200 842 ; +C 31 ; WX 6022 ; N ffl ; B 0 0 0 0 ; +C 33 ; WX 2409 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ; +C 35 ; WX 1204 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1204 ; N ampersand ; B 0 0 0 0 ; 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 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; +C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; +C 42 ; WX 1204 ; N asterisk ; B 0 0 0 0 ; +C 43 ; WX 1204 ; N plus ; B 0 0 0 0 ; +C 44 ; WX 0 ; N comma ; B 0 0 0 0 ; +C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 46 ; WX 0 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 1204 ; N zero ; B 0 0 0 0 ; +C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; +C 50 ; WX 2409 ; N two ; B 0 0 0 0 ; +C 51 ; WX 3613 ; N three ; B 0 0 0 0 ; +C 52 ; WX 2409 ; N four ; B 0 0 0 0 ; +C 53 ; WX 2409 ; 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 2409 ; N colon ; B 0 0 0 0 ; +C 59 ; WX 2409 ; N semicolon ; B 0 0 0 0 ; +C 60 ; WX 2409 ; N less ; B 0 0 0 0 ; +C 61 ; WX 1204 ; N equal ; B 0 0 0 0 ; +C 62 ; WX 2409 ; N greater ; B 0 0 0 0 ; +C 63 ; WX 1204 ; N question ; B 0 0 0 0 ; +C 64 ; WX 1204 ; N at ; B 0 0 0 0 ; +C 65 ; WX 3613 ; N A ; B 0 0 0 0 ; +C 66 ; WX 1204 ; N B ; B 0 0 0 0 ; +C 67 ; WX 1204 ; N C ; B 0 0 0 0 ; +C 68 ; WX 1204 ; N D ; B 0 0 0 0 ; +C 69 ; WX 1204 ; N E ; B 0 0 0 0 ; +C 70 ; WX 1204 ; N F ; B -35 287 1235 622 ; +C 71 ; WX 1204 ; N G ; B 0 0 0 0 ; +C 72 ; WX 0 ; N H ; B 0 0 0 0 ; +C 73 ; WX 0 ; N I ; B 0 0 0 0 ; +C 74 ; WX 0 ; N J ; B 0 0 0 0 ; +C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; +C 76 ; WX 3613 ; N L ; B 0 0 0 0 ; +C 77 ; WX 0 ; N M ; B 0 0 0 0 ; +C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; +C 79 ; WX 0 ; N O ; B 0 0 0 0 ; +C 80 ; WX 1204 ; N P ; B 0 0 0 0 ; +C 81 ; WX 1204 ; N Q ; B 0 0 0 0 ; +C 82 ; WX 3613 ; N R ; B 0 0 0 0 ; +C 83 ; WX 1204 ; N S ; B 0 0 0 0 ; +C 84 ; WX 0 ; N T ; B 0 0 0 0 ; 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 86 ; WX 1204 ; N V ; B 0 0 0 0 ; +C 87 ; WX 1204 ; N W ; B 0 0 0 0 ; +C 88 ; WX 0 ; N X ; B 0 0 0 0 ; +C 89 ; WX 1204 ; N Y ; B 0 0 0 0 ; +C 90 ; WX 1204 ; N Z ; B 0 0 0 0 ; +C 91 ; WX 1204 ; N bracketleft ; B 0 0 0 0 ; +C 93 ; WX 1204 ; N bracketright ; B 0 0 0 0 ; 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 97 ; WX 3613 ; N a ; B 0 0 0 0 ; +C 98 ; WX 1204 ; N b ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; +C 100 ; WX 1204 ; N d ; B 0 0 0 0 ; +C 101 ; WX 1204 ; N e ; B 0 0 0 0 ; +C 102 ; WX 1204 ; N f ; B -35 287 1235 622 ; +C 103 ; WX 1204 ; N g ; B 0 0 0 0 ; +C 104 ; WX 1204 ; N h ; B 0 0 0 0 ; +C 105 ; WX 0 ; N i ; B 0 0 0 0 ; +C 106 ; WX 0 ; N j ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 108 ; WX 3613 ; N l ; B 0 0 0 0 ; +C 109 ; WX 0 ; N m ; B 0 0 0 0 ; +C 110 ; WX 1204 ; N n ; B 0 0 0 0 ; +C 111 ; WX 1204 ; N o ; B 0 0 0 0 ; +C 112 ; WX 1204 ; N p ; B 0 0 0 0 ; +C 113 ; WX 1204 ; N q ; B 0 0 0 0 ; +C 114 ; WX 3613 ; N r ; B 0 0 0 0 ; +C 115 ; WX 1204 ; N s ; B 0 0 0 0 ; +C 116 ; WX 0 ; N t ; B 0 0 0 0 ; +C 117 ; WX 1204 ; N u ; B 0 0 0 0 ; +C 118 ; WX 1204 ; N v ; B 0 0 0 0 ; +C 119 ; WX 1204 ; N w ; B 0 0 0 0 ; +C 120 ; WX 0 ; 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 0 ; N bar ; B 0 0 0 0 ; -C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ; +C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ; 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 ; +C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 128 ; WX 2409 ; N Abreve ; B 0 0 0 0 ; +C 129 ; WX 2409 ; N Aogonek ; B 0 0 0 0 ; +C 130 ; WX 2409 ; N Cacute ; B 0 0 0 0 ; +C 131 ; WX 2409 ; N Ccaron ; B 0 0 0 0 ; +C 132 ; WX 3613 ; N Dcaron ; B 0 0 0 0 ; +C 133 ; WX 3613 ; N Ecaron ; B 0 0 0 0 ; +C 134 ; WX 3613 ; N Eogonek ; B 0 0 0 0 ; +C 135 ; WX 3613 ; N Gbreve ; B 0 0 0 0 ; +C 136 ; WX 2409 ; N Lacute ; B 0 0 0 0 ; +C 137 ; WX 2409 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 2409 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 2409 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 2409 ; N Ncaron ; B 0 0 0 0 ; +C 141 ; WX 2409 ; N Eng ; B 0 0 0 0 ; +C 142 ; WX 2409 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 2409 ; N Racute ; B 0 0 0 0 ; +C 144 ; WX 2409 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 2409 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 2409 ; N Scaron ; B 0 0 0 0 ; +C 147 ; WX 2409 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 3613 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 3613 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 3613 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 3613 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 3613 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 3613 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 3613 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 3613 ; N Zdot ; B 0 0 0 0 ; +C 156 ; WX 3613 ; N IJ ; B 0 0 0 0 ; +C 157 ; WX 3613 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 3613 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 3613 ; N section ; B 0 0 0 0 ; +C 160 ; WX 3613 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 3613 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 3613 ; N cacute ; B 0 0 0 0 ; +C 163 ; WX 3613 ; N ccaron ; B 0 0 0 0 ; +C 164 ; WX 4818 ; N dcaron ; B 0 0 0 0 ; +C 165 ; WX 4818 ; N ecaron ; B 0 0 0 0 ; +C 166 ; WX 4818 ; N eogonek ; B 0 0 0 0 ; +C 167 ; WX 4818 ; N gbreve ; B 0 0 0 0 ; +C 168 ; WX 4818 ; N lacute ; B 0 0 0 0 ; +C 169 ; WX 4818 ; N lcaron ; B 0 0 0 0 ; +C 170 ; WX 4818 ; N lslash ; B 0 0 0 0 ; +C 171 ; WX 4818 ; N nacute ; B 0 0 0 0 ; +C 172 ; WX 4818 ; N ncaron ; B 0 0 0 0 ; +C 173 ; WX 4818 ; N eng ; B 0 0 0 0 ; +C 174 ; WX 4818 ; N odblacute ; B 0 0 0 0 ; +C 175 ; WX 4818 ; N racute ; B 0 0 0 0 ; +C 176 ; WX 3613 ; N rcaron ; B 0 0 0 0 ; +C 177 ; WX 3613 ; N sacute ; B 0 0 0 0 ; +C 178 ; WX 3613 ; N scaron ; B 0 0 0 0 ; +C 179 ; WX 3613 ; N scedilla ; B 0 0 0 0 ; +C 180 ; WX 3613 ; N tcaron ; B 0 0 0 0 ; +C 181 ; WX 3613 ; N tcedilla ; B 0 0 0 0 ; +C 182 ; WX 3613 ; N udblacute ; B 0 0 0 0 ; +C 183 ; WX 3613 ; N uring ; B 0 0 0 0 ; +C 184 ; WX 3613 ; N ydieresis ; B 0 0 0 0 ; +C 185 ; WX 3613 ; N zacute ; B 0 0 0 0 ; +C 186 ; WX 3613 ; N zcaron ; B 0 0 0 0 ; +C 187 ; WX 3613 ; N zdot ; B 0 0 0 0 ; +C 188 ; WX 4818 ; N ij ; B 0 0 0 0 ; +C 189 ; WX 4818 ; N exclamdown ; B 0 0 0 0 ; +C 190 ; WX 4818 ; N questiondown ; B 0 0 0 0 ; +C 191 ; WX 4818 ; N sterling ; B 0 0 0 0 ; +C 192 ; WX 4818 ; N Agrave ; B 0 0 0 0 ; +C 193 ; WX 4818 ; N Aacute ; B 0 0 0 0 ; +C 194 ; WX 4818 ; N Acircumflex ; B 0 0 0 0 ; +C 195 ; WX 4818 ; N Atilde ; B 0 0 0 0 ; +C 196 ; WX 4818 ; N Adieresis ; B 0 0 0 0 ; +C 197 ; WX 4818 ; N Aring ; B 0 0 0 0 ; +C 198 ; WX 4818 ; N AE ; B 0 0 0 0 ; +C 199 ; WX 4818 ; N Ccedilla ; B 0 0 0 0 ; +C 200 ; WX 6022 ; N Egrave ; B 0 0 0 0 ; +C 201 ; WX 6022 ; N Eacute ; B 0 0 0 0 ; +C 202 ; WX 6022 ; N Ecircumflex ; B 0 0 0 0 ; +C 203 ; WX 6022 ; N Edieresis ; B 0 0 0 0 ; +C 204 ; WX 7227 ; N Igrave ; B 0 0 0 0 ; +C 205 ; WX 7227 ; N Iacute ; B 0 0 0 0 ; +C 206 ; WX 7227 ; N Icircumflex ; B 0 0 0 0 ; +C 207 ; WX 7227 ; N Idieresis ; B 0 0 0 0 ; +C 208 ; WX 6022 ; N Eth ; B 0 0 0 0 ; +C 209 ; WX 6022 ; N Ntilde ; B 0 0 0 0 ; +C 210 ; WX 6022 ; N Ograve ; B 0 0 0 0 ; +C 211 ; WX 6022 ; N Oacute ; B 0 0 0 0 ; +C 212 ; WX 6022 ; N Ocircumflex ; B 0 0 0 0 ; +C 213 ; WX 6022 ; N Otilde ; B 0 0 0 0 ; +C 214 ; WX 6022 ; N Odieresis ; B 0 0 0 0 ; +C 215 ; WX 6022 ; N OE ; B 0 0 0 0 ; +C 216 ; WX 6022 ; N Oslash ; B 0 0 0 0 ; +C 217 ; WX 6022 ; N Ugrave ; B 0 0 0 0 ; +C 218 ; WX 6022 ; N Uacute ; B 0 0 0 0 ; +C 219 ; WX 6022 ; N Ucircumflex ; B 0 0 0 0 ; +C 220 ; WX 4818 ; N Udieresis ; B 0 0 0 0 ; +C 221 ; WX 4818 ; N Yacute ; B 0 0 0 0 ; +C 222 ; WX 4818 ; N Thorn ; B 0 0 0 0 ; +C 223 ; WX 4818 ; N Germandbls ; B 0 0 0 0 ; +C 224 ; WX 4818 ; N agrave ; B 0 0 0 0 ; +C 225 ; WX 4818 ; N aacute ; B 0 0 0 0 ; +C 226 ; WX 4818 ; N acircumflex ; B 0 0 0 0 ; +C 227 ; WX 4818 ; N atilde ; B 0 0 0 0 ; +C 228 ; WX 4818 ; N adieresis ; B 0 0 0 0 ; +C 229 ; WX 4818 ; N aring ; B 0 0 0 0 ; +C 230 ; WX 4818 ; N ae ; B 0 0 0 0 ; +C 231 ; WX 4818 ; N ccedilla ; B 0 0 0 0 ; +C 232 ; WX 6022 ; N egrave ; B 0 0 0 0 ; +C 233 ; WX 6022 ; N eacute ; B 0 0 0 0 ; +C 234 ; WX 6022 ; N ecircumflex ; B 0 0 0 0 ; +C 235 ; WX 6022 ; N edieresis ; B 0 0 0 0 ; +C 236 ; WX 6022 ; N igrave ; B 0 0 0 0 ; +C 237 ; WX 6022 ; N iacute ; B 0 0 0 0 ; +C 238 ; WX 6022 ; N icircumflex ; B 0 0 0 0 ; +C 239 ; WX 6022 ; N idieresis ; B 0 0 0 0 ; +C 240 ; WX 6022 ; N eth ; B 0 0 0 0 ; +C 241 ; WX 6022 ; N ntilde ; B 0 0 0 0 ; +C 242 ; WX 6022 ; N ograve ; B 0 0 0 0 ; +C 243 ; WX 6022 ; N oacute ; B 0 0 0 0 ; +C 244 ; WX 7227 ; N ocircumflex ; B 0 0 0 0 ; +C 245 ; WX 7227 ; N otilde ; B 0 0 0 0 ; +C 246 ; WX 7227 ; N odieresis ; B 0 0 0 0 ; +C 247 ; WX 7227 ; N oe ; B 0 0 0 0 ; +C 248 ; WX 7227 ; N oslash ; B 0 0 0 0 ; +C 249 ; WX 7227 ; N ugrave ; B 0 0 0 0 ; +C 250 ; WX 7227 ; N uacute ; B 0 0 0 0 ; +C 251 ; WX 7227 ; N ucircumflex ; B 0 0 0 0 ; +C 252 ; WX 7227 ; N udieresis ; B 0 0 0 0 ; +C 253 ; WX 7227 ; N yacute ; B 0 0 0 0 ; +C 254 ; WX 7227 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 7227 ; N germandbls ; B 0 0 0 0 ; 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 index 71927804b35..bbbc15307dd 100644 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitg_sc_out.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20070915 -Comment Creation Date: Sun Aug 29 08:39:06 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:04:35 2019 FontName KnittingSymbols-grid-outcount-Medium FullName KnittingSymbols-grid-outcount FamilyName KnittingSymbols-grid-outcount @@ -12,248 +12,250 @@ 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 ; +FontBBox -635 -198 1235 842 +CapHeight 622 +XHeight 842 +Ascender 622 +StartCharMetrics 240 +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 0 0 0 ; +C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; +C 4 ; WX 1204 ; N dieresis ; B 0 0 0 0 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; 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 17 ; WX 1204 ; N quotedblright ; B 0 0 0 0 ; +C 18 ; WX 0 ; N quotedblbase ; B 0 0 0 0 ; 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 20 ; WX 1204 ; N guillemotright ; B 0 0 0 0 ; +C 21 ; WX 0 ; N endash ; B 0 0 0 0 ; +C 22 ; WX 602 ; N emdash ; B 0 252 600 392 ; +C 23 ; WX 1204 ; N compwordmark ; B 0 0 0 0 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 0 0 0 ; +C 25 ; WX 602 ; N dotlessi ; B 190 252 600 842 ; +C 26 ; WX 602 ; N dotlessj ; B 0 252 411 842 ; +C 27 ; WX 602 ; N ff ; B 190 -198 600 392 ; +C 28 ; WX 602 ; N fi ; B 0 -198 411 392 ; +C 29 ; WX 1204 ; N fl ; B 0 -198 1200 392 ; +C 30 ; WX 1204 ; N ffi ; B 0 252 1200 842 ; +C 31 ; WX 1204 ; N ffl ; B 0 0 0 0 ; +C 33 ; WX 1204 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ; +C 35 ; WX 2409 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 3613 ; N ampersand ; B 0 0 0 0 ; 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 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; +C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; +C 42 ; WX 1204 ; N asterisk ; B 0 0 0 0 ; +C 43 ; WX 1204 ; N plus ; B 0 0 0 0 ; +C 44 ; WX 0 ; N comma ; B 0 0 0 0 ; +C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 46 ; WX 0 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 2409 ; N zero ; B 0 0 0 0 ; +C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; +C 50 ; WX 1204 ; N two ; B 0 0 0 0 ; +C 51 ; WX 1204 ; N three ; B 0 0 0 0 ; +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 2409 ; N seven ; B 0 0 0 0 ; +C 56 ; WX 2409 ; N eight ; B 0 0 0 0 ; +C 57 ; WX 2409 ; N nine ; B 0 0 0 0 ; +C 58 ; WX 1204 ; N colon ; B 0 0 0 0 ; +C 59 ; WX 1204 ; N semicolon ; B 0 0 0 0 ; +C 60 ; WX 1204 ; N less ; B 0 0 0 0 ; +C 61 ; WX 1204 ; N equal ; B 0 0 0 0 ; +C 62 ; WX 1204 ; N greater ; B 0 0 0 0 ; +C 63 ; WX 1204 ; N question ; B 0 0 0 0 ; +C 64 ; WX 1204 ; N at ; B 0 0 0 0 ; +C 65 ; WX 1204 ; N A ; B 0 0 0 0 ; +C 66 ; WX 1204 ; N B ; B 0 0 0 0 ; +C 67 ; WX 1204 ; N C ; B 0 0 0 0 ; +C 68 ; WX 1204 ; N D ; B 0 0 0 0 ; +C 69 ; WX 3613 ; N E ; B 0 0 0 0 ; 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 71 ; WX 1204 ; N G ; B 0 0 0 0 ; +C 72 ; WX 1204 ; N H ; B 0 0 0 0 ; +C 73 ; WX 1204 ; N I ; B 0 0 0 0 ; +C 74 ; WX 1204 ; N J ; B 0 0 0 0 ; +C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; +C 76 ; WX 1204 ; N L ; B 0 0 0 0 ; +C 77 ; WX 1204 ; N M ; B 0 0 0 0 ; +C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; +C 79 ; WX 1204 ; N O ; B 0 0 0 0 ; +C 80 ; WX 1204 ; N P ; B 0 0 0 0 ; +C 81 ; WX 1204 ; N Q ; B 0 0 0 0 ; +C 82 ; WX 1204 ; N R ; B 0 0 0 0 ; +C 83 ; WX 1204 ; N S ; B 0 0 0 0 ; +C 84 ; WX 1204 ; N T ; B 0 0 0 0 ; +C 85 ; WX 1204 ; N U ; B -35 22 1235 622 ; +C 86 ; WX 2409 ; N V ; B 0 0 0 0 ; +C 87 ; WX 3613 ; N W ; B 0 0 0 0 ; +C 88 ; WX 1204 ; N X ; B 0 0 0 0 ; +C 89 ; WX 3613 ; N Y ; B 0 0 0 0 ; +C 90 ; WX 3613 ; N Z ; B 0 0 0 0 ; +C 91 ; WX 1204 ; N bracketleft ; B 0 0 0 0 ; +C 93 ; WX 1204 ; N bracketright ; B 0 0 0 0 ; 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 97 ; WX 1204 ; N a ; B 0 0 0 0 ; +C 98 ; WX 1204 ; N b ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; +C 100 ; WX 1204 ; N d ; B 0 0 0 0 ; +C 101 ; WX 1204 ; N e ; B 0 0 0 0 ; 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 103 ; WX 1204 ; N g ; B 0 0 0 0 ; +C 104 ; WX 0 ; N h ; B 0 0 0 0 ; +C 105 ; WX 1204 ; N i ; B 0 0 0 0 ; +C 106 ; WX 1204 ; N j ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 108 ; WX 1204 ; N l ; B 0 0 0 0 ; +C 109 ; WX 1204 ; N m ; B 0 0 0 0 ; +C 110 ; WX 1204 ; N n ; B 0 0 0 0 ; +C 111 ; WX 1204 ; N o ; B 0 0 0 0 ; +C 112 ; WX 1204 ; N p ; B 0 0 0 0 ; +C 113 ; WX 1204 ; N q ; B 0 0 0 0 ; +C 114 ; WX 1204 ; N r ; B 0 0 0 0 ; +C 115 ; WX 1204 ; N s ; B 0 0 0 0 ; +C 116 ; WX 1204 ; N t ; B 0 0 0 0 ; +C 117 ; WX 2409 ; N u ; B 0 0 0 0 ; +C 118 ; WX 2409 ; N v ; B 0 0 0 0 ; +C 119 ; WX 3613 ; N w ; B 0 0 0 0 ; +C 120 ; WX 1204 ; N x ; B 0 0 0 0 ; +C 121 ; WX 2409 ; N y ; B 0 0 0 0 ; +C 122 ; WX 2409 ; N z ; B 0 0 0 0 ; +C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ; C 124 ; WX 0 ; N bar ; B 0 0 0 0 ; -C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ; +C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ; 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 ; +C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 128 ; WX 2409 ; N Abreve ; B 0 0 0 0 ; +C 129 ; WX 2409 ; N Aogonek ; B 0 0 0 0 ; +C 130 ; WX 2409 ; N Cacute ; B 0 0 0 0 ; +C 131 ; WX 2409 ; N Ccaron ; B 0 0 0 0 ; +C 132 ; WX 3613 ; N Dcaron ; B 0 0 0 0 ; +C 133 ; WX 3613 ; N Ecaron ; B 0 0 0 0 ; +C 134 ; WX 3613 ; N Eogonek ; B 0 0 0 0 ; +C 135 ; WX 3613 ; N Gbreve ; B 0 0 0 0 ; +C 136 ; WX 2409 ; N Lacute ; B 0 0 0 0 ; +C 137 ; WX 2409 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 2409 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 2409 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 2409 ; N Ncaron ; B 0 0 0 0 ; +C 141 ; WX 2409 ; N Eng ; B 0 0 0 0 ; +C 142 ; WX 2409 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 2409 ; N Racute ; B 0 0 0 0 ; +C 144 ; WX 2409 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 2409 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 2409 ; N Scaron ; B 0 0 0 0 ; +C 147 ; WX 2409 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 3613 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 3613 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 3613 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 3613 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 3613 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 3613 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 3613 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 3613 ; N Zdot ; B 0 0 0 0 ; +C 156 ; WX 3613 ; N IJ ; B 0 0 0 0 ; +C 157 ; WX 3613 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 3613 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 3613 ; N section ; B 0 0 0 0 ; +C 160 ; WX 3613 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 3613 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 3613 ; N cacute ; B 0 0 0 0 ; +C 163 ; WX 3613 ; N ccaron ; B 0 0 0 0 ; +C 164 ; WX 4818 ; N dcaron ; B 0 0 0 0 ; +C 165 ; WX 4818 ; N ecaron ; B 0 0 0 0 ; +C 166 ; WX 4818 ; N eogonek ; B 0 0 0 0 ; +C 167 ; WX 4818 ; N gbreve ; B 0 0 0 0 ; +C 168 ; WX 4818 ; N lacute ; B 0 0 0 0 ; +C 169 ; WX 4818 ; N lcaron ; B 0 0 0 0 ; +C 170 ; WX 4818 ; N lslash ; B 0 0 0 0 ; +C 171 ; WX 4818 ; N nacute ; B 0 0 0 0 ; +C 172 ; WX 4818 ; N ncaron ; B 0 0 0 0 ; +C 173 ; WX 4818 ; N eng ; B 0 0 0 0 ; +C 174 ; WX 4818 ; N odblacute ; B 0 0 0 0 ; +C 175 ; WX 4818 ; N racute ; B 0 0 0 0 ; +C 176 ; WX 3613 ; N rcaron ; B 0 0 0 0 ; +C 177 ; WX 3613 ; N sacute ; B 0 0 0 0 ; +C 178 ; WX 3613 ; N scaron ; B 0 0 0 0 ; +C 179 ; WX 3613 ; N scedilla ; B 0 0 0 0 ; +C 180 ; WX 3613 ; N tcaron ; B 0 0 0 0 ; +C 181 ; WX 3613 ; N tcedilla ; B 0 0 0 0 ; +C 182 ; WX 3613 ; N udblacute ; B 0 0 0 0 ; +C 183 ; WX 3613 ; N uring ; B 0 0 0 0 ; +C 184 ; WX 3613 ; N ydieresis ; B 0 0 0 0 ; +C 185 ; WX 3613 ; N zacute ; B 0 0 0 0 ; +C 186 ; WX 3613 ; N zcaron ; B 0 0 0 0 ; +C 187 ; WX 3613 ; N zdot ; B 0 0 0 0 ; +C 188 ; WX 4818 ; N ij ; B 0 0 0 0 ; +C 189 ; WX 4818 ; N exclamdown ; B 0 0 0 0 ; +C 190 ; WX 4818 ; N questiondown ; B 0 0 0 0 ; +C 191 ; WX 4818 ; N sterling ; B 0 0 0 0 ; +C 192 ; WX 4818 ; N Agrave ; B 0 0 0 0 ; +C 193 ; WX 4818 ; N Aacute ; B 0 0 0 0 ; +C 194 ; WX 4818 ; N Acircumflex ; B 0 0 0 0 ; +C 195 ; WX 4818 ; N Atilde ; B 0 0 0 0 ; +C 196 ; WX 4818 ; N Adieresis ; B 0 0 0 0 ; +C 197 ; WX 4818 ; N Aring ; B 0 0 0 0 ; +C 198 ; WX 4818 ; N AE ; B 0 0 0 0 ; +C 199 ; WX 4818 ; N Ccedilla ; B 0 0 0 0 ; +C 200 ; WX 6022 ; N Egrave ; B 0 0 0 0 ; +C 201 ; WX 6022 ; N Eacute ; B 0 0 0 0 ; +C 202 ; WX 6022 ; N Ecircumflex ; B 0 0 0 0 ; +C 203 ; WX 6022 ; N Edieresis ; B 0 0 0 0 ; +C 204 ; WX 7227 ; N Igrave ; B 0 0 0 0 ; +C 205 ; WX 7227 ; N Iacute ; B 0 0 0 0 ; +C 206 ; WX 7227 ; N Icircumflex ; B 0 0 0 0 ; +C 207 ; WX 7227 ; N Idieresis ; B 0 0 0 0 ; +C 208 ; WX 6022 ; N Eth ; B 0 0 0 0 ; +C 209 ; WX 6022 ; N Ntilde ; B 0 0 0 0 ; +C 210 ; WX 6022 ; N Ograve ; B 0 0 0 0 ; +C 211 ; WX 6022 ; N Oacute ; B 0 0 0 0 ; +C 212 ; WX 6022 ; N Ocircumflex ; B 0 0 0 0 ; +C 213 ; WX 6022 ; N Otilde ; B 0 0 0 0 ; +C 214 ; WX 6022 ; N Odieresis ; B 0 0 0 0 ; +C 215 ; WX 6022 ; N OE ; B 0 0 0 0 ; +C 216 ; WX 6022 ; N Oslash ; B 0 0 0 0 ; +C 217 ; WX 6022 ; N Ugrave ; B 0 0 0 0 ; +C 218 ; WX 6022 ; N Uacute ; B 0 0 0 0 ; +C 219 ; WX 6022 ; N Ucircumflex ; B 0 0 0 0 ; +C 220 ; WX 4818 ; N Udieresis ; B 0 0 0 0 ; +C 221 ; WX 4818 ; N Yacute ; B 0 0 0 0 ; +C 222 ; WX 4818 ; N Thorn ; B 0 0 0 0 ; +C 223 ; WX 4818 ; N Germandbls ; B 0 0 0 0 ; +C 224 ; WX 4818 ; N agrave ; B 0 0 0 0 ; +C 225 ; WX 4818 ; N aacute ; B 0 0 0 0 ; +C 226 ; WX 4818 ; N acircumflex ; B 0 0 0 0 ; +C 227 ; WX 4818 ; N atilde ; B 0 0 0 0 ; +C 228 ; WX 4818 ; N adieresis ; B 0 0 0 0 ; +C 229 ; WX 4818 ; N aring ; B 0 0 0 0 ; +C 230 ; WX 4818 ; N ae ; B 0 0 0 0 ; +C 231 ; WX 4818 ; N ccedilla ; B 0 0 0 0 ; +C 232 ; WX 6022 ; N egrave ; B 0 0 0 0 ; +C 233 ; WX 6022 ; N eacute ; B 0 0 0 0 ; +C 234 ; WX 6022 ; N ecircumflex ; B 0 0 0 0 ; +C 235 ; WX 6022 ; N edieresis ; B 0 0 0 0 ; +C 236 ; WX 6022 ; N igrave ; B 0 0 0 0 ; +C 237 ; WX 6022 ; N iacute ; B 0 0 0 0 ; +C 238 ; WX 6022 ; N icircumflex ; B 0 0 0 0 ; +C 239 ; WX 6022 ; N idieresis ; B 0 0 0 0 ; +C 240 ; WX 6022 ; N eth ; B 0 0 0 0 ; +C 241 ; WX 6022 ; N ntilde ; B 0 0 0 0 ; +C 242 ; WX 6022 ; N ograve ; B 0 0 0 0 ; +C 243 ; WX 6022 ; N oacute ; B 0 0 0 0 ; +C 244 ; WX 7227 ; N ocircumflex ; B 0 0 0 0 ; +C 245 ; WX 7227 ; N otilde ; B 0 0 0 0 ; +C 246 ; WX 7227 ; N odieresis ; B 0 0 0 0 ; +C 247 ; WX 7227 ; N oe ; B 0 0 0 0 ; +C 248 ; WX 7227 ; N oslash ; B 0 0 0 0 ; +C 249 ; WX 7227 ; N ugrave ; B 0 0 0 0 ; +C 250 ; WX 7227 ; N uacute ; B 0 0 0 0 ; +C 251 ; WX 7227 ; N ucircumflex ; B 0 0 0 0 ; +C 252 ; WX 7227 ; N udieresis ; B 0 0 0 0 ; +C 253 ; WX 7227 ; N yacute ; B 0 0 0 0 ; +C 254 ; WX 7227 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 7227 ; N germandbls ; B 0 0 0 0 ; 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 73e7e85a2cd..8b26d665e3e 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: Sun Aug 29 08:39:27 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:04:44 2019 FontName KnittingSymbols-grid-grid-Medium FullName KnittingSymbols-grid-grid FamilyName KnittingSymbols-grid-grid @@ -12,12 +12,12 @@ UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox -35 -293 7215 937 +FontBBox -15 -293 7215 937 CapHeight 937 XHeight 937 Ascender 937 Descender -293 -StartCharMetrics 237 +StartCharMetrics 240 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 ; @@ -30,18 +30,20 @@ C 18 ; WX 1204 ; N quotedblbase ; B -15 -293 1215 937 ; 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 ; +C 22 ; WX 602 ; N emdash ; B -15 -293 615 937 ; C 23 ; WX 1204 ; N compwordmark ; B -15 -293 1215 937 ; C 24 ; WX 1204 ; N perthousandzero ; B -15 -293 1215 937 ; C 25 ; WX 602 ; N dotlessi ; B -15 -293 600 937 ; C 26 ; WX 602 ; N dotlessj ; B 0 -293 615 937 ; C 27 ; WX 602 ; N ff ; B -15 -293 600 937 ; C 28 ; WX 602 ; N fi ; B 0 -293 615 937 ; -C 29 ; WX 1204 ; N fl ; B 0 -293 1200 937 ; -C 30 ; WX 1204 ; N ffi ; B 0 -293 1200 937 ; +C 29 ; WX 1204 ; N fl ; B -15 -293 1215 937 ; +C 30 ; WX 1204 ; N ffi ; B -15 -293 1215 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 0 0 0 0 ; +C 35 ; WX 1204 ; N numbersign ; B -15 -293 1215 937 ; +C 38 ; WX 1204 ; N ampersand ; B -15 -293 1215 937 ; 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 ; @@ -51,6 +53,7 @@ C 44 ; WX 1204 ; N comma ; B -15 -293 1215 937 ; C 45 ; WX 1204 ; N hyphen ; B -15 -293 1215 937 ; C 46 ; WX 1204 ; N period ; B -15 -293 1215 937 ; C 47 ; WX 1204 ; N slash ; B -15 -293 1215 937 ; +C 48 ; WX 1204 ; N zero ; B -15 -293 1215 937 ; C 49 ; WX 1204 ; N one ; B -15 -293 1215 937 ; C 50 ; WX 1204 ; N two ; B -15 -293 1215 937 ; C 51 ; WX 1204 ; N three ; B -15 -293 1215 937 ; @@ -71,8 +74,8 @@ C 65 ; WX 1204 ; N A ; B -15 -293 1215 937 ; C 66 ; WX 1204 ; N B ; B -15 -293 1215 937 ; C 67 ; WX 1204 ; N C ; B -15 -293 1215 937 ; C 68 ; WX 1204 ; N D ; B -15 -293 1215 937 ; -C 69 ; WX 1204 ; N E ; B 210 -68 990 712 ; -C 70 ; WX 1204 ; N F ; B -35 287 1235 622 ; +C 69 ; WX 1204 ; N E ; B -15 -293 1215 937 ; +C 70 ; WX 1204 ; N F ; B 0 0 0 0 ; C 71 ; WX 1204 ; N G ; B -15 -293 1215 937 ; C 72 ; WX 1204 ; N H ; B -15 -293 1215 937 ; C 73 ; WX 1204 ; N I ; B -15 -293 1215 937 ; @@ -87,7 +90,7 @@ C 81 ; WX 1204 ; N Q ; B -15 -293 1215 937 ; C 82 ; WX 1204 ; N R ; B -15 -293 1215 937 ; C 83 ; WX 1204 ; N S ; B -15 -293 1215 937 ; C 84 ; WX 1204 ; N T ; B -15 -293 1215 937 ; -C 85 ; WX 1204 ; N U ; B -35 22 1235 622 ; +C 85 ; WX 1204 ; N U ; B 0 0 0 0 ; C 86 ; WX 1204 ; N V ; B -15 -293 1215 937 ; C 87 ; WX 1204 ; N W ; B -15 -293 1215 937 ; C 88 ; WX 1204 ; N X ; B -15 -293 1215 937 ; @@ -101,7 +104,7 @@ C 98 ; WX 1204 ; N b ; B -15 -293 1215 937 ; C 99 ; WX 1204 ; N c ; B -15 -293 1215 937 ; C 100 ; WX 1204 ; N d ; B -15 -293 1215 937 ; C 101 ; WX 1204 ; N e ; B -15 -293 1215 937 ; -C 102 ; WX 1204 ; N f ; B -35 287 1235 622 ; +C 102 ; WX 1204 ; N f ; B 0 0 0 0 ; C 103 ; WX 1204 ; N g ; B -15 -293 1215 937 ; C 104 ; WX 1204 ; N h ; B -15 -293 1215 937 ; C 105 ; WX 1204 ; N i ; B -15 -293 1215 937 ; diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitgn.afm index bd22d5ea4e3..0d1dd4936f1 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: Sun Aug 29 08:39:24 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:08 2019 FontName KnittingSymbols-grid-foreground-Medium FullName KnittingSymbols-grid-foreground FamilyName KnittingSymbols-grid-foreground @@ -12,11 +12,12 @@ UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox -35 -293 5611 937 -CapHeight 688 -XHeight 662 -Ascender 712 -StartCharMetrics 237 +FontBBox -35 -313 5611 957 +CapHeight 532 +XHeight 687 +Ascender 735 +Descender -166 +StartCharMetrics 240 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 ; @@ -41,6 +42,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 252 1200 842 ; C 31 ; WX 6022 ; N ffl ; B 390 -198 5611 842 ; C 33 ; WX 1204 ; N exclam ; B 260 -18 940 662 ; C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 260 -18 900 662 ; +C 38 ; WX 1204 ; N ampersand ; B 210 -68 990 712 ; C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; C 40 ; WX 1204 ; N parenleft ; B 260 -18 900 662 ; C 41 ; WX 1204 ; N parenright ; B 300 -18 940 662 ; @@ -50,6 +53,7 @@ C 44 ; WX 1204 ; N comma ; B 300 22 900 622 ; C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; C 46 ; WX 1204 ; N period ; B 300 22 900 622 ; C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 1204 ; N zero ; B 300 -18 940 662 ; 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 990 712 ; @@ -68,20 +72,20 @@ 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 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 ; +C 67 ; WX 1204 ; N C ; B -35 -313 1235 957 ; +C 68 ; WX 1204 ; N D ; B -35 -313 1235 957 ; C 69 ; WX 1204 ; N E ; B 210 -68 990 712 ; C 70 ; WX 1204 ; N F ; B -35 287 1235 622 ; -C 71 ; WX 1204 ; N G ; B 0 0 0 0 ; +C 71 ; WX 1204 ; N G ; B -35 -313 1235 957 ; 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 75 ; WX 1204 ; N K ; B -35 -313 1235 957 ; 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 78 ; WX 1204 ; N N ; B -35 -313 1235 957 ; C 79 ; WX 1204 ; N O ; B 260 -18 940 662 ; -C 80 ; WX 1204 ; N P ; B 0 0 0 0 ; +C 80 ; WX 1204 ; N P ; B -35 -313 1235 957 ; C 81 ; WX 1204 ; N Q ; B 342 -18 858 710 ; C 82 ; WX 1204 ; N R ; B 210 -69 950 712 ; C 83 ; WX 1204 ; N S ; B 215 182 950 462 ; @@ -97,20 +101,20 @@ C 93 ; WX 1204 ; N bracketright ; B 176 110 989 534 ; C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; C 97 ; WX 1204 ; N a ; B 210 -68 990 712 ; C 98 ; WX 1204 ; N b ; B 342 -18 858 710 ; -C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; -C 100 ; WX 1204 ; N d ; B 0 0 0 0 ; -C 101 ; WX 1204 ; N e ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B -35 -313 1235 957 ; +C 100 ; WX 1204 ; N d ; B -35 -313 1235 957 ; +C 101 ; WX 1204 ; N e ; B -35 -313 1235 957 ; C 102 ; WX 1204 ; N f ; B -35 287 1235 622 ; -C 103 ; WX 1204 ; N g ; B 0 0 0 0 ; +C 103 ; WX 1204 ; N g ; B -35 -313 1235 957 ; C 104 ; WX 1204 ; N h ; B 460 -63 740 672 ; C 105 ; WX 1204 ; N i ; B 300 -18 964 688 ; C 106 ; WX 1204 ; N j ; B 236 -18 900 688 ; -C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B -35 -313 1235 957 ; C 108 ; WX 1204 ; N l ; B 210 -68 990 712 ; C 109 ; WX 1204 ; N m ; B 300 112 900 532 ; -C 110 ; WX 1204 ; N n ; B 0 0 0 0 ; -C 111 ; WX 1204 ; N o ; B 0 0 0 0 ; -C 112 ; WX 1204 ; N p ; B 0 0 0 0 ; +C 110 ; WX 1204 ; N n ; B -35 -313 1235 957 ; +C 111 ; WX 1204 ; N o ; B -35 -313 1235 957 ; +C 112 ; WX 1204 ; N p ; B -35 -313 1235 957 ; C 113 ; WX 1204 ; N q ; B 342 -18 858 710 ; C 114 ; WX 1204 ; N r ; B 210 -68 990 712 ; C 115 ; WX 1204 ; N s ; B 250 182 985 462 ; @@ -126,14 +130,14 @@ 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 ; -C 129 ; WX 2409 ; N Aogonek ; B 0 0 0 0 ; -C 130 ; WX 2409 ; N Cacute ; B 0 0 0 0 ; -C 131 ; WX 2409 ; N Ccaron ; B 0 0 0 0 ; -C 132 ; WX 3613 ; N Dcaron ; B 0 0 0 0 ; -C 133 ; WX 3613 ; N Ecaron ; B 0 0 0 0 ; -C 134 ; WX 3613 ; N Eogonek ; B 0 0 0 0 ; -C 135 ; WX 3613 ; N Gbreve ; B 0 0 0 0 ; +C 128 ; WX 2409 ; N Abreve ; B -35 -313 2435 957 ; +C 129 ; WX 2409 ; N Aogonek ; B -35 -313 2435 957 ; +C 130 ; WX 2409 ; N Cacute ; B -35 -313 2435 957 ; +C 131 ; WX 2409 ; N Ccaron ; B -35 -313 2435 957 ; +C 132 ; WX 3613 ; N Dcaron ; B -35 -313 3635 957 ; +C 133 ; WX 3613 ; N Ecaron ; B -35 -313 3635 957 ; +C 134 ; WX 3613 ; N Eogonek ; B -35 -313 3635 957 ; +C 135 ; WX 3613 ; N Gbreve ; B -35 -313 3635 957 ; C 136 ; WX 2409 ; N Lacute ; B 0 0 0 0 ; C 137 ; WX 2409 ; N Lcaron ; B 0 0 0 0 ; C 138 ; WX 2409 ; N Lslash ; 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 09ff6300a92..d9668f8a33a 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: Sun Aug 29 08:39:29 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:10 2019 FontName KnittingSymbols-grid-purl-Medium FullName KnittingSymbols-grid-purl FamilyName KnittingSymbols-grid-purl @@ -14,8 +14,9 @@ Version 001.000 EncodingScheme FontSpecific FontBBox 0 -278 7200 922 CapHeight 922 +XHeight 922 Descender -278 -StartCharMetrics 237 +StartCharMetrics 240 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 ; @@ -40,6 +41,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 0 0 0 ; C 31 ; WX 6022 ; N ffl ; B 0 0 0 0 ; C 33 ; WX 1204 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 1204 ; N quotedbl ; B 0 0 0 0 ; +C 35 ; WX 1204 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1204 ; N ampersand ; B 0 -278 1200 922 ; C 39 ; WX 602 ; N quoteright ; B 0 -278 600 922 ; C 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; @@ -48,7 +51,8 @@ C 43 ; WX 1204 ; N plus ; B 0 -278 1200 922 ; C 44 ; WX 1204 ; N comma ; B 0 -278 1200 922 ; C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; -C 47 ; WX 1204 ; N slash ; B 0 -278 1200 922 ; +C 47 ; WX 1204 ; N slash ; B 15 -263 1185 907 ; +C 48 ; WX 1204 ; N zero ; B 0 0 0 0 ; C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; C 50 ; WX 1204 ; N two ; B 0 -278 1200 922 ; C 51 ; WX 1204 ; N three ; B 0 -278 1200 922 ; @@ -79,7 +83,7 @@ C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; C 76 ; WX 1204 ; N L ; B 0 0 0 0 ; C 77 ; WX 1204 ; N M ; B 0 -278 1200 922 ; C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; -C 79 ; WX 1204 ; N O ; B 0 0 0 0 ; +C 79 ; WX 1204 ; N O ; B 0 -278 1200 922 ; C 80 ; WX 1204 ; N P ; B 0 -278 1200 922 ; C 81 ; WX 1204 ; N Q ; B 0 -278 1200 922 ; C 82 ; WX 1204 ; N R ; B 0 0 0 0 ; diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitmg.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitmg.afm new file mode 100644 index 00000000000..586ce4025e2 --- /dev/null +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitmg.afm @@ -0,0 +1,184 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:13 2019 +FontName KnittingSymbols-mixed-grid-Medium +FullName KnittingSymbols-mixed-grid +FamilyName KnittingSymbols-mixed-grid +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 -293 6015 937 +CapHeight 937 +XHeight 937 +Ascender 937 +Descender -293 +StartCharMetrics 162 +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 ; +C 3 ; WX 1204 ; N tilde ; B -15 -293 1215 937 ; +C 4 ; WX 1204 ; N dieresis ; B -15 -293 1215 937 ; +C 5 ; WX 1204 ; N hungarumlaut ; B -15 -293 1215 937 ; +C 6 ; WX 0 ; N ring ; B -15 -293 15 937 ; +C 7 ; WX 0 ; N caron ; B -200 602 1000 672 ; +C 8 ; WX 0 ; N breve ; B -200 -28 1000 42 ; +C 9 ; WX 0 ; N macron ; B -1000 -28 -200 42 ; +C 10 ; WX 0 ; N dotaccent ; B -1000 602 -200 672 ; +C 11 ; WX 0 ; N cedilla ; B 200 602 1000 672 ; +C 12 ; WX 0 ; N ogonek ; B 200 -28 1000 42 ; +C 13 ; WX 0 ; N quotesinglbase ; B -235 -28 235 672 ; +C 14 ; WX 0 ; N guilsinglleft ; B -235 -28 235 672 ; +C 15 ; WX 0 ; N guilsinglright ; B -1000 602 200 672 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -28 200 42 ; +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 0 0 0 0 ; +C 20 ; WX 1204 ; N guillemotright ; B -15 -293 1215 937 ; +C 21 ; WX 1204 ; N endash ; B 0 -293 1215 937 ; +C 22 ; WX 602 ; N emdash ; B -15 -293 615 937 ; +C 23 ; WX 1204 ; N compwordmark ; B -15 -293 1215 937 ; +C 24 ; WX 1204 ; N perthousandzero ; B -15 -293 1215 937 ; +C 25 ; WX 602 ; N dotlessi ; B -15 -293 600 937 ; +C 26 ; WX 602 ; N dotlessj ; B 0 -293 615 937 ; +C 27 ; WX 602 ; N ff ; B -15 -293 600 937 ; +C 28 ; WX 602 ; N fi ; B 0 -293 615 937 ; +C 29 ; WX 1204 ; N fl ; B -15 -293 1215 937 ; +C 30 ; WX 1204 ; N ffi ; B -15 -293 1215 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 0 0 0 0 ; +C 35 ; WX 1204 ; N numbersign ; B -15 -293 1215 937 ; +C 38 ; WX 1204 ; N ampersand ; B -15 -293 1215 937 ; +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 ; +C 42 ; WX 1204 ; N asterisk ; B -15 -293 1215 937 ; +C 43 ; WX 1204 ; N plus ; B -15 -293 1200 937 ; +C 44 ; WX 1204 ; N comma ; B -15 -293 1215 937 ; +C 45 ; WX 1204 ; N hyphen ; B -15 -293 1215 937 ; +C 46 ; WX 1204 ; N period ; B -15 -293 1215 937 ; +C 47 ; WX 1204 ; N slash ; B -15 -293 1215 937 ; +C 48 ; WX 1204 ; N zero ; B -15 -293 1215 937 ; +C 49 ; WX 1204 ; N one ; B -15 -293 1215 937 ; +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 ; +C 61 ; WX 1204 ; N equal ; B -15 -293 1215 937 ; +C 62 ; WX 1204 ; N greater ; B -15 -293 1215 937 ; +C 63 ; WX 1204 ; N question ; B -15 -293 1215 937 ; +C 64 ; WX 1204 ; N at ; B -15 -293 1215 937 ; +C 65 ; WX 1204 ; N A ; B -15 -293 1215 937 ; +C 66 ; WX 1204 ; N B ; B -15 -293 1215 937 ; +C 67 ; WX 1204 ; N C ; B -15 -293 1215 937 ; +C 68 ; WX 1204 ; N D ; B -15 -293 1215 937 ; +C 69 ; WX 1204 ; N E ; B -15 -293 1215 937 ; +C 70 ; WX 1204 ; N F ; B 0 0 0 0 ; +C 71 ; WX 1204 ; N G ; B -15 -293 1215 937 ; +C 72 ; WX 1204 ; N H ; B -15 -293 1215 937 ; +C 73 ; WX 1204 ; N I ; B -15 -293 1215 937 ; +C 74 ; WX 1204 ; N J ; B -15 -293 1215 937 ; +C 75 ; WX 1204 ; N K ; B -15 -293 1215 937 ; +C 76 ; WX 1204 ; N L ; B -15 -293 1215 937 ; +C 77 ; WX 1204 ; N M ; B -15 -293 1215 937 ; +C 78 ; WX 1204 ; N N ; B -15 -293 1215 937 ; +C 79 ; WX 1204 ; N O ; B -15 -293 1215 937 ; +C 80 ; WX 1204 ; N P ; B -15 -293 1215 937 ; +C 81 ; WX 1204 ; N Q ; B -15 -293 1215 937 ; +C 82 ; WX 1204 ; N R ; B -15 -293 1215 937 ; +C 83 ; WX 1204 ; N S ; B -15 -293 1215 937 ; +C 84 ; WX 1204 ; N T ; B -15 -293 1215 937 ; +C 85 ; WX 1204 ; N U ; B 0 0 0 0 ; +C 86 ; WX 1204 ; N V ; B -15 -293 1215 937 ; +C 87 ; WX 1204 ; N W ; B -15 -293 1215 937 ; +C 88 ; WX 1204 ; N X ; B -15 -293 1215 937 ; +C 89 ; WX 1204 ; N Y ; B -15 -293 1215 937 ; +C 90 ; WX 1204 ; N Z ; B -15 -293 1215 937 ; +C 91 ; WX 1204 ; N bracketleft ; B -15 -293 1215 937 ; +C 93 ; WX 1204 ; N bracketright ; B -15 -293 1215 937 ; +C 94 ; WX 0 ; N asciicircum ; B -1035 602 1035 672 ; +C 95 ; WX 0 ; N underscore ; B -1035 -28 1035 42 ; +C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; +C 97 ; WX 1204 ; N a ; B -15 -293 1215 937 ; +C 98 ; WX 1204 ; N b ; B -15 -293 1215 937 ; +C 99 ; WX 1204 ; N c ; B -15 -293 1215 937 ; +C 100 ; WX 1204 ; N d ; B -15 -293 1215 937 ; +C 101 ; WX 1204 ; N e ; B -15 -293 1215 937 ; +C 102 ; WX 1204 ; N f ; B 0 0 0 0 ; +C 103 ; WX 1204 ; N g ; B -15 -293 1215 937 ; +C 104 ; WX 1204 ; N h ; B -15 -293 1215 937 ; +C 105 ; WX 1204 ; N i ; B -15 -293 1215 937 ; +C 106 ; WX 1204 ; N j ; B -15 -293 1215 937 ; +C 107 ; WX 1204 ; N k ; B -15 -293 1215 937 ; +C 108 ; WX 1204 ; N l ; B -15 -293 1215 937 ; +C 109 ; WX 1204 ; N m ; B -15 -293 1215 937 ; +C 110 ; WX 1204 ; N n ; B -15 -293 1215 937 ; +C 111 ; WX 1204 ; N o ; B -15 -293 1215 937 ; +C 112 ; WX 1204 ; N p ; B -15 -293 1215 937 ; +C 113 ; WX 1204 ; N q ; B -15 -293 1215 937 ; +C 114 ; WX 1204 ; N r ; B -15 -293 1215 937 ; +C 115 ; WX 1204 ; N s ; B -15 -293 1215 937 ; +C 116 ; WX 1204 ; N t ; B -15 -293 1215 937 ; +C 117 ; WX 1204 ; N u ; B -15 -293 1215 937 ; +C 118 ; WX 1204 ; N v ; B -15 -293 1215 937 ; +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 1204 ; N Abreve ; B -15 -293 1215 937 ; +C 129 ; WX 1204 ; N Aogonek ; B -15 -293 1215 937 ; +C 130 ; WX 1204 ; N Cacute ; B -15 -293 1215 937 ; +C 131 ; WX 1204 ; N Ccaron ; B -15 -293 1215 937 ; +C 132 ; WX 1204 ; N Dcaron ; B -15 -293 1215 937 ; +C 133 ; WX 1204 ; N Ecaron ; B -15 -293 1215 937 ; +C 134 ; WX 1204 ; N Eogonek ; B -15 -293 1215 937 ; +C 135 ; WX 1204 ; N Gbreve ; B -15 -293 1215 937 ; +C 136 ; WX 1204 ; N Lacute ; B -15 -293 1215 937 ; +C 137 ; WX 1204 ; N Lcaron ; B -15 -293 1215 937 ; +C 138 ; WX 1204 ; N Lslash ; B -15 -293 1215 937 ; +C 139 ; WX 1204 ; N Nacute ; B -15 -293 1215 937 ; +C 140 ; WX 1204 ; N Ncaron ; B -15 -293 1215 937 ; +C 141 ; WX 1204 ; N Eng ; B -15 -293 1215 937 ; +C 142 ; WX 1204 ; N Odblacute ; B -15 -293 1215 937 ; +C 143 ; WX 1204 ; N Racute ; B -15 -293 1215 937 ; +C 144 ; WX 1204 ; N Rcaron ; B -15 -293 1215 937 ; +C 145 ; WX 1204 ; N Sacute ; B -15 -293 1215 937 ; +C 146 ; WX 1204 ; N Scaron ; B -15 -293 1215 937 ; +C 147 ; WX 1204 ; N Scedilla ; B -15 -293 1215 937 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 1204 ; N Ydieresis ; B -15 -293 1200 937 ; +C 153 ; WX 1204 ; N Zacute ; B -15 -293 1215 937 ; +C 154 ; WX 1204 ; N Zcaron ; B 0 -293 1215 937 ; +C 155 ; WX 1204 ; N Zdot ; B 0 -293 1215 937 ; +C 157 ; WX 1204 ; N Idot ; B -15 -293 1215 937 ; +C 158 ; WX 1204 ; N dmacron ; B 0 -293 1215 937 ; +C 159 ; WX 1204 ; N section ; B -15 -293 1200 937 ; +C 160 ; WX 1204 ; N abreve ; B -15 -293 1215 937 ; +C 161 ; WX 1204 ; N aogonek ; B 0 -293 1215 937 ; +C 162 ; WX 1204 ; N cacute ; B -15 -293 1200 937 ; +C 163 ; WX 1204 ; N ccaron ; B -15 -293 1215 937 ; +C 164 ; WX 1204 ; N dcaron ; B 0 -293 1215 937 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; +EndCharMetrics +EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitml.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitml.afm new file mode 100644 index 00000000000..faf4f741b68 --- /dev/null +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitml.afm @@ -0,0 +1,184 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:25 2019 +FontName KnittingSymbols-nogrid-lowered-Medium +FullName KnittingSymbols-nogrid-lowered +FamilyName KnittingSymbols-nogrid-lowered +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 -293 5611 937 +CapHeight 396 +XHeight 444 +Ascender 480 +Descender 287 +StartCharMetrics 162 +C 0 ; WX 1204 ; N grave ; B 217 -158 983 607 ; +C 1 ; WX 1204 ; N acute ; B 362 374 838 648 ; +C 2 ; WX 1204 ; N circumflex ; B 362 374 838 648 ; +C 3 ; WX 1204 ; N tilde ; B 362 -198 838 74 ; +C 4 ; WX 1204 ; N dieresis ; B 362 -198 838 74 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; +C 6 ; WX 0 ; N ring ; B 0 0 0 0 ; +C 7 ; WX 0 ; N caron ; B -200 602 1000 672 ; +C 8 ; WX 0 ; N breve ; B -200 -28 1000 42 ; +C 9 ; WX 0 ; N macron ; B -1000 -28 -200 42 ; +C 10 ; WX 0 ; N dotaccent ; B -1000 602 -200 672 ; +C 11 ; WX 0 ; N cedilla ; B 200 602 1000 672 ; +C 12 ; WX 0 ; N ogonek ; B 200 -28 1000 42 ; +C 13 ; WX 0 ; N quotesinglbase ; B -235 -28 235 672 ; +C 14 ; WX 0 ; N guilsinglleft ; B -235 -28 235 672 ; +C 15 ; WX 0 ; N guilsinglright ; B -1000 602 200 672 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -28 200 42 ; +C 17 ; WX 1204 ; N quotedblright ; B 0 84 1200 154 ; +C 18 ; WX 1204 ; N quotedblbase ; B 0 84 1010 454 ; +C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ; +C 20 ; WX 1204 ; N guillemotright ; B 215 206 985 438 ; +C 21 ; WX 1204 ; N endash ; B 215 206 985 438 ; +C 22 ; WX 602 ; N emdash ; B 0 155 600 295 ; +C 23 ; WX 1204 ; N compwordmark ; B 0 -28 1200 398 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 -28 795 517 ; +C 25 ; WX 602 ; N dotlessi ; B 190 155 600 647 ; +C 26 ; WX 602 ; N dotlessj ; B 0 155 411 647 ; +C 27 ; WX 602 ; N ff ; B 190 -198 600 295 ; +C 28 ; WX 602 ; N fi ; B 0 -198 411 295 ; +C 29 ; WX 1204 ; N fl ; B 0 -198 1200 295 ; +C 30 ; WX 1204 ; N ffi ; B 0 155 1200 647 ; +C 31 ; WX 6022 ; N ffl ; B 390 -198 5611 647 ; +C 33 ; WX 1204 ; N exclam ; B 358 -18 842 467 ; +C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 358 -18 803 467 ; +C 38 ; WX 1204 ; N ampersand ; B 308 -68 892 517 ; +C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; +C 40 ; WX 1204 ; N parenleft ; B 358 -18 803 467 ; +C 41 ; WX 1204 ; N parenright ; B 398 -18 843 467 ; +C 42 ; WX 1204 ; N asterisk ; B 385 -18 815 467 ; +C 43 ; WX 1204 ; N plus ; B 215 206 985 438 ; +C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; +C 45 ; WX 1204 ; N hyphen ; B 565 -18 635 467 ; +C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 215 62 985 582 ; +C 48 ; WX 1204 ; N zero ; B 398 -18 842 467 ; +C 49 ; WX 1204 ; N one ; B 190 84 1200 454 ; +C 50 ; WX 1204 ; N two ; B 358 -18 842 467 ; +C 51 ; WX 1204 ; N three ; B 308 -68 892 517 ; +C 52 ; WX 1204 ; N four ; B 360 -18 840 467 ; +C 53 ; WX 1204 ; N five ; B 360 -18 840 467 ; +C 54 ; WX 1204 ; N six ; B 348 -18 853 467 ; +C 55 ; WX 1204 ; N seven ; B 415 -28 746 477 ; +C 56 ; WX 1204 ; N eight ; B 455 -28 786 477 ; +C 57 ; WX 1204 ; N nine ; B 80 -117 1120 477 ; +C 58 ; WX 1204 ; N colon ; B 358 -18 803 467 ; +C 59 ; WX 1204 ; N semicolon ; B 398 -18 842 467 ; +C 60 ; WX 1204 ; N less ; B 398 -18 842 467 ; +C 61 ; WX 1204 ; N equal ; B 388 287 812 357 ; +C 62 ; WX 1204 ; N greater ; B 358 -18 803 467 ; +C 63 ; WX 1204 ; N question ; B 405 -28 1200 517 ; +C 64 ; WX 1204 ; N at ; B 307 29 893 615 ; +C 65 ; WX 1204 ; N A ; B 308 -68 892 517 ; +C 66 ; WX 1204 ; N B ; B 419 -18 781 514 ; +C 67 ; WX 1204 ; N C ; B 565 22 635 427 ; +C 68 ; WX 1204 ; N D ; B 398 -18 842 467 ; +C 69 ; WX 1204 ; N E ; B 308 -68 892 517 ; +C 70 ; WX 1204 ; N F ; B -35 287 1235 427 ; +C 71 ; WX 1204 ; N G ; B 388 287 812 357 ; +C 72 ; WX 1204 ; N H ; B 493 -28 708 512 ; +C 73 ; WX 1204 ; N I ; B 398 -18 866 493 ; +C 74 ; WX 1204 ; N J ; B 334 -18 803 493 ; +C 75 ; WX 1204 ; N K ; B 565 22 635 427 ; +C 76 ; WX 1204 ; N L ; B 348 -69 893 517 ; +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 358 -18 842 467 ; +C 80 ; WX 1204 ; N P ; B 388 287 812 357 ; +C 81 ; WX 1204 ; N Q ; B 419 -18 781 514 ; +C 82 ; WX 1204 ; N R ; B 307 -69 853 517 ; +C 83 ; WX 1204 ; N S ; B 215 85 950 365 ; +C 84 ; WX 1204 ; N T ; B 419 -65 781 467 ; +C 85 ; WX 1204 ; N U ; B -35 22 1235 427 ; +C 86 ; WX 1204 ; N V ; B 358 -18 842 467 ; +C 87 ; WX 1204 ; N W ; B 308 -68 892 517 ; +C 88 ; WX 1204 ; N X ; B 419 -65 781 467 ; +C 89 ; WX 1204 ; N Y ; B 308 -68 892 517 ; +C 90 ; WX 1204 ; N Z ; B 217 -158 983 607 ; +C 91 ; WX 1204 ; N bracketleft ; B 211 13 1024 437 ; +C 93 ; WX 1204 ; N bracketright ; B 176 13 989 437 ; +C 94 ; WX 0 ; N asciicircum ; B -1035 602 1035 672 ; +C 95 ; WX 0 ; N underscore ; B -1035 -28 1035 42 ; +C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; +C 97 ; WX 1204 ; N a ; B 308 -68 892 517 ; +C 98 ; WX 1204 ; N b ; B 419 -18 781 514 ; +C 99 ; WX 1204 ; N c ; B 565 217 635 427 ; +C 100 ; WX 1204 ; N d ; B 495 177 745 467 ; +C 101 ; WX 1204 ; N e ; B 300 112 900 532 ; +C 102 ; WX 1204 ; N f ; B -35 287 1235 427 ; +C 103 ; WX 1204 ; N g ; B 388 287 812 357 ; +C 104 ; WX 1204 ; N h ; B 493 -63 708 477 ; +C 105 ; WX 1204 ; N i ; B 398 -18 866 493 ; +C 106 ; WX 1204 ; N j ; B 334 -18 803 493 ; +C 107 ; WX 1204 ; N k ; B 565 217 635 427 ; +C 108 ; WX 1204 ; N l ; B 308 -68 893 517 ; +C 109 ; WX 1204 ; N m ; B 300 15 900 435 ; +C 110 ; WX 1204 ; N n ; B 300 112 900 532 ; +C 111 ; WX 1204 ; N o ; B 495 177 745 467 ; +C 112 ; WX 1204 ; N p ; B 388 287 812 357 ; +C 113 ; WX 1204 ; N q ; B 419 -18 781 514 ; +C 114 ; WX 1204 ; N r ; B 308 -68 892 517 ; +C 115 ; WX 1204 ; N s ; B 250 85 985 365 ; +C 116 ; WX 1204 ; N t ; B 419 -65 781 467 ; +C 117 ; WX 1204 ; N u ; B 360 -18 840 467 ; +C 118 ; WX 1204 ; N v ; B 358 -18 842 467 ; +C 119 ; WX 1204 ; N w ; B 308 -68 892 517 ; +C 120 ; WX 1204 ; N x ; B 419 -65 781 467 ; +C 121 ; WX 1204 ; N y ; B 360 -18 840 467 ; +C 122 ; WX 1204 ; N z ; B 348 -28 853 477 ; +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 565 -18 635 467 ; +C 128 ; WX 1204 ; N Abreve ; B 565 217 635 427 ; +C 129 ; WX 1204 ; N Aogonek ; B 565 22 635 427 ; +C 130 ; WX 1204 ; N Cacute ; B 388 287 812 357 ; +C 131 ; WX 1204 ; N Ccaron ; B 388 287 812 357 ; +C 132 ; WX 1204 ; N Dcaron ; B 300 112 900 532 ; +C 133 ; WX 1204 ; N Ecaron ; B 300 112 900 532 ; +C 134 ; WX 1204 ; N Eogonek ; B 300 15 900 435 ; +C 135 ; WX 1204 ; N Gbreve ; B 455 177 705 467 ; +C 136 ; WX 1204 ; N Lacute ; B 455 177 705 467 ; +C 137 ; WX 1204 ; N Lcaron ; B 358 -18 803 467 ; +C 138 ; WX 1204 ; N Lslash ; B 565 217 635 427 ; +C 139 ; WX 1204 ; N Nacute ; B 565 22 635 427 ; +C 140 ; WX 1204 ; N Ncaron ; B 388 287 812 357 ; +C 141 ; WX 1204 ; N Eng ; B 388 287 812 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 112 900 532 ; +C 143 ; WX 1204 ; N Racute ; B 300 112 900 532 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 15 900 435 ; +C 145 ; WX 1204 ; N Sacute ; B 495 177 745 467 ; +C 146 ; WX 1204 ; N Scaron ; B 495 177 745 467 ; +C 147 ; WX 1204 ; N Scedilla ; B 398 -18 842 467 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 1204 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 1204 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 1204 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 1204 ; N Zdot ; B 0 0 0 0 ; +C 157 ; WX 1204 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 1204 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 1204 ; N section ; B 0 0 0 0 ; +C 160 ; WX 1204 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 1204 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 1204 ; N cacute ; B 0 0 0 0 ; +C 163 ; WX 1204 ; N ccaron ; B 0 0 0 0 ; +C 164 ; WX 1204 ; N dcaron ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; +EndCharMetrics +EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitmn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitmn.afm new file mode 100644 index 00000000000..b09990ffd9f --- /dev/null +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitmn.afm @@ -0,0 +1,184 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:34 2019 +FontName KnittingSymbols-mixed-foreground-Medium +FullName KnittingSymbols-mixed-foreground +FamilyName KnittingSymbols-mixed-foreground +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 -313 5611 957 +CapHeight 532 +XHeight 687 +Ascender 735 +Descender -166 +StartCharMetrics 162 +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 ; +C 3 ; WX 1204 ; N tilde ; B 265 -198 935 172 ; +C 4 ; WX 1204 ; N dieresis ; B 265 -198 935 172 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; +C 6 ; WX 0 ; N ring ; B 0 0 0 0 ; +C 7 ; WX 0 ; N caron ; B -200 602 1000 672 ; +C 8 ; WX 0 ; N breve ; B -200 -28 1000 42 ; +C 9 ; WX 0 ; N macron ; B -1000 -28 -200 42 ; +C 10 ; WX 0 ; N dotaccent ; B -1000 602 -200 672 ; +C 11 ; WX 0 ; N cedilla ; B 200 602 1000 672 ; +C 12 ; WX 0 ; N ogonek ; B 200 -28 1000 42 ; +C 13 ; WX 0 ; N quotesinglbase ; B -235 -28 235 672 ; +C 14 ; WX 0 ; N guilsinglleft ; B -235 -28 235 672 ; +C 15 ; WX 0 ; N guilsinglright ; B -1000 602 200 672 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -28 200 42 ; +C 17 ; WX 1204 ; N quotedblright ; B 0 214 1200 284 ; +C 18 ; WX 1204 ; N quotedblbase ; B 0 214 1010 584 ; +C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ; +C 20 ; WX 1204 ; N guillemotright ; B 215 167 985 477 ; +C 21 ; WX 1204 ; N endash ; B 215 167 985 477 ; +C 22 ; WX 602 ; N emdash ; B 0 252 600 392 ; +C 23 ; WX 1204 ; N compwordmark ; B 0 -28 1200 545 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 -28 990 712 ; +C 25 ; WX 602 ; N dotlessi ; B 190 252 600 842 ; +C 26 ; WX 602 ; N dotlessj ; B 0 252 411 842 ; +C 27 ; WX 602 ; N ff ; B 190 -198 600 392 ; +C 28 ; WX 602 ; N fi ; B 0 -198 411 392 ; +C 29 ; WX 1204 ; N fl ; B 0 -198 1200 392 ; +C 30 ; WX 1204 ; N ffi ; B 0 252 1200 842 ; +C 31 ; WX 6022 ; N ffl ; B 390 -198 5611 842 ; +C 33 ; WX 1204 ; N exclam ; B 260 -18 940 662 ; +C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 260 -18 900 662 ; +C 38 ; WX 1204 ; N ampersand ; B 210 -68 990 712 ; +C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; +C 40 ; WX 1204 ; N parenleft ; B 260 -18 900 662 ; +C 41 ; WX 1204 ; N parenright ; B 300 -18 940 662 ; +C 42 ; WX 1204 ; N asterisk ; B 301 -18 899 662 ; +C 43 ; WX 1204 ; N plus ; B 215 167 985 477 ; +C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; +C 45 ; WX 1204 ; N hyphen ; B 565 -18 635 662 ; +C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 215 -35 985 680 ; +C 48 ; WX 1204 ; N zero ; B 300 -18 940 662 ; +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 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 ; +C 61 ; WX 1204 ; N equal ; B 320 287 880 357 ; +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 990 712 ; +C 66 ; WX 1204 ; N B ; B 342 -18 858 710 ; +C 67 ; WX 1204 ; N C ; B -35 -313 1235 957 ; +C 68 ; WX 1204 ; N D ; B -35 -313 1235 957 ; +C 69 ; WX 1204 ; N E ; B 210 -68 990 712 ; +C 70 ; WX 1204 ; N F ; B -35 287 1235 622 ; +C 71 ; WX 1204 ; N G ; B -35 -313 1235 957 ; +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 -35 -313 1235 957 ; +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 -35 -313 1235 957 ; +C 79 ; WX 1204 ; N O ; B 260 -18 940 662 ; +C 80 ; WX 1204 ; N P ; B -35 -313 1235 957 ; +C 81 ; WX 1204 ; N Q ; B 342 -18 858 710 ; +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 ; +C 86 ; WX 1204 ; N V ; B 260 -18 940 662 ; +C 87 ; WX 1204 ; N W ; B 210 -68 990 712 ; +C 88 ; WX 1204 ; N X ; B 342 -65 858 662 ; +C 89 ; WX 1204 ; N Y ; B 210 -68 990 712 ; +C 90 ; WX 1204 ; N Z ; B 120 -158 1080 802 ; +C 91 ; WX 1204 ; N bracketleft ; B 211 110 1024 534 ; +C 93 ; WX 1204 ; N bracketright ; B 176 110 989 534 ; +C 94 ; WX 0 ; N asciicircum ; B -1035 602 1035 672 ; +C 95 ; WX 0 ; N underscore ; B -1035 -28 1035 42 ; +C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; +C 97 ; WX 1204 ; N a ; B 210 -68 990 712 ; +C 98 ; WX 1204 ; N b ; B 342 -18 858 710 ; +C 99 ; WX 1204 ; N c ; B -35 -313 1235 957 ; +C 100 ; WX 1204 ; N d ; B -35 -313 1235 957 ; +C 101 ; WX 1204 ; N e ; B -35 -313 1235 957 ; +C 102 ; WX 1204 ; N f ; B -35 287 1235 622 ; +C 103 ; WX 1204 ; N g ; B -35 -313 1235 957 ; +C 104 ; WX 1204 ; N h ; B 460 -63 740 672 ; +C 105 ; WX 1204 ; N i ; B 300 -18 964 688 ; +C 106 ; WX 1204 ; N j ; B 236 -18 900 688 ; +C 107 ; WX 1204 ; N k ; B -35 -313 1235 957 ; +C 108 ; WX 1204 ; N l ; B 210 -68 990 712 ; +C 109 ; WX 1204 ; N m ; B 300 112 900 532 ; +C 110 ; WX 1204 ; N n ; B -35 -313 1235 957 ; +C 111 ; WX 1204 ; N o ; B -35 -313 1235 957 ; +C 112 ; WX 1204 ; N p ; B -35 -313 1235 957 ; +C 113 ; WX 1204 ; N q ; B 342 -18 858 710 ; +C 114 ; WX 1204 ; N r ; B 210 -68 990 712 ; +C 115 ; WX 1204 ; N s ; B 250 182 985 462 ; +C 116 ; WX 1204 ; N t ; B 342 -65 858 662 ; +C 117 ; WX 1204 ; N u ; B 263 -18 937 662 ; +C 118 ; WX 1204 ; N v ; B 260 -18 940 662 ; +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 565 -18 635 662 ; +C 128 ; WX 1204 ; N Abreve ; B 565 217 635 622 ; +C 129 ; WX 1204 ; N Aogonek ; B 565 22 635 427 ; +C 130 ; WX 1204 ; N Cacute ; B 320 287 880 357 ; +C 131 ; WX 1204 ; N Ccaron ; B 320 287 880 357 ; +C 132 ; WX 1204 ; N Dcaron ; B 300 210 900 630 ; +C 133 ; WX 1204 ; N Ecaron ; B 300 210 900 630 ; +C 134 ; WX 1204 ; N Eogonek ; B 300 15 900 435 ; +C 135 ; WX 1204 ; N Gbreve ; B 358 177 803 662 ; +C 136 ; WX 1204 ; N Lacute ; B 358 177 803 662 ; +C 137 ; WX 1204 ; N Lcaron ; B 358 -18 803 467 ; +C 138 ; WX 1204 ; N Lslash ; B 565 217 635 622 ; +C 139 ; WX 1204 ; N Nacute ; B 565 22 635 427 ; +C 140 ; WX 1204 ; N Ncaron ; B 320 287 880 357 ; +C 141 ; WX 1204 ; N Eng ; B 320 287 880 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 210 900 630 ; +C 143 ; WX 1204 ; N Racute ; B 300 210 900 630 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 15 900 435 ; +C 145 ; WX 1204 ; N Sacute ; B 398 177 842 662 ; +C 146 ; WX 1204 ; N Scaron ; B 398 177 842 662 ; +C 147 ; WX 1204 ; N Scedilla ; B 398 -18 842 467 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 1204 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 1204 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 1204 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 1204 ; N Zdot ; B 0 0 0 0 ; +C 157 ; WX 1204 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 1204 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 1204 ; N section ; B 0 0 0 0 ; +C 160 ; WX 1204 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 1204 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 1204 ; N cacute ; B 0 0 0 0 ; +C 163 ; WX 1204 ; N ccaron ; B 0 0 0 0 ; +C 164 ; WX 1204 ; N dcaron ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B -35 -313 1235 957 ; +C 255 ; WX 1204 ; N germandbls ; B -35 -313 1235 957 ; +EndCharMetrics +EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitmp.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitmp.afm new file mode 100644 index 00000000000..7757a0261dc --- /dev/null +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitmp.afm @@ -0,0 +1,183 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:36 2019 +FontName KnittingSymbols-mixed-purl-Medium +FullName KnittingSymbols-mixed-purl +FamilyName KnittingSymbols-mixed-purl +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 -298 1220 942 +CapHeight 942 +XHeight 942 +Descender -298 +StartCharMetrics 162 +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 ; +C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; +C 4 ; WX 1204 ; N dieresis ; B -20 -298 1220 942 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; +C 6 ; WX 0 ; N ring ; B 0 0 0 0 ; +C 7 ; WX 0 ; N caron ; B -200 602 1000 672 ; +C 8 ; WX 0 ; N breve ; B -200 -28 1000 42 ; +C 9 ; WX 0 ; N macron ; B -1000 -28 -200 42 ; +C 10 ; WX 0 ; N dotaccent ; B -1000 602 -200 672 ; +C 11 ; WX 0 ; N cedilla ; B 200 602 1000 672 ; +C 12 ; WX 0 ; N ogonek ; B 200 -28 1000 42 ; +C 13 ; WX 0 ; N quotesinglbase ; B -235 -28 235 672 ; +C 14 ; WX 0 ; N guilsinglleft ; B -235 -28 235 672 ; +C 15 ; WX 0 ; N guilsinglright ; B -1000 602 200 672 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -28 200 42 ; +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 ; +C 25 ; WX 602 ; N dotlessi ; B 0 0 0 0 ; +C 26 ; WX 602 ; N dotlessj ; B 0 0 0 0 ; +C 27 ; WX 602 ; N ff ; B 0 0 0 0 ; +C 28 ; WX 602 ; N fi ; B 0 0 0 0 ; +C 29 ; WX 1204 ; N fl ; B 0 0 0 0 ; +C 30 ; WX 1204 ; N ffi ; B 0 0 0 0 ; +C 31 ; WX 6022 ; N ffl ; B 0 0 0 0 ; +C 33 ; WX 1204 ; N exclam ; B 0 0 0 0 ; +C 34 ; WX 1204 ; N quotedbl ; B 0 0 0 0 ; +C 35 ; WX 1204 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1204 ; N ampersand ; B 0 -278 1200 922 ; +C 39 ; WX 602 ; N quoteright ; B 0 -278 600 922 ; +C 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; +C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; +C 42 ; WX 1204 ; N asterisk ; B 0 0 0 0 ; +C 43 ; WX 1204 ; N plus ; B 0 0 0 0 ; +C 44 ; WX 1204 ; N comma ; B -20 -298 1220 942 ; +C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 1204 ; N zero ; B 0 0 0 0 ; +C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; +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 ; +C 61 ; WX 1204 ; N equal ; B -20 -298 1220 942 ; +C 62 ; WX 1204 ; N greater ; B 0 0 0 0 ; +C 63 ; WX 1204 ; N question ; B 0 0 0 0 ; +C 64 ; WX 1204 ; N at ; B 0 0 0 0 ; +C 65 ; WX 1204 ; N A ; B 0 0 0 0 ; +C 66 ; WX 1204 ; N B ; B -20 -298 1220 942 ; +C 67 ; WX 1204 ; N C ; B 0 0 0 0 ; +C 68 ; WX 1204 ; N D ; B 0 0 0 0 ; +C 69 ; WX 1204 ; N E ; B 245 -33 955 677 ; +C 70 ; WX 1204 ; N F ; B -20 -298 1220 942 ; +C 71 ; WX 1204 ; N G ; B -20 -298 1220 942 ; +C 72 ; WX 1204 ; N H ; B 0 0 0 0 ; +C 73 ; WX 1204 ; N I ; B -20 -298 1220 942 ; +C 74 ; WX 1204 ; N J ; B -20 -298 1220 942 ; +C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; +C 76 ; WX 1204 ; N L ; B 0 0 0 0 ; +C 77 ; WX 1204 ; N M ; B -20 -298 1220 942 ; +C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; +C 79 ; WX 1204 ; N O ; B -20 -298 1220 942 ; +C 80 ; WX 1204 ; N P ; B -20 -298 1220 942 ; +C 81 ; WX 1204 ; N Q ; B -20 -298 1220 942 ; +C 82 ; WX 1204 ; N R ; B 0 0 0 0 ; +C 83 ; WX 1204 ; N S ; B 0 0 0 0 ; +C 84 ; WX 1204 ; N T ; B -20 -298 1220 942 ; +C 85 ; WX 1204 ; N U ; B 0 0 0 0 ; +C 86 ; WX 1204 ; N V ; B -20 -298 1220 942 ; +C 87 ; WX 1204 ; N W ; B -20 -298 1220 942 ; +C 88 ; WX 1204 ; N X ; B -20 -298 1220 942 ; +C 89 ; WX 1204 ; N Y ; B 0 0 0 0 ; +C 90 ; WX 1204 ; N Z ; B 0 0 0 0 ; +C 91 ; WX 1204 ; N bracketleft ; B 0 0 0 0 ; +C 93 ; WX 1204 ; N bracketright ; B 0 0 0 0 ; +C 94 ; WX 0 ; N asciicircum ; B -1035 602 1035 672 ; +C 95 ; WX 0 ; N underscore ; B -1035 -28 1035 42 ; +C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; +C 97 ; WX 1204 ; N a ; B 0 0 0 0 ; +C 98 ; WX 1204 ; N b ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; +C 100 ; WX 1204 ; N d ; B 0 0 0 0 ; +C 101 ; WX 1204 ; N e ; B -20 -298 1220 942 ; +C 102 ; WX 1204 ; N f ; B 0 0 0 0 ; +C 103 ; WX 1204 ; N g ; B -20 -298 1220 942 ; +C 104 ; WX 1204 ; N h ; B 0 0 0 0 ; +C 105 ; WX 1204 ; N i ; B 0 0 0 0 ; +C 106 ; WX 1204 ; N j ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 108 ; WX 1204 ; N l ; B 0 0 0 0 ; +C 109 ; WX 1204 ; N m ; B 0 0 0 0 ; +C 110 ; WX 1204 ; N n ; B 0 0 0 0 ; +C 111 ; WX 1204 ; N o ; B -20 -298 1220 942 ; +C 112 ; WX 1204 ; N p ; B -20 -298 1220 942 ; +C 113 ; WX 1204 ; N q ; B 0 0 0 0 ; +C 114 ; WX 1204 ; N r ; B 0 0 0 0 ; +C 115 ; WX 1204 ; N s ; B 0 0 0 0 ; +C 116 ; WX 1204 ; N t ; B 0 0 0 0 ; +C 117 ; WX 1204 ; N u ; B 0 0 0 0 ; +C 118 ; WX 1204 ; N v ; B 0 0 0 0 ; +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 1204 ; N Abreve ; B 0 0 0 0 ; +C 129 ; WX 1204 ; N Aogonek ; B 0 0 0 0 ; +C 130 ; WX 1204 ; N Cacute ; B -20 -298 1220 942 ; +C 131 ; WX 1204 ; N Ccaron ; B -20 -298 1220 942 ; +C 132 ; WX 1204 ; N Dcaron ; B 0 0 0 0 ; +C 133 ; WX 1204 ; N Ecaron ; B -20 -298 1220 942 ; +C 134 ; WX 1204 ; N Eogonek ; B 0 0 0 0 ; +C 135 ; WX 1204 ; N Gbreve ; B 0 0 0 0 ; +C 136 ; WX 1204 ; N Lacute ; B -20 -298 1220 942 ; +C 137 ; WX 1204 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 1204 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 1204 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 1204 ; N Ncaron ; B -20 -298 1220 942 ; +C 141 ; WX 1204 ; N Eng ; B -20 -298 1220 942 ; +C 142 ; WX 1204 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 1204 ; N Racute ; B -20 -298 1220 942 ; +C 144 ; WX 1204 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 1204 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 1204 ; N Scaron ; B -20 -298 1220 942 ; +C 147 ; WX 1204 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 1204 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 1204 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 1204 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 1204 ; N Zdot ; B 0 0 0 0 ; +C 157 ; WX 1204 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 1204 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 1204 ; N section ; B 0 0 0 0 ; +C 160 ; WX 1204 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 1204 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 1204 ; N cacute ; B 0 -278 1220 922 ; +C 163 ; WX 1204 ; N ccaron ; B -20 -278 1220 922 ; +C 164 ; WX 1204 ; N dcaron ; B -20 -278 1200 922 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; +EndCharMetrics +EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitmr.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitmr.afm new file mode 100644 index 00000000000..3e63569c896 --- /dev/null +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitmr.afm @@ -0,0 +1,184 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:44 2019 +FontName KnittingSymbols-mixed-raised-Medium +FullName KnittingSymbols-mixed-raised +FamilyName KnittingSymbols-mixed-raised +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 -293 5611 937 +CapHeight 357 +XHeight 630 +Ascender 675 +Descender 287 +StartCharMetrics 162 +C 0 ; WX 1204 ; N grave ; B 217 37 983 802 ; +C 1 ; WX 1204 ; N acute ; B 362 570 838 842 ; +C 2 ; WX 1204 ; N circumflex ; B 362 570 838 842 ; +C 3 ; WX 1204 ; N tilde ; B 362 -3 838 270 ; +C 4 ; WX 1204 ; N dieresis ; B 362 -3 838 270 ; +C 5 ; WX 1204 ; N hungarumlaut ; B 0 0 0 0 ; +C 6 ; WX 0 ; N ring ; B 0 0 0 0 ; +C 7 ; WX 0 ; N caron ; B -200 602 1000 672 ; +C 8 ; WX 0 ; N breve ; B -200 -28 1000 42 ; +C 9 ; WX 0 ; N macron ; B -1000 -28 -200 42 ; +C 10 ; WX 0 ; N dotaccent ; B -1000 602 -200 672 ; +C 11 ; WX 0 ; N cedilla ; B 200 602 1000 672 ; +C 12 ; WX 0 ; N ogonek ; B 200 -28 1000 42 ; +C 13 ; WX 0 ; N quotesinglbase ; B -235 -28 235 672 ; +C 14 ; WX 0 ; N guilsinglleft ; B -235 -28 235 672 ; +C 15 ; WX 0 ; N guilsinglright ; B -1000 602 200 672 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -28 200 42 ; +C 17 ; WX 1204 ; N quotedblright ; B 0 279 1200 349 ; +C 18 ; WX 1204 ; N quotedblbase ; B 0 279 1010 649 ; +C 19 ; WX 1204 ; N guillemotleft ; B 50 -114 960 757 ; +C 20 ; WX 1204 ; N guillemotright ; B 215 206 985 438 ; +C 21 ; WX 1204 ; N endash ; B 215 206 985 438 ; +C 22 ; WX 602 ; N emdash ; B 0 350 600 490 ; +C 23 ; WX 1204 ; N compwordmark ; B 0 167 1200 593 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 167 990 712 ; +C 25 ; WX 602 ; N dotlessi ; B 190 350 600 842 ; +C 26 ; WX 602 ; N dotlessj ; B 0 350 411 842 ; +C 27 ; WX 602 ; N ff ; B 190 -3 600 490 ; +C 28 ; WX 602 ; N fi ; B 0 -3 411 490 ; +C 29 ; WX 1204 ; N fl ; B 0 -3 1200 490 ; +C 30 ; WX 1204 ; N ffi ; B 0 350 1200 842 ; +C 31 ; WX 6022 ; N ffl ; B 390 -3 5611 842 ; +C 33 ; WX 1204 ; N exclam ; B 358 177 842 662 ; +C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 358 177 803 662 ; +C 38 ; WX 1204 ; N ampersand ; B 308 127 892 712 ; +C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; +C 40 ; WX 1204 ; N parenleft ; B 358 177 803 662 ; +C 41 ; WX 1204 ; N parenright ; B 398 177 843 662 ; +C 42 ; WX 1204 ; N asterisk ; B 385 177 815 662 ; +C 43 ; WX 1204 ; N plus ; B 215 206 985 438 ; +C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; +C 45 ; WX 1204 ; N hyphen ; B 565 177 635 662 ; +C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; +C 47 ; WX 1204 ; N slash ; B 215 62 985 582 ; +C 48 ; WX 1204 ; N zero ; B 398 177 842 662 ; +C 49 ; WX 1204 ; N one ; B 190 279 1200 649 ; +C 50 ; WX 1204 ; N two ; B 358 177 842 662 ; +C 51 ; WX 1204 ; N three ; B 308 127 892 712 ; +C 52 ; WX 1204 ; N four ; B 360 177 840 662 ; +C 53 ; WX 1204 ; N five ; B 360 177 840 662 ; +C 54 ; WX 1204 ; N six ; B 348 177 853 662 ; +C 55 ; WX 1204 ; N seven ; B 415 167 746 672 ; +C 56 ; WX 1204 ; N eight ; B 455 167 786 672 ; +C 57 ; WX 1204 ; N nine ; B 80 78 1120 672 ; +C 58 ; WX 1204 ; N colon ; B 358 177 803 662 ; +C 59 ; WX 1204 ; N semicolon ; B 398 177 842 662 ; +C 60 ; WX 1204 ; N less ; B 398 177 842 662 ; +C 61 ; WX 1204 ; N equal ; B 388 287 812 357 ; +C 62 ; WX 1204 ; N greater ; B 358 177 803 662 ; +C 63 ; WX 1204 ; N question ; B 210 167 1200 712 ; +C 64 ; WX 1204 ; N at ; B 307 29 893 615 ; +C 65 ; WX 1204 ; N A ; B 308 127 892 712 ; +C 66 ; WX 1204 ; N B ; B 419 177 781 709 ; +C 67 ; WX 1204 ; N C ; B 565 217 635 427 ; +C 68 ; WX 1204 ; N D ; B 495 177 745 467 ; +C 69 ; WX 1204 ; N E ; B 308 127 892 712 ; +C 70 ; WX 1204 ; N F ; B -35 287 1235 622 ; +C 71 ; WX 1204 ; N G ; B 388 287 812 357 ; +C 72 ; WX 1204 ; N H ; B 493 167 708 707 ; +C 73 ; WX 1204 ; N I ; B 398 177 866 688 ; +C 74 ; WX 1204 ; N J ; B 334 177 803 688 ; +C 75 ; WX 1204 ; N K ; B 565 217 635 427 ; +C 76 ; WX 1204 ; N L ; B 348 126 893 712 ; +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 358 177 842 662 ; +C 80 ; WX 1204 ; N P ; B 388 287 812 357 ; +C 81 ; WX 1204 ; N Q ; B 419 177 781 709 ; +C 82 ; WX 1204 ; N R ; B 307 126 853 712 ; +C 83 ; WX 1204 ; N S ; B 215 280 950 560 ; +C 84 ; WX 1204 ; N T ; B 419 130 781 662 ; +C 85 ; WX 1204 ; N U ; B -35 217 1235 622 ; +C 86 ; WX 1204 ; N V ; B 358 177 842 662 ; +C 87 ; WX 1204 ; N W ; B 308 127 892 712 ; +C 88 ; WX 1204 ; N X ; B 419 130 781 662 ; +C 89 ; WX 1204 ; N Y ; B 308 127 892 712 ; +C 90 ; WX 1204 ; N Z ; B 217 37 983 802 ; +C 91 ; WX 1204 ; N bracketleft ; B 211 208 1024 632 ; +C 93 ; WX 1204 ; N bracketright ; B 176 208 989 632 ; +C 94 ; WX 0 ; N asciicircum ; B -1035 602 1035 672 ; +C 95 ; WX 0 ; N underscore ; B -1035 -28 1035 42 ; +C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; +C 97 ; WX 1204 ; N a ; B 308 127 892 712 ; +C 98 ; WX 1204 ; N b ; B 419 177 781 709 ; +C 99 ; WX 1204 ; N c ; B 565 217 635 622 ; +C 100 ; WX 1204 ; N d ; B 398 177 842 662 ; +C 101 ; WX 1204 ; N e ; B 300 210 900 630 ; +C 102 ; WX 1204 ; N f ; B -35 287 1235 622 ; +C 103 ; WX 1204 ; N g ; B 388 287 812 357 ; +C 104 ; WX 1204 ; N h ; B 493 132 708 672 ; +C 105 ; WX 1204 ; N i ; B 398 177 866 688 ; +C 106 ; WX 1204 ; N j ; B 334 177 803 688 ; +C 107 ; WX 1204 ; N k ; B 565 217 635 622 ; +C 108 ; WX 1204 ; N l ; B 308 127 893 712 ; +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 398 177 842 662 ; +C 112 ; WX 1204 ; N p ; B 388 287 812 357 ; +C 113 ; WX 1204 ; N q ; B 419 177 781 709 ; +C 114 ; WX 1204 ; N r ; B 308 127 892 712 ; +C 115 ; WX 1204 ; N s ; B 250 280 985 560 ; +C 116 ; WX 1204 ; N t ; B 419 130 781 662 ; +C 117 ; WX 1204 ; N u ; B 360 177 840 662 ; +C 118 ; WX 1204 ; N v ; B 358 177 842 662 ; +C 119 ; WX 1204 ; N w ; B 308 127 892 712 ; +C 120 ; WX 1204 ; N x ; B 419 130 781 662 ; +C 121 ; WX 1204 ; N y ; B 360 177 840 662 ; +C 122 ; WX 1204 ; N z ; B 348 167 853 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 565 177 635 662 ; +C 128 ; WX 1204 ; N Abreve ; B 565 217 635 622 ; +C 129 ; WX 1204 ; N Aogonek ; B 565 217 635 427 ; +C 130 ; WX 1204 ; N Cacute ; B 388 287 812 357 ; +C 131 ; WX 1204 ; N Ccaron ; B 388 287 812 357 ; +C 132 ; WX 1204 ; N Dcaron ; B 300 210 900 630 ; +C 133 ; WX 1204 ; N Ecaron ; B 300 210 900 630 ; +C 134 ; WX 1204 ; N Eogonek ; B 300 112 900 532 ; +C 135 ; WX 1204 ; N Gbreve ; B 358 177 803 662 ; +C 136 ; WX 1204 ; N Lacute ; B 358 177 803 662 ; +C 137 ; WX 1204 ; N Lcaron ; B 455 177 705 467 ; +C 138 ; WX 1204 ; N Lslash ; B 565 217 635 622 ; +C 139 ; WX 1204 ; N Nacute ; B 565 217 635 427 ; +C 140 ; WX 1204 ; N Ncaron ; B 388 287 812 357 ; +C 141 ; WX 1204 ; N Eng ; B 388 287 812 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 210 900 630 ; +C 143 ; WX 1204 ; N Racute ; B 300 210 900 630 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 112 900 532 ; +C 145 ; WX 1204 ; N Sacute ; B 398 177 842 662 ; +C 146 ; WX 1204 ; N Scaron ; B 398 177 842 662 ; +C 147 ; WX 1204 ; N Scedilla ; B 495 177 745 467 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 152 ; WX 1204 ; N Ydieresis ; B 0 0 0 0 ; +C 153 ; WX 1204 ; N Zacute ; B 0 0 0 0 ; +C 154 ; WX 1204 ; N Zcaron ; B 0 0 0 0 ; +C 155 ; WX 1204 ; N Zdot ; B 0 0 0 0 ; +C 157 ; WX 1204 ; N Idot ; B 0 0 0 0 ; +C 158 ; WX 1204 ; N dmacron ; B 0 0 0 0 ; +C 159 ; WX 1204 ; N section ; B 0 0 0 0 ; +C 160 ; WX 1204 ; N abreve ; B 0 0 0 0 ; +C 161 ; WX 1204 ; N aogonek ; B 0 0 0 0 ; +C 162 ; WX 1204 ; N cacute ; B 0 0 0 0 ; +C 163 ; WX 1204 ; N ccaron ; B 0 0 0 0 ; +C 164 ; WX 1204 ; N dcaron ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; +EndCharMetrics +EndFontMetrics 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 index d4308b4caa8..6a97c800ae1 100644 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_in.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20070915 -Comment Creation Date: Sun Aug 29 08:38:47 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:05:46 2019 FontName KnittingSymbols-nogrid-incount-Medium FullName KnittingSymbols-nogrid-incount FamilyName KnittingSymbols-nogrid-incount @@ -12,19 +12,16 @@ 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 ; +FontBBox -1035 -218 1235 862 +CapHeight 672 +XHeight 862 +Ascender 672 +StartCharMetrics 148 +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 0 0 0 ; +C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; +C 4 ; WX 1204 ; N dieresis ; B 0 0 0 0 ; 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 ; @@ -33,117 +30,140 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; +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 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 20 ; WX 1204 ; N guillemotright ; B 165 147 1035 497 ; +C 21 ; WX 0 ; 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 0 0 0 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 0 0 0 ; +C 25 ; WX 602 ; N dotlessi ; B 190 252 600 862 ; +C 26 ; WX 602 ; N dotlessj ; B 0 252 411 862 ; +C 27 ; WX 602 ; N ff ; B 190 -218 600 392 ; +C 28 ; WX 602 ; N fi ; B 0 -218 411 392 ; +C 29 ; WX 1204 ; N fl ; B 0 -218 1200 392 ; +C 30 ; WX 1204 ; N ffi ; B 0 252 1200 862 ; +C 31 ; WX 6022 ; N ffl ; B 0 0 0 0 ; +C 33 ; WX 2409 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ; +C 35 ; WX 1204 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1204 ; N ampersand ; B 0 0 0 0 ; 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 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; +C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; +C 42 ; WX 1204 ; N asterisk ; B 0 0 0 0 ; +C 43 ; WX 1204 ; N plus ; B 165 147 1035 497 ; C 44 ; WX 0 ; N comma ; B 0 0 0 0 ; -C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ; +C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; 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 47 ; WX 1204 ; N slash ; B 165 -85 1035 730 ; +C 48 ; WX 1204 ; N zero ; B 0 0 0 0 ; +C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; +C 50 ; WX 2409 ; N two ; B 0 0 0 0 ; +C 51 ; WX 3613 ; N three ; B 0 0 0 0 ; +C 52 ; WX 2409 ; N four ; B 0 0 0 0 ; +C 53 ; WX 2409 ; 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 2409 ; N colon ; B 0 0 0 0 ; +C 59 ; WX 2409 ; N semicolon ; B 0 0 0 0 ; +C 60 ; WX 2409 ; N less ; B 0 0 0 0 ; +C 61 ; WX 1204 ; N equal ; B 0 0 0 0 ; +C 62 ; WX 2409 ; N greater ; B 0 0 0 0 ; +C 63 ; WX 1204 ; N question ; B 0 0 0 0 ; +C 64 ; WX 1204 ; N at ; B 0 0 0 0 ; +C 65 ; WX 3613 ; N A ; B 0 0 0 0 ; +C 66 ; WX 1204 ; N B ; B 0 0 0 0 ; +C 67 ; WX 1204 ; N C ; B 0 0 0 0 ; +C 68 ; WX 2409 ; N D ; B 0 0 0 0 ; +C 69 ; WX 1204 ; N E ; B 0 0 0 0 ; +C 70 ; WX 1204 ; N F ; B -35 287 1235 672 ; +C 71 ; WX 1204 ; N G ; B 0 0 0 0 ; +C 72 ; WX 0 ; N H ; B 0 0 0 0 ; +C 73 ; WX 0 ; N I ; B 0 0 0 0 ; +C 74 ; WX 0 ; N J ; B 0 0 0 0 ; +C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; +C 76 ; WX 3613 ; N L ; B 0 0 0 0 ; +C 77 ; WX 0 ; N M ; B 0 0 0 0 ; +C 78 ; WX 0 ; N N ; B 0 0 0 0 ; +C 79 ; WX 0 ; N O ; B 0 0 0 0 ; +C 80 ; WX 1204 ; N P ; B 0 0 0 0 ; +C 81 ; WX 1204 ; N Q ; B 0 0 0 0 ; +C 82 ; WX 3613 ; N R ; B 0 0 0 0 ; +C 83 ; WX 1204 ; N S ; B 0 0 0 0 ; +C 84 ; WX 0 ; N T ; B 0 0 0 0 ; 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 86 ; WX 1204 ; N V ; B 0 0 0 0 ; +C 87 ; WX 1204 ; N W ; B 0 0 0 0 ; +C 88 ; WX 0 ; N X ; B 0 0 0 0 ; +C 89 ; WX 1204 ; N Y ; B 0 0 0 0 ; +C 90 ; WX 1204 ; N Z ; B 0 0 0 0 ; +C 91 ; WX 1204 ; N bracketleft ; B 0 0 0 0 ; +C 93 ; WX 1204 ; N bracketright ; B 0 0 0 0 ; 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 97 ; WX 3613 ; N a ; B 0 0 0 0 ; +C 98 ; WX 1204 ; N b ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; +C 100 ; WX 2409 ; N d ; B 0 0 0 0 ; +C 101 ; WX 0 ; N e ; B 0 0 0 0 ; +C 102 ; WX 1204 ; N f ; B -35 287 1235 672 ; +C 103 ; WX 1204 ; N g ; B 0 0 0 0 ; +C 104 ; WX 1204 ; N h ; B 0 0 0 0 ; +C 105 ; WX 0 ; N i ; B 0 0 0 0 ; +C 106 ; WX 0 ; N j ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 108 ; WX 3613 ; N l ; B 0 0 0 0 ; +C 109 ; WX 0 ; N m ; B 0 0 0 0 ; +C 110 ; WX 0 ; N n ; B 0 0 0 0 ; +C 111 ; WX 2409 ; N o ; B 0 0 0 0 ; +C 112 ; WX 1204 ; N p ; B 0 0 0 0 ; +C 113 ; WX 1204 ; N q ; B 0 0 0 0 ; +C 114 ; WX 3613 ; N r ; B 0 0 0 0 ; +C 115 ; WX 1204 ; N s ; B 0 0 0 0 ; +C 116 ; WX 0 ; N t ; B 0 0 0 0 ; +C 117 ; WX 1204 ; N u ; B 0 0 0 0 ; +C 118 ; WX 1204 ; N v ; B 0 0 0 0 ; +C 119 ; WX 1204 ; N w ; B 0 0 0 0 ; +C 120 ; WX 0 ; 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 0 ; N bar ; B 0 0 0 0 ; -C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ; +C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ; 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 ; +C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 128 ; WX 1204 ; N Abreve ; B 0 0 0 0 ; +C 129 ; WX 1204 ; N Aogonek ; B 0 0 0 0 ; +C 130 ; WX 1204 ; N Cacute ; B 0 0 0 0 ; +C 131 ; WX 1204 ; N Ccaron ; B 0 0 0 0 ; +C 132 ; WX 0 ; N Dcaron ; B 0 0 0 0 ; +C 133 ; WX 0 ; N Ecaron ; B 0 0 0 0 ; +C 134 ; WX 0 ; N Eogonek ; B 0 0 0 0 ; +C 135 ; WX 2409 ; N Gbreve ; B 0 0 0 0 ; +C 136 ; WX 2409 ; N Lacute ; B 0 0 0 0 ; +C 137 ; WX 2409 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 1204 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 1204 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 1204 ; N Ncaron ; B 0 0 0 0 ; +C 141 ; WX 1204 ; N Eng ; B 0 0 0 0 ; +C 142 ; WX 0 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 0 ; N Racute ; B 0 0 0 0 ; +C 144 ; WX 0 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 2409 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 2409 ; N Scaron ; B 0 0 0 0 ; +C 147 ; WX 2409 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; 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 index f4d112f1252..a0f822a6ba2 100644 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm +++ b/Master/texmf-dist/fonts/afm/public/knitting/knitn_sc_out.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20070915 -Comment Creation Date: Sun Aug 29 08:38:51 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:06:12 2019 FontName KnittingSymbols-nogrid-outcount-Medium FullName KnittingSymbols-nogrid-outcount FamilyName KnittingSymbols-nogrid-outcount @@ -12,19 +12,16 @@ 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 ; +FontBBox -1035 -218 1235 862 +CapHeight 672 +XHeight 862 +Ascender 672 +StartCharMetrics 148 +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 0 0 0 ; +C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; +C 4 ; WX 1204 ; N dieresis ; B 0 0 0 0 ; 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 ; @@ -33,117 +30,140 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; +C 17 ; WX 1204 ; N quotedblright ; B 0 0 0 0 ; +C 18 ; WX 0 ; N quotedblbase ; B 0 0 0 0 ; 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 20 ; WX 1204 ; N guillemotright ; B 165 147 1035 497 ; +C 21 ; WX 0 ; 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 0 0 0 ; +C 24 ; WX 1204 ; N perthousandzero ; B 0 0 0 0 ; +C 25 ; WX 602 ; N dotlessi ; B 190 252 600 862 ; +C 26 ; WX 602 ; N dotlessj ; B 0 252 411 862 ; +C 27 ; WX 602 ; N ff ; B 190 -218 600 392 ; +C 28 ; WX 602 ; N fi ; B 0 -218 411 392 ; +C 29 ; WX 1204 ; N fl ; B 0 -218 1200 392 ; +C 30 ; WX 1204 ; N ffi ; B 0 252 1200 862 ; +C 31 ; WX 1204 ; N ffl ; B 0 0 0 0 ; +C 33 ; WX 1204 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 0 ; N quotedbl ; B -360 -114 550 757 ; +C 35 ; WX 2409 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 3613 ; N ampersand ; B 0 0 0 0 ; 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 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; +C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; +C 42 ; WX 1204 ; N asterisk ; B 0 0 0 0 ; +C 43 ; WX 1204 ; N plus ; B 165 147 1035 497 ; C 44 ; WX 0 ; N comma ; B 0 0 0 0 ; -C 45 ; WX 1204 ; N hyphen ; B -10 -288 1210 932 ; +C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; 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 47 ; WX 1204 ; N slash ; B 165 -85 1035 730 ; +C 48 ; WX 2409 ; N zero ; B 0 0 0 0 ; +C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; +C 50 ; WX 1204 ; N two ; B 0 0 0 0 ; +C 51 ; WX 1204 ; N three ; B 0 0 0 0 ; +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 2409 ; N seven ; B 0 0 0 0 ; +C 56 ; WX 2409 ; N eight ; B 0 0 0 0 ; +C 57 ; WX 2409 ; N nine ; B 0 0 0 0 ; +C 58 ; WX 1204 ; N colon ; B 0 0 0 0 ; +C 59 ; WX 1204 ; N semicolon ; B 0 0 0 0 ; +C 60 ; WX 1204 ; N less ; B 0 0 0 0 ; +C 61 ; WX 1204 ; N equal ; B 0 0 0 0 ; +C 62 ; WX 1204 ; N greater ; B 0 0 0 0 ; +C 63 ; WX 1204 ; N question ; B 0 0 0 0 ; +C 64 ; WX 1204 ; N at ; B 0 0 0 0 ; +C 65 ; WX 1204 ; N A ; B 0 0 0 0 ; +C 66 ; WX 1204 ; N B ; B 0 0 0 0 ; +C 67 ; WX 1204 ; N C ; B 0 0 0 0 ; +C 68 ; WX 1204 ; N D ; B 0 0 0 0 ; +C 69 ; WX 3613 ; N E ; B 0 0 0 0 ; 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 71 ; WX 1204 ; N G ; B 0 0 0 0 ; +C 72 ; WX 1204 ; N H ; B 0 0 0 0 ; +C 73 ; WX 1204 ; N I ; B 0 0 0 0 ; +C 74 ; WX 1204 ; N J ; B 0 0 0 0 ; +C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; +C 76 ; WX 1204 ; N L ; B 0 0 0 0 ; +C 77 ; WX 1204 ; N M ; B 0 0 0 0 ; +C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; +C 79 ; WX 1204 ; N O ; B 0 0 0 0 ; +C 80 ; WX 1204 ; N P ; B 0 0 0 0 ; +C 81 ; WX 1204 ; N Q ; B 0 0 0 0 ; +C 82 ; WX 1204 ; N R ; B 0 0 0 0 ; +C 83 ; WX 1204 ; N S ; B 0 0 0 0 ; +C 84 ; WX 1204 ; N T ; B 0 0 0 0 ; +C 85 ; WX 1204 ; N U ; B -35 -28 1235 672 ; +C 86 ; WX 2409 ; N V ; B 0 0 0 0 ; +C 87 ; WX 3613 ; N W ; B 0 0 0 0 ; +C 88 ; WX 1204 ; N X ; B 0 0 0 0 ; +C 89 ; WX 3613 ; N Y ; B 0 0 0 0 ; +C 90 ; WX 3613 ; N Z ; B 0 0 0 0 ; +C 91 ; WX 1204 ; N bracketleft ; B 0 0 0 0 ; +C 93 ; WX 1204 ; N bracketright ; B 0 0 0 0 ; 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 97 ; WX 1204 ; N a ; B 0 0 0 0 ; +C 98 ; WX 1204 ; N b ; B 0 0 0 0 ; +C 99 ; WX 1204 ; N c ; B 0 0 0 0 ; +C 100 ; WX 1204 ; N d ; B 0 0 0 0 ; +C 101 ; WX 1204 ; N e ; B 0 0 0 0 ; 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 103 ; WX 1204 ; N g ; B 0 0 0 0 ; +C 104 ; WX 0 ; N h ; B 0 0 0 0 ; +C 105 ; WX 1204 ; N i ; B 0 0 0 0 ; +C 106 ; WX 1204 ; N j ; B 0 0 0 0 ; +C 107 ; WX 1204 ; N k ; B 0 0 0 0 ; +C 108 ; WX 1204 ; N l ; B 0 0 0 0 ; +C 109 ; WX 1204 ; N m ; B 0 0 0 0 ; +C 110 ; WX 1204 ; N n ; B 0 0 0 0 ; +C 111 ; WX 1204 ; N o ; B 0 0 0 0 ; +C 112 ; WX 1204 ; N p ; B 0 0 0 0 ; +C 113 ; WX 1204 ; N q ; B 0 0 0 0 ; +C 114 ; WX 1204 ; N r ; B 0 0 0 0 ; +C 115 ; WX 1204 ; N s ; B 0 0 0 0 ; +C 116 ; WX 1204 ; N t ; B 0 0 0 0 ; +C 117 ; WX 2409 ; N u ; B 0 0 0 0 ; +C 118 ; WX 2409 ; N v ; B 0 0 0 0 ; +C 119 ; WX 3613 ; N w ; B 0 0 0 0 ; +C 120 ; WX 1204 ; N x ; B 0 0 0 0 ; +C 121 ; WX 2409 ; N y ; B 0 0 0 0 ; +C 122 ; WX 2409 ; N z ; B 0 0 0 0 ; +C 123 ; WX 636 ; N braceleft ; B 0 0 0 0 ; C 124 ; WX 0 ; N bar ; B 0 0 0 0 ; -C 125 ; WX 636 ; N braceright ; B -10 -10 643 635 ; +C 125 ; WX 636 ; N braceright ; B 0 0 0 0 ; 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 ; +C 127 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; +C 128 ; WX 1204 ; N Abreve ; B 0 0 0 0 ; +C 129 ; WX 1204 ; N Aogonek ; B 0 0 0 0 ; +C 130 ; WX 1204 ; N Cacute ; B 0 0 0 0 ; +C 131 ; WX 1204 ; N Ccaron ; B 0 0 0 0 ; +C 132 ; WX 1204 ; N Dcaron ; B 0 0 0 0 ; +C 133 ; WX 1204 ; N Ecaron ; B 0 0 0 0 ; +C 134 ; WX 1204 ; N Eogonek ; B 0 0 0 0 ; +C 135 ; WX 1204 ; N Gbreve ; B 0 0 0 0 ; +C 136 ; WX 1204 ; N Lacute ; B 0 0 0 0 ; +C 137 ; WX 1204 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 1204 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 1204 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 1204 ; N Ncaron ; B 0 0 0 0 ; +C 141 ; WX 1204 ; N Eng ; B 0 0 0 0 ; +C 142 ; WX 1204 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 1204 ; N Racute ; B 0 0 0 0 ; +C 144 ; WX 1204 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 1204 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 1204 ; N Scaron ; B 0 0 0 0 ; +C 147 ; WX 1204 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; 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 ce2bb12585e..245106e47d5 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: Sun Aug 29 08:39:12 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:06:58 2019 FontName KnittingSymbols-nogrid-lowered-Medium FullName KnittingSymbols-nogrid-lowered FamilyName KnittingSymbols-nogrid-lowered @@ -13,18 +13,16 @@ UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific FontBBox -1035 -298 5611 942 -CapHeight 543 -XHeight 517 -Ascender 567 +CapHeight 396 +XHeight 444 +Ascender 531 Descender 287 -StartCharMetrics 127 +StartCharMetrics 148 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 ; -C 3 ; WX 1204 ; N tilde ; B 313 -218 887 104 ; -C 4 ; WX 1204 ; N dieresis ; B 313 -218 887 104 ; -C 5 ; WX 0 ; N hungarumlaut ; B -1000 652 200 722 ; -C 6 ; WX 0 ; N ring ; B -1000 -78 200 -8 ; +C 3 ; WX 1204 ; N tilde ; B 312 -218 888 104 ; +C 4 ; WX 1204 ; N dieresis ; B 312 -218 888 104 ; 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 ; @@ -33,9 +31,13 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; 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 ; @@ -48,6 +50,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 155 1200 667 ; C 31 ; WX 6022 ; N ffl ; B 390 -218 5611 667 ; C 33 ; WX 1204 ; N exclam ; B 308 -68 892 517 ; C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 308 -68 853 517 ; +C 38 ; WX 1204 ; N ampersand ; B 258 -118 943 567 ; C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; C 40 ; WX 1204 ; N parenleft ; B 308 -68 853 517 ; C 41 ; WX 1204 ; N parenright ; B 348 -68 893 517 ; @@ -57,6 +61,7 @@ C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; C 45 ; WX 1204 ; N hyphen ; B 565 -68 635 517 ; C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; C 47 ; WX 1204 ; N slash ; B 165 12 1035 632 ; +C 48 ; WX 1204 ; N zero ; B 348 -68 892 517 ; 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 943 567 ; @@ -145,5 +150,21 @@ C 134 ; WX 1204 ; N Eogonek ; B 300 15 900 435 ; C 135 ; WX 1204 ; N Gbreve ; B 405 127 755 517 ; C 136 ; WX 1204 ; N Lacute ; B 405 127 755 517 ; C 137 ; WX 1204 ; N Lcaron ; B 308 -68 853 517 ; +C 138 ; WX 1204 ; N Lslash ; B 565 167 635 477 ; +C 139 ; WX 1204 ; N Nacute ; B 565 -28 635 477 ; +C 140 ; WX 1204 ; N Ncaron ; B 353 287 847 357 ; +C 141 ; WX 1204 ; N Eng ; B 353 287 847 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 112 900 532 ; +C 143 ; WX 1204 ; N Racute ; B 300 112 900 532 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 15 900 435 ; +C 145 ; WX 1204 ; N Sacute ; B 445 127 795 517 ; +C 146 ; WX 1204 ; N Scaron ; B 445 127 795 517 ; +C 147 ; WX 1204 ; N Scedilla ; B 348 -68 892 517 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnn.afm index db55e3e598f..44d90747be8 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: Sun Aug 29 08:39:16 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:07:20 2019 FontName KnittingSymbols-nogrid-foreground-Medium FullName KnittingSymbols-nogrid-foreground FamilyName KnittingSymbols-nogrid-foreground @@ -12,19 +12,17 @@ UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox -1035 -298 5611 942 -CapHeight 738 -XHeight 712 -Ascender 762 -Descender 287 -StartCharMetrics 127 +FontBBox -1035 -313 5611 957 +CapHeight 532 +XHeight 697 +Ascender 775 +Descender -190 +StartCharMetrics 148 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 ; C 3 ; WX 1204 ; N tilde ; B 215 -218 985 202 ; C 4 ; WX 1204 ; N dieresis ; B 215 -218 985 202 ; -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 ; @@ -33,9 +31,13 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; 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 ; @@ -48,6 +50,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 252 1200 862 ; C 31 ; WX 6022 ; N ffl ; B 390 -218 5611 862 ; C 33 ; WX 1204 ; N exclam ; B 210 -68 990 712 ; C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 210 -68 950 712 ; +C 38 ; WX 1204 ; N ampersand ; B 160 -118 1040 762 ; C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; C 40 ; WX 1204 ; N parenleft ; B 210 -68 950 712 ; C 41 ; WX 1204 ; N parenright ; B 250 -68 990 712 ; @@ -57,6 +61,7 @@ C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; C 45 ; WX 1204 ; N hyphen ; B 565 -68 635 712 ; C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; C 47 ; WX 1204 ; N slash ; B 165 -85 1035 730 ; +C 48 ; WX 1204 ; N zero ; B 250 -68 990 712 ; 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 1040 762 ; @@ -75,22 +80,22 @@ 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 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 ; +C 67 ; WX 1204 ; N C ; B -35 -313 1235 957 ; +C 68 ; WX 1204 ; N D ; B -35 -313 1235 957 ; C 69 ; WX 1204 ; N E ; B 160 -118 1040 762 ; C 70 ; WX 1204 ; N F ; B -35 287 1235 672 ; -C 71 ; WX 1204 ; N G ; B 285 287 915 357 ; +C 71 ; WX 1204 ; N G ; B -35 -313 1235 957 ; 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 1041 762 ; +C 75 ; WX 1204 ; N K ; B -35 -313 1235 957 ; +C 76 ; WX 1204 ; N L ; B 200 -119 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 78 ; WX 1204 ; N N ; B -35 -313 1235 957 ; C 79 ; WX 1204 ; N O ; B 210 -68 990 712 ; -C 80 ; WX 1204 ; N P ; B 285 287 915 357 ; +C 80 ; WX 1204 ; N P ; B -35 -313 1235 957 ; C 81 ; WX 1204 ; N Q ; B 303 -68 897 760 ; -C 82 ; WX 1204 ; N R ; B 159 -118 1000 762 ; +C 82 ; WX 1204 ; N R ; B 159 -119 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 ; @@ -106,20 +111,20 @@ C 95 ; WX 0 ; N underscore ; B -1035 -78 1035 -8 ; C 96 ; WX 602 ; N quoteleft ; B 0 0 0 0 ; C 97 ; WX 1204 ; N a ; B 160 -118 1040 762 ; C 98 ; WX 1204 ; N b ; B 303 -68 897 760 ; -C 99 ; WX 1204 ; N c ; B 565 167 635 672 ; -C 100 ; WX 1204 ; N d ; B 348 127 892 712 ; -C 101 ; WX 1204 ; N e ; B 300 210 900 630 ; +C 99 ; WX 1204 ; N c ; B -35 -313 1235 957 ; +C 100 ; WX 1204 ; N d ; B -35 -313 1235 957 ; +C 101 ; WX 1204 ; N e ; B -35 -313 1235 957 ; C 102 ; WX 1204 ; N f ; B -35 287 1235 672 ; -C 103 ; WX 1204 ; N g ; B 285 287 915 357 ; +C 103 ; WX 1204 ; N g ; B -35 -313 1235 957 ; C 104 ; WX 1204 ; N h ; B 443 -113 757 722 ; C 105 ; WX 1204 ; N i ; B 250 -68 1014 738 ; C 106 ; WX 1204 ; N j ; B 186 -68 950 738 ; -C 107 ; WX 1204 ; N k ; B 565 167 635 672 ; +C 107 ; WX 1204 ; N k ; B -35 -313 1235 957 ; C 108 ; WX 1204 ; N l ; B 160 -118 1040 762 ; C 109 ; WX 1204 ; N m ; B 300 112 900 532 ; -C 110 ; WX 1204 ; N n ; B 300 210 900 630 ; -C 111 ; WX 1204 ; N o ; B 348 127 892 712 ; -C 112 ; WX 1204 ; N p ; B 285 287 915 357 ; +C 110 ; WX 1204 ; N n ; B -35 -313 1235 957 ; +C 111 ; WX 1204 ; N o ; B -35 -313 1235 957 ; +C 112 ; WX 1204 ; N p ; B -35 -313 1235 957 ; C 113 ; WX 1204 ; N q ; B 303 -68 897 760 ; C 114 ; WX 1204 ; N r ; B 160 -118 1040 762 ; C 115 ; WX 1204 ; N s ; B 200 166 1035 479 ; @@ -145,5 +150,21 @@ C 134 ; WX 1204 ; N Eogonek ; B 300 15 900 435 ; C 135 ; WX 1204 ; N Gbreve ; B 308 127 853 712 ; C 136 ; WX 1204 ; N Lacute ; B 308 127 853 712 ; C 137 ; WX 1204 ; N Lcaron ; B 308 -68 853 517 ; +C 138 ; WX 1204 ; N Lslash ; B 565 167 635 672 ; +C 139 ; WX 1204 ; N Nacute ; B 565 -28 635 477 ; +C 140 ; WX 1204 ; N Ncaron ; B 285 287 915 357 ; +C 141 ; WX 1204 ; N Eng ; B 285 287 915 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 210 900 630 ; +C 143 ; WX 1204 ; N Racute ; B 300 210 900 630 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 15 900 435 ; +C 145 ; WX 1204 ; N Sacute ; B 348 127 892 712 ; +C 146 ; WX 1204 ; N Scaron ; B 348 127 892 712 ; +C 147 ; WX 1204 ; N Scedilla ; B 348 -68 892 517 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B -35 -313 1235 957 ; +C 255 ; WX 1204 ; N germandbls ; B -35 -313 1235 957 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnp.afm index 810d5792dc7..975d61b9249 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: Sun Aug 29 08:39:13 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:07:40 2019 FontName KnittingSymbols-nogrid-purl-Medium FullName KnittingSymbols-nogrid-purl FamilyName KnittingSymbols-nogrid-purl @@ -14,15 +14,14 @@ Version 001.000 EncodingScheme FontSpecific FontBBox -1035 -298 1220 942 CapHeight 942 +XHeight 942 Descender -298 -StartCharMetrics 127 +StartCharMetrics 148 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 ; C 3 ; WX 1204 ; N tilde ; B 0 0 0 0 ; C 4 ; WX 1204 ; N dieresis ; B -20 -298 1220 942 ; -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 ; @@ -31,9 +30,13 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; 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 ; @@ -46,6 +49,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 0 0 0 ; C 31 ; WX 6022 ; N ffl ; B 0 0 0 0 ; C 33 ; WX 1204 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 1204 ; N quotedbl ; B 0 0 0 0 ; +C 35 ; WX 1204 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1204 ; N ampersand ; B 0 -278 1200 922 ; C 39 ; WX 602 ; N quoteright ; B 0 -278 600 922 ; C 40 ; WX 1204 ; N parenleft ; B 0 0 0 0 ; C 41 ; WX 1204 ; N parenright ; B 0 0 0 0 ; @@ -55,6 +60,7 @@ C 44 ; WX 1204 ; N comma ; B -20 -298 1220 942 ; C 45 ; WX 1204 ; N hyphen ; B 0 0 0 0 ; C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; C 47 ; WX 1204 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 1204 ; N zero ; B 0 0 0 0 ; C 49 ; WX 1204 ; N one ; B 0 0 0 0 ; C 50 ; WX 1204 ; N two ; B -20 -298 1220 942 ; C 51 ; WX 1204 ; N three ; B -20 -298 1220 942 ; @@ -85,7 +91,7 @@ C 75 ; WX 1204 ; N K ; B 0 0 0 0 ; C 76 ; WX 1204 ; N L ; B 0 0 0 0 ; C 77 ; WX 1204 ; N M ; B -20 -298 1220 942 ; C 78 ; WX 1204 ; N N ; B 0 0 0 0 ; -C 79 ; WX 1204 ; N O ; B 0 0 0 0 ; +C 79 ; WX 1204 ; N O ; B -20 -298 1220 942 ; C 80 ; WX 1204 ; N P ; B -20 -298 1220 942 ; C 81 ; WX 1204 ; N Q ; B -20 -298 1220 942 ; C 82 ; WX 1204 ; N R ; B 0 0 0 0 ; @@ -143,5 +149,21 @@ C 134 ; WX 1204 ; N Eogonek ; B 0 0 0 0 ; C 135 ; WX 1204 ; N Gbreve ; B 0 0 0 0 ; C 136 ; WX 1204 ; N Lacute ; B -20 -298 1220 942 ; C 137 ; WX 1204 ; N Lcaron ; B 0 0 0 0 ; +C 138 ; WX 1204 ; N Lslash ; B 0 0 0 0 ; +C 139 ; WX 1204 ; N Nacute ; B 0 0 0 0 ; +C 140 ; WX 1204 ; N Ncaron ; B -20 -298 1220 942 ; +C 141 ; WX 1204 ; N Eng ; B -20 -298 1220 942 ; +C 142 ; WX 1204 ; N Odblacute ; B 0 0 0 0 ; +C 143 ; WX 1204 ; N Racute ; B -20 -298 1220 942 ; +C 144 ; WX 1204 ; N Rcaron ; B 0 0 0 0 ; +C 145 ; WX 1204 ; N Sacute ; B 0 0 0 0 ; +C 146 ; WX 1204 ; N Scaron ; B -20 -298 1220 942 ; +C 147 ; WX 1204 ; N Scedilla ; B 0 0 0 0 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitnr.afm index b5064ebfda6..51a91e776de 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: Sun Aug 29 08:39:09 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:07:48 2019 FontName KnittingSymbols-nogrid-raised-Medium FullName KnittingSymbols-nogrid-raised FamilyName KnittingSymbols-nogrid-raised @@ -13,18 +13,16 @@ UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific FontBBox -1035 -298 5611 942 -CapHeight 738 -XHeight 712 -Ascender 762 +CapHeight 357 +XHeight 630 +Ascender 726 Descender 287 -StartCharMetrics 127 +StartCharMetrics 148 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 ; -C 3 ; WX 1204 ; N tilde ; B 313 -23 887 300 ; -C 4 ; WX 1204 ; N dieresis ; B 313 -23 887 300 ; -C 5 ; WX 0 ; N hungarumlaut ; B -1000 652 200 722 ; -C 6 ; WX 0 ; N ring ; B -1000 -78 200 -8 ; +C 3 ; WX 1204 ; N tilde ; B 312 -23 888 300 ; +C 4 ; WX 1204 ; N dieresis ; B 312 -23 888 300 ; 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 ; @@ -33,9 +31,13 @@ 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 15 ; WX 0 ; N guilsinglright ; B -1000 652 200 722 ; +C 16 ; WX 0 ; N quotedblleft ; B -1000 -78 200 -8 ; 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 ; @@ -48,6 +50,8 @@ C 30 ; WX 1204 ; N ffi ; B 0 350 1200 862 ; C 31 ; WX 6022 ; N ffl ; B 390 -23 5611 862 ; C 33 ; WX 1204 ; N exclam ; B 308 127 892 712 ; C 34 ; WX 1204 ; N quotedbl ; B 240 -114 1150 757 ; +C 35 ; WX 1204 ; N numbersign ; B 308 127 853 712 ; +C 38 ; WX 1204 ; N ampersand ; B 258 77 943 762 ; C 39 ; WX 602 ; N quoteright ; B 0 0 0 0 ; C 40 ; WX 1204 ; N parenleft ; B 308 127 853 712 ; C 41 ; WX 1204 ; N parenright ; B 348 127 893 712 ; @@ -57,6 +61,7 @@ C 44 ; WX 1204 ; N comma ; B 0 0 0 0 ; C 45 ; WX 1204 ; N hyphen ; B 565 127 635 712 ; C 46 ; WX 1204 ; N period ; B 0 0 0 0 ; C 47 ; WX 1204 ; N slash ; B 165 12 1035 632 ; +C 48 ; WX 1204 ; N zero ; B 348 127 892 712 ; 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 943 762 ; @@ -145,5 +150,21 @@ C 134 ; WX 1204 ; N Eogonek ; B 300 112 900 532 ; C 135 ; WX 1204 ; N Gbreve ; B 308 127 853 712 ; C 136 ; WX 1204 ; N Lacute ; B 308 127 853 712 ; C 137 ; WX 1204 ; N Lcaron ; B 405 127 755 517 ; +C 138 ; WX 1204 ; N Lslash ; B 565 167 635 672 ; +C 139 ; WX 1204 ; N Nacute ; B 565 167 635 477 ; +C 140 ; WX 1204 ; N Ncaron ; B 353 287 847 357 ; +C 141 ; WX 1204 ; N Eng ; B 353 287 847 357 ; +C 142 ; WX 1204 ; N Odblacute ; B 300 210 900 630 ; +C 143 ; WX 1204 ; N Racute ; B 300 210 900 630 ; +C 144 ; WX 1204 ; N Rcaron ; B 300 112 900 532 ; +C 145 ; WX 1204 ; N Sacute ; B 348 127 892 712 ; +C 146 ; WX 1204 ; N Scaron ; B 348 127 892 712 ; +C 147 ; WX 1204 ; N Scedilla ; B 445 127 795 517 ; +C 148 ; WX 1204 ; N Tcaron ; B 0 0 0 0 ; +C 149 ; WX 1204 ; N Tcedilla ; B 0 0 0 0 ; +C 150 ; WX 1204 ; N Udblacute ; B 0 0 0 0 ; +C 151 ; WX 1204 ; N Uring ; B 0 0 0 0 ; +C 254 ; WX 1204 ; N thorn ; B 0 0 0 0 ; +C 255 ; WX 1204 ; N germandbls ; B 0 0 0 0 ; EndCharMetrics EndFontMetrics 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 deleted file mode 100644 index a09b8a8a35d..00000000000 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_in.afm +++ /dev/null @@ -1,259 +0,0 @@ -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 deleted file mode 100644 index 710f1626092..00000000000 --- a/Master/texmf-dist/fonts/afm/public/knitting/knitw_sc_out.afm +++ /dev/null @@ -1,259 +0,0 @@ -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 62573ea6163..bb167459d40 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: Sun Aug 29 08:39:20 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:08:01 2019 FontName KnittingSymbols-wide-grid-Medium FullName KnittingSymbols-wide-grid FamilyName KnittingSymbols-wide-grid @@ -12,12 +12,12 @@ UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox -35 -293 8165 937 +FontBBox -15 -293 8165 937 CapHeight 937 XHeight 937 Ascender 937 Descender -293 -StartCharMetrics 237 +StartCharMetrics 240 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 ; @@ -30,18 +30,20 @@ C 18 ; WX 1636 ; N quotedblbase ; B -15 -293 1645 937 ; 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 ; +C 22 ; WX 818 ; N emdash ; B -15 -293 830 937 ; C 23 ; WX 1636 ; N compwordmark ; B -15 -293 1645 937 ; C 24 ; WX 1636 ; N perthousandzero ; B -15 -293 1645 937 ; C 25 ; WX 818 ; N dotlessi ; B -15 -293 815 937 ; C 26 ; WX 818 ; N dotlessj ; B 0 -293 830 937 ; C 27 ; WX 818 ; N ff ; B -15 -293 815 937 ; C 28 ; WX 818 ; N fi ; B 0 -293 830 937 ; -C 29 ; WX 1636 ; N fl ; B 0 -293 1630 937 ; -C 30 ; WX 1636 ; N ffi ; B 0 -293 1630 937 ; +C 29 ; WX 1636 ; N fl ; B -15 -293 1645 937 ; +C 30 ; WX 1636 ; N ffi ; B -15 -293 1645 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 0 0 0 0 ; +C 35 ; WX 1636 ; N numbersign ; B -15 -293 1645 937 ; +C 38 ; WX 1636 ; N ampersand ; B -15 -293 1645 937 ; 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 ; @@ -51,6 +53,7 @@ C 44 ; WX 1636 ; N comma ; B -15 -293 1645 937 ; C 45 ; WX 1636 ; N hyphen ; B -15 -293 1645 937 ; C 46 ; WX 1636 ; N period ; B -15 -293 1645 937 ; C 47 ; WX 1636 ; N slash ; B -15 -293 1645 937 ; +C 48 ; WX 1636 ; N zero ; B -15 -293 1645 937 ; C 49 ; WX 1636 ; N one ; B -15 -293 1645 937 ; C 50 ; WX 1636 ; N two ; B -15 -293 1645 937 ; C 51 ; WX 1636 ; N three ; B -15 -293 1645 937 ; @@ -71,8 +74,8 @@ C 65 ; WX 1636 ; N A ; B -15 -293 1645 937 ; C 66 ; WX 1636 ; N B ; B -15 -293 1645 937 ; C 67 ; WX 1636 ; N C ; B -15 -293 1645 937 ; C 68 ; WX 1636 ; N D ; B -15 -293 1645 937 ; -C 69 ; WX 1636 ; N E ; B 425 -68 1205 712 ; -C 70 ; WX 1636 ; N F ; B -35 287 1665 622 ; +C 69 ; WX 1636 ; N E ; B -15 -293 1645 937 ; +C 70 ; WX 1636 ; N F ; B 0 0 0 0 ; C 71 ; WX 1636 ; N G ; B -15 -293 1645 937 ; C 72 ; WX 1636 ; N H ; B -15 -293 1645 937 ; C 73 ; WX 1636 ; N I ; B -15 -293 1645 937 ; @@ -87,7 +90,7 @@ C 81 ; WX 1636 ; N Q ; B -15 -293 1645 937 ; C 82 ; WX 1636 ; N R ; B -15 -293 1645 937 ; C 83 ; WX 1636 ; N S ; B -15 -293 1645 937 ; C 84 ; WX 1636 ; N T ; B -15 -293 1645 937 ; -C 85 ; WX 1636 ; N U ; B -35 22 1665 622 ; +C 85 ; WX 1636 ; N U ; B 0 0 0 0 ; C 86 ; WX 1636 ; N V ; B -15 -293 1645 937 ; C 87 ; WX 1636 ; N W ; B -15 -293 1645 937 ; C 88 ; WX 1636 ; N X ; B -15 -293 1645 937 ; @@ -101,7 +104,7 @@ C 98 ; WX 1636 ; N b ; B -15 -293 1645 937 ; C 99 ; WX 1636 ; N c ; B -15 -293 1645 937 ; C 100 ; WX 1636 ; N d ; B -15 -293 1645 937 ; C 101 ; WX 1636 ; N e ; B -15 -293 1645 937 ; -C 102 ; WX 1636 ; N f ; B -35 287 1665 622 ; +C 102 ; WX 1636 ; N f ; B 0 0 0 0 ; C 103 ; WX 1636 ; N g ; B -15 -293 1645 937 ; C 104 ; WX 1636 ; N h ; B -15 -293 1645 937 ; C 105 ; WX 1636 ; N i ; B -15 -293 1645 937 ; diff --git a/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm b/Master/texmf-dist/fonts/afm/public/knitting/knitwn.afm index b18fab3399a..2467f89e876 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: Sun Aug 29 08:39:18 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:08:31 2019 FontName KnittingSymbols-wide-foreground-Medium FullName KnittingSymbols-wide-foreground FamilyName KnittingSymbols-wide-foreground @@ -12,11 +12,12 @@ UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox -35 -293 7617 937 -CapHeight 688 -XHeight 662 -Ascender 712 -StartCharMetrics 237 +FontBBox -35 -313 7617 957 +CapHeight 532 +XHeight 687 +Ascender 735 +Descender -166 +StartCharMetrics 240 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 ; @@ -41,6 +42,8 @@ C 30 ; WX 1636 ; N ffi ; B 0 252 1630 842 ; C 31 ; WX 8181 ; N ffl ; B 533 -198 7617 842 ; C 33 ; WX 1636 ; N exclam ; B 475 -18 1155 662 ; C 34 ; WX 1636 ; N quotedbl ; B 455 -114 1365 757 ; +C 35 ; WX 1636 ; N numbersign ; B 475 -18 1115 662 ; +C 38 ; WX 1636 ; N ampersand ; B 425 -68 1205 712 ; C 39 ; WX 818 ; N quoteright ; B 0 0 0 0 ; C 40 ; WX 1636 ; N parenleft ; B 475 -18 1115 662 ; C 41 ; WX 1636 ; N parenright ; B 515 -18 1155 662 ; @@ -50,6 +53,7 @@ C 44 ; WX 1636 ; N comma ; B 515 22 1115 622 ; C 45 ; WX 1636 ; N hyphen ; B 0 0 0 0 ; C 46 ; WX 1636 ; N period ; B 515 22 1115 622 ; C 47 ; WX 1636 ; N slash ; B 0 0 0 0 ; +C 48 ; WX 1636 ; N zero ; B 515 -18 1155 662 ; 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 1205 712 ; @@ -68,20 +72,20 @@ 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 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 ; +C 67 ; WX 1636 ; N C ; B -35 -313 1665 957 ; +C 68 ; WX 1636 ; N D ; B -35 -313 1665 957 ; C 69 ; WX 1636 ; N E ; B 425 -68 1205 712 ; C 70 ; WX 1636 ; N F ; B -35 287 1665 622 ; -C 71 ; WX 1636 ; N G ; B 0 0 0 0 ; +C 71 ; WX 1636 ; N G ; B -35 -313 1665 957 ; 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 75 ; WX 1636 ; N K ; B -35 -313 1665 957 ; 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 78 ; WX 1636 ; N N ; B -35 -313 1665 957 ; C 79 ; WX 1636 ; N O ; B 475 -18 1155 662 ; -C 80 ; WX 1636 ; N P ; B 0 0 0 0 ; +C 80 ; WX 1636 ; N P ; B -35 -313 1665 957 ; C 81 ; WX 1636 ; N Q ; B 557 -18 1073 710 ; C 82 ; WX 1636 ; N R ; B 425 -69 1165 712 ; C 83 ; WX 1636 ; N S ; B 430 182 1165 462 ; @@ -97,20 +101,20 @@ C 93 ; WX 1636 ; N bracketright ; B 391 110 1204 534 ; C 96 ; WX 818 ; N quoteleft ; B 0 0 0 0 ; C 97 ; WX 1636 ; N a ; B 425 -68 1205 712 ; C 98 ; WX 1636 ; N b ; B 557 -18 1073 710 ; -C 99 ; WX 1636 ; N c ; B 0 0 0 0 ; -C 100 ; WX 1636 ; N d ; B 0 0 0 0 ; -C 101 ; WX 1636 ; N e ; B 0 0 0 0 ; +C 99 ; WX 1636 ; N c ; B -35 -313 1665 957 ; +C 100 ; WX 1636 ; N d ; B -35 -313 1665 957 ; +C 101 ; WX 1636 ; N e ; B -35 -313 1665 957 ; C 102 ; WX 1636 ; N f ; B -35 287 1665 622 ; -C 103 ; WX 1636 ; N g ; B 0 0 0 0 ; +C 103 ; WX 1636 ; N g ; B -35 -313 1665 957 ; C 104 ; WX 1636 ; N h ; B 675 -63 955 672 ; C 105 ; WX 1636 ; N i ; B 515 -18 1179 688 ; C 106 ; WX 1636 ; N j ; B 451 -18 1115 688 ; -C 107 ; WX 1636 ; N k ; B 0 0 0 0 ; +C 107 ; WX 1636 ; N k ; B -35 -313 1665 957 ; C 108 ; WX 1636 ; N l ; B 425 -68 1205 712 ; C 109 ; WX 1636 ; N m ; B 515 112 1115 532 ; -C 110 ; WX 1636 ; N n ; B 0 0 0 0 ; -C 111 ; WX 1636 ; N o ; B 0 0 0 0 ; -C 112 ; WX 1636 ; N p ; B 0 0 0 0 ; +C 110 ; WX 1636 ; N n ; B -35 -313 1665 957 ; +C 111 ; WX 1636 ; N o ; B -35 -313 1665 957 ; +C 112 ; WX 1636 ; N p ; B -35 -313 1665 957 ; C 113 ; WX 1636 ; N q ; B 557 -18 1073 710 ; C 114 ; WX 1636 ; N r ; B 425 -68 1205 712 ; C 115 ; WX 1636 ; N s ; B 465 182 1200 462 ; @@ -126,14 +130,14 @@ 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 ; -C 129 ; WX 3272 ; N Aogonek ; B 0 0 0 0 ; -C 130 ; WX 3272 ; N Cacute ; B 0 0 0 0 ; -C 131 ; WX 3272 ; N Ccaron ; B 0 0 0 0 ; -C 132 ; WX 4908 ; N Dcaron ; B 0 0 0 0 ; -C 133 ; WX 4908 ; N Ecaron ; B 0 0 0 0 ; -C 134 ; WX 4908 ; N Eogonek ; B 0 0 0 0 ; -C 135 ; WX 4908 ; N Gbreve ; B 0 0 0 0 ; +C 128 ; WX 3272 ; N Abreve ; B -35 -313 3295 957 ; +C 129 ; WX 3272 ; N Aogonek ; B -35 -313 3295 957 ; +C 130 ; WX 3272 ; N Cacute ; B -35 -313 3295 957 ; +C 131 ; WX 3272 ; N Ccaron ; B -35 -313 3295 957 ; +C 132 ; WX 4908 ; N Dcaron ; B -35 -313 4925 957 ; +C 133 ; WX 4908 ; N Ecaron ; B -35 -313 4925 957 ; +C 134 ; WX 4908 ; N Eogonek ; B -35 -313 4925 957 ; +C 135 ; WX 4908 ; N Gbreve ; B -35 -313 4925 957 ; C 136 ; WX 3272 ; N Lacute ; B 0 0 0 0 ; C 137 ; WX 3272 ; N Lcaron ; B 0 0 0 0 ; C 138 ; WX 3272 ; N Lslash ; 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 97570dad786..143c9cb80e4 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: Sun Aug 29 08:39:21 2010 +Comment Generated by FontForge 20120731 +Comment Creation Date: Thu Apr 4 22:08:38 2019 FontName KnittingSymbols-wide-purl-Medium FullName KnittingSymbols-wide-purl FamilyName KnittingSymbols-wide-purl @@ -14,8 +14,9 @@ Version 001.000 EncodingScheme FontSpecific FontBBox 0 -278 8150 922 CapHeight 922 +XHeight 922 Descender -278 -StartCharMetrics 237 +StartCharMetrics 240 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 ; @@ -40,6 +41,8 @@ C 30 ; WX 1636 ; N ffi ; B 0 0 0 0 ; C 31 ; WX 8181 ; N ffl ; B 0 0 0 0 ; C 33 ; WX 1636 ; N exclam ; B 0 0 0 0 ; C 34 ; WX 1636 ; N quotedbl ; B 0 0 0 0 ; +C 35 ; WX 1636 ; N numbersign ; B 0 0 0 0 ; +C 38 ; WX 1636 ; N ampersand ; B 0 -278 1630 922 ; C 39 ; WX 818 ; N quoteright ; B 0 -278 815 922 ; C 40 ; WX 1636 ; N parenleft ; B 0 0 0 0 ; C 41 ; WX 1636 ; N parenright ; B 0 0 0 0 ; @@ -48,7 +51,8 @@ C 43 ; WX 1636 ; N plus ; B 0 -278 1630 922 ; C 44 ; WX 1636 ; N comma ; B 0 -278 1630 922 ; C 45 ; WX 1636 ; N hyphen ; B 0 0 0 0 ; C 46 ; WX 1636 ; N period ; B 0 0 0 0 ; -C 47 ; WX 1636 ; N slash ; B 0 -278 1630 922 ; +C 47 ; WX 1636 ; N slash ; B 15 -263 1615 907 ; +C 48 ; WX 1636 ; N zero ; B 0 0 0 0 ; C 49 ; WX 1636 ; N one ; B 0 0 0 0 ; C 50 ; WX 1636 ; N two ; B 0 -278 1630 922 ; C 51 ; WX 1636 ; N three ; B 0 -278 1630 922 ; @@ -79,7 +83,7 @@ C 75 ; WX 1636 ; N K ; B 0 0 0 0 ; C 76 ; WX 1636 ; N L ; B 0 0 0 0 ; C 77 ; WX 1636 ; N M ; B 0 -278 1630 922 ; C 78 ; WX 1636 ; N N ; B 0 0 0 0 ; -C 79 ; WX 1636 ; N O ; B 0 0 0 0 ; +C 79 ; WX 1636 ; N O ; B 0 -278 1630 922 ; C 80 ; WX 1636 ; N P ; B 0 -278 1630 922 ; C 81 ; WX 1636 ; N Q ; B 0 -278 1630 922 ; C 82 ; WX 1636 ; N R ; 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 f28f8d241ef..f9ee9a780b3 100644 --- a/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map +++ b/Master/texmf-dist/fonts/map/dvips/knitting/knitfont.map @@ -1,20 +1,23 @@ knitnn KnittingSymbols-nogrid-foreground-Medium <knitnn.pfb knitwn KnittingSymbols-wide-foreground-Medium <knitwn.pfb knitgn KnittingSymbols-grid-foreground-Medium <knitgn.pfb +knitmn KnittingSymbols-mixed-foreground-Medium <knitmn.pfb knitnp KnittingSymbols-nogrid-purl-Medium <knitnp.pfb knitwp KnittingSymbols-wide-purl-Medium <knitwp.pfb knitgp KnittingSymbols-grid-purl-Medium <knitgp.pfb +knitmp KnittingSymbols-mixed-purl-Medium <knitmp.pfb knitnr KnittingSymbols-nogrid-raised-Medium <knitnr.pfb knitnl KnittingSymbols-nogrid-lowered-Medium <knitnl.pfb +knitmr KnittingSymbols-mixed-raised-Medium <knitmr.pfb +knitml KnittingSymbols-mixed-lowered-Medium <knitml.pfb knitgg KnittingSymbols-grid-grid-Medium <knitgg.pfb knitwg KnittingSymbols-wide-grid-Medium <knitwg.pfb +knitmg KnittingSymbols-mixed-grid-Medium <knitmg.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 e705e163dfb..5066b71a814 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knit_dimens.mf @@ -1,4 +1,4 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 widewd# = 16.3pt#; % This is as wide as a cell can be without causing problems with 5-cell-wide symbols @@ -8,6 +8,7 @@ if known wd#: else: wd# = 12 pt#; fi symbolwidth#=0.7pt#; purl_symbolwidth#=0.7pt#; finesymbolwidth# = 0.4pt#; + dotwidth# = 1pt#; gridwidth# = if gridfont: 0.3pt# else: 0pt# fi; overlinewd# = if gridfont: 1.5pt# else: 0.8pt# fi; @@ -37,10 +38,14 @@ cableextend# := 0pt#; % cable connectors, or in wide increases and decreases, you might want % to make this nonzero. -if gridfont: +if known gridcables: else: boolean gridcables; gridcables = gridfont; fi + +nogrid_purlextend# := 0.2pt#; + +if gridcables: purlextend# := 0pt#; else: -purlextend# := 0.2pt#; +purlextend# := nogrid_purlextend#; fi % Purlextend affects how far outside their box the purl background goes. @@ -52,14 +57,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, finesymbolwidth, overlinewidth); +define_blacker_pixels(cableextend,purlextend,nogrid_purlextend,gridwidth,symbolwidth, + purl_symbolwidth, finesymbolwidth, overlinewidth, dotwidth); 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 dotwidth; dot_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; 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 e127626bd5e..f101cd98664 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,4 +1,4 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 picture symbolpic[]; @@ -18,22 +18,21 @@ endchar; code := 127; +beginchar("-",wd#,ht#,dp#); "A knit stitch"; + charbox; endchar; +beginchar("=",wd#,ht#,dp#); "A purl stitch"; + purlbox; endchar; 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; + (0.5(w-standardheight),h-topgap) -- + (0.5(w+standardheight),h-topgap) -- + (0.5(w+standardheight),-d+bottomgap) -- cycle; symbolpic0 := currentpicture; charbox; endchar; beginchar(",",incrwidth(0,0),ht#,dp#); "Purl no stitch"; currentpicture := symbolpic0; purlbox; endchar; - -beginchar("-",wd#,ht#,dp#); "A knit stitch"; - charbox; endchar; -beginchar("=",wd#,ht#,dp#); "A purl stitch"; - purlbox; endchar; - + % Cables cablelinewidth#:=0.4pt#; @@ -43,32 +42,46 @@ pickup pencircle scaled cablelinewidth; cable_pen := savepen; % The one-letter cells beginchar("p",wd#,ht#,dp#); "Purl cable background"; + currentpicture := errorsymbol1; purlbox; endchar; beginchar("P",wd#,ht#,dp#); "Purl cable foreground"; + currentpicture := errorsymbol1; purlbox; endchar; beginchar("k",wd#,ht#,dp#); "Knit cable background"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("K",wd#,ht#,dp#); "Knit cable foreground"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("g",wd#,ht#,dp#); "Purl cable background"; + currentpicture := errorsymbol1; purlbox; endchar; beginchar("G",wd#,ht#,dp#); "Purl cable foreground"; + currentpicture := errorsymbol1; purlbox; endchar; beginchar("c",wd#,ht#,dp#); "Knit cable background"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("C",wd#,ht#,dp#); "Knit cable foreground"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("d",wd#,ht#,dp#); "White knit cable background"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("D",wd#,ht#,dp#); "White knit cable foreground"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("n",wd#,ht#,dp#); "Odd knit cable background"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("N",wd#,ht#,dp#); "Odd knit cable foreground"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("e",wd#,ht#,dp#); "Odd twist"; + currentpicture := errorsymbol1; charbox; endchar; beginchar("o",wd#,ht#,dp#); "Odd twist"; + currentpicture := errorsymbol1; charbox; endchar; % Horizontal cables @@ -96,7 +109,7 @@ specialhoriz := ASCII"/"; beginchar(midhoriz,wd#,ht#,dp#); "Middle of a horizontal cable"; charbox; pickup pensquare scaled cablelinewidth; - x1=x4=0; x2=x3=w; bot y1=bot y2= -d+bottomgap; top y3=top y4=h-topgap; + x1=x4=gridwidth/2; x2=x3=w-gridwidth/2; bot y1=bot y2= -d+bottomgap; top y3=top y4=h-topgap; if (fonttype = gridtype) or (fonttype = bothtype): draw rt z1--lft z2; draw lft z3--rt z4; fi @@ -104,15 +117,17 @@ beginchar(midhoriz,wd#,ht#,dp#); "Middle of a horizontal cable"; fill z1--z2--(w,-d)--(0,-d)--cycle; fill z4--z3--(w,h)--(0,h)--cycle; fi + labels(1,2,3,4); endchar; beginchar(specialhoriz,wd#,ht#,dp#); "Special horizontal cable"; charbox; pickup pensquare scaled cablelinewidth; - x1=x4=0; x2=x3=w; bot y1=bot y2= -d+bottomgap; top y3=top y4=h-topgap; + x1=x4=gridwidth/2; x2=x3=w-gridwidth/2; + bot y1=bot y2= -d+bottomgap; top y3=top y4=h-topgap; x5=x6; x7=x8; x7-x5 = y3-y2; 0.5[x7,x5]=0.5w; - y5=y7=-d; y6=y8=h; + y5=y7=-d+gridwidth/2; y6=y8=h-gridwidth/2; if (fonttype = gridtype) or (fonttype = bothtype): draw top z5--bot z6; draw top z7--bot z8; @@ -128,10 +143,11 @@ beginchar(specialhoriz,wd#,ht#,dp#); "Special horizontal cable"; fill (x3,y8)--z3--(x8,y3)--z8--cycle; fill (x4,y6)--z4--(x6,y4)--z6--cycle; fi + labels(1,2,3,4,5,6,7,8); endchar; -beginchar(righthoriz,wd#,ht#,dp#); "Right end of a horizontal cable"; +beginchar(righthoriz,if fonttype = counttype: 0 else: wd# fi,ht#,dp#); "Right end of a horizontal cable"; fliphoriz(symbolpic0)(currentpicture); endchar; @@ -154,24 +170,28 @@ numeric botcableleft[][]; numeric botcableright[][]; for sts = 2 upto 3: cableright[0][sts][0] := incr code; beginchar(code, (sts)*wd#,ht#,dp#); decimal sts&" cable background stitches"; + addto currentpicture also errorsymbol[sts]; charbox; endchar; cableleft[sts][0][0] := incr code; beginchar(code, (sts)*wd#,ht#,dp#); decimal sts&" cable foreground stitches"; - charbox; endchar; + addto currentpicture also errorsymbol[sts]; + charbox; endchar; revcableright[0][sts] := incr code; beginchar(code, (sts)*wd#,ht#,dp#); decimal sts&" twist background stitches"; - purlbox; endchar; + addto currentpicture also errorsymbol[sts]; + purlbox; endchar; revcableleft[sts][0] := incr code; beginchar(code, (sts)*wd#,ht#,dp#); decimal sts&" twist foreground stitches"; - purlbox; endchar; + addto currentpicture also errorsymbol[sts]; + purlbox; endchar; endfor % Draw the cables -if known slantlines: else: boolean slantlines; slantlines = false; fi +if known slantcutoff: else: slantcutoff = 0; fi for backsts = 1 upto 3: for frontsts = 1 upto 3: @@ -213,32 +233,19 @@ beginchar(cableleft[frontsts][backsts][midsts],totsts * wd#,ht#,dp#); if (fonttype = gridtype) or (fonttype = bothtype): % Define top and bottom points - if slantlines: for k=0 upto totsts: - z.bot[k] = (k*wd,-d); - z.top[k] = (k*wd,h); - penpos.bot[k] (frontstroke, 0); - penpos.top[k] (frontstroke, 0); + z.bot[k] = (k*wd,-d); + z.top[k] = (k*wd,h); + penpos.bot[k] (frontstroke, 0); + penpos.top[k] (frontstroke, 0); + endfor + + for k=0 upto totsts: + labels(bot[k],top[k],bot[k]l,bot[k]r,top[k]l,top[k]r); endfor - else: - z.top[0] = (0,h); - z.top[frontsts] = (frontsts*wd,h); - z.top[totsts] = (totsts*wd,h); - z.bot[0] = (0,-d); - z.bot[backsts] = (backsts*wd,-d); - z.bot[totsts] = (totsts*wd,-d); - if midsts > 0: - z.bot[backsts+midsts] = ((backsts+midsts)*wd,-d); - z.top[frontsts+midsts] = ((frontsts+midsts)*wd,h); - fi - penpos.bot[backsts+midsts] (frontstroke, 0); - penpos.top[0] (frontstroke, 0); - penpos.bot[totsts] (frontstroke, 0); - penpos.top[frontsts] (frontstroke, 0); - fi % Draw the lines on the front cable - if slantlines: + if slantcutoff > (backsts+midsts-1): for k=1 upto frontsts-1: penstroke z.top[k]e -- z.bot[k+backsts+midsts]e; endfor @@ -266,23 +273,12 @@ beginchar(cableleft[frontsts][backsts][midsts],totsts * wd#,ht#,dp#); slip = whatever * (-backsts,1); % Define some more points - if slantlines: for k=0 upto backsts: z.ur[k] = whatever [z.top0,z.bot[backsts+midsts]]; z.ur[k] = whatever [z.bot[k],z.top[frontsts+midsts+k]]; z.ll[k] = whatever [z.bot[totsts],z.top[frontsts]]; z.ll[k] = whatever [z.bot[k],z.top[frontsts+midsts+k]]; endfor - else: - z.ur[0] = whatever [z.top0,z.bot[backsts+midsts]]; - z.ur[0] = whatever [z.bot0,z.top[frontsts+midsts]]; - z.ll[backsts] = whatever [z.bot[totsts],z.top[frontsts]]; - z.ll[backsts] = whatever [z.bot[backsts],z.top[totsts]]; - z.ur[backsts] = whatever [z.top0,z.bot[backsts+midsts]]; - z.ur[backsts] = whatever [z.bot[backsts],z.top[totsts]]; - z.ll[0] = whatever [z.bot[totsts],z.top[frontsts]]; - z.ll[0] = whatever [z.bot[0],z.top[frontsts+midsts]]; - fi % Top back lines fill z.top[totsts]+(-backstroke,0) -- z.top[totsts] -- z.top[totsts]+(0,-ypart(slip)) -- z.ll[backsts]-slip -- z.ll[backsts]+slip --cycle; @@ -291,7 +287,7 @@ beginchar(cableleft[frontsts][backsts][midsts],totsts * wd#,ht#,dp#); fill z.top[frontsts+midsts]+(-backstroke,0) -- z.top[frontsts+midsts]+(backstroke,0) -- z.ll[0]-slip -- z.ll[0]+slip --cycle; fi - if slantlines: + if slantcutoff > (frontsts+midsts-1): for k=1 upto backsts-1: fill z.top[frontsts+midsts+k]+(-backstroke,0) -- z.top[frontsts+midsts+k]+(backstroke,0) -- z.ll[k]-slip -- z.ll[k]+slip --cycle; endfor @@ -306,7 +302,7 @@ beginchar(cableleft[frontsts][backsts][midsts],totsts * wd#,ht#,dp#); fill z.bot[backsts]+(backstroke,0) -- z.bot[backsts]-(backstroke,0) -- z.ur[backsts]+slip -- z.ur[backsts]-slip --cycle; fi - if slantlines: + if slantcutoff > (frontsts+midsts-1): for k=1 upto backsts-1: fill z.bot[k]+(backstroke,0) -- z.bot[k]-(backstroke,0) -- z.ur[k]+slip -- z.ur[k]-slip --cycle; endfor @@ -355,7 +351,20 @@ beginchar(twistleft[frontsts][backsts],totsts * wd#,ht#,dp#); % Twist/twist front "Twist " & decimal(frontsts) & " over " &decimal(backsts); charbox; - if fonttype <> purltype: currentpicture := symbolpic1; + if fonttype <> purltype: + currentpicture := symbolpic1; + % Draw some missing lines + for k=1 upto backsts-1: + z.bot[k] = (k*wd,-d); + x.slant.bot[k] = k*wd; + z.slant.bot[k] = whatever[(0,h),(backsts*wd,-d)]; + draw z.bot[k]--z.slant.bot[k]; + + z.top[k] = ((frontsts+k)*wd,h); + x.slant.top[k] = (frontsts+k)*wd; + z.slant.top[k] = whatever[(frontsts*wd,h),(w,-d)]; %whatever[(w,-d),(w-backsts*wd,h)]; + draw z.top[k]--z.slant.top[k]; + endfor else: fill (0,h)--(wd*backsts,-d)--(0,-d)--cycle; % Bottom triangle fill (w,-d)--(wd*frontsts,h)--(w,h)--cycle; % Top triangle 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 126d1f28176..a99f64d9c66 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,26 +1,27 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 -beginchar(",",incrwidth(0,0),ht#,dp#); "No stitch"; - purlbox; - endchar; -beginchar(".",incrwidth(0,0),ht#,dp#); "No stitch"; - endchar; - - path purlbar; +code := 127; + +if known debugcables: else: boolean debugcables; debugcables = true; fi beginchar("-",wd#,ht#,dp#); "A knit stitch"; pickup symbol_pen; draw bot (w/2,h-topgap+o) -- top (w/2, -d+bottomgap-o); charbox; endchar; +path purlbar; beginchar("=",wd#,ht#,dp#); "A purl stitch"; pickup symbol_pen; lft x1-rt x2 = 0.7standardheight; x1+x2=w; y1=y2=0.5[h,-d]; purlbar = z1--z2; draw purlbar; purlbox; endchar; - -code := 127; - +beginchar(",",incrwidth(0,0),ht#,dp#); "No stitch"; + purlbox; + endchar; +beginchar(".",incrwidth(0,0),ht#,dp#); "No stitch"; + charbox; + endchar; + %Cables kright := incr code; @@ -34,12 +35,116 @@ dright := incr code; oright := incr code; Dright := incr code; +%if debugcables: +kleft := incr code; +Kleft := incr code; +pleft := incr code; +Pleft := incr code; +nleft := incr code; +eleft := incr code; +Nleft := incr code; +dleft := incr code; +oleft := incr code; +Dleft := incr code; +%fi + +% Cable background/foreground blocks (empty cables) +cablebgblock := 255; +cablefgblock := 254; +cablebgblockright := incr code; +cablefgblockright := incr code; +cablebgblockleft := incr code; +cablefgblockleft := incr code; + +% Grid outlines and empty cables + left_cable_grid := incr code; + mid_cable_grid := incr code; +right_cable_grid_bg := incr code; +right_cable_grid_fg := incr code; + left_cable_grid_rt := incr code; + mid_cable_grid_rt := incr code; +right_cable_grid_rt := incr code; + +% Empty boxes +if gridfont: + noknitleft := incr code; + noknitmid := incr code; + noknitright:= incr code; + nopurlleft := incr code; + nopurlmid := incr code; + nopurlright:= incr code; + + beginchar(noknitleft, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Left no stitch"; + leftgrid_charbox; + endchar; + beginchar(noknitmid, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Middle no stitch"; + topbotgrid_charbox; + endchar; + beginchar(noknitright, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Right no stitch"; + rightgrid_charbox; + endchar; + + beginchar(nopurlleft, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Left no stitch"; + leftgrid_charbox; + if fonttype = purltype: + fill + ( 0,-d)-- + (w+nogrid_purlextend,-d)-- + (w+nogrid_purlextend, h)-- + ( 0, h)--cycle; + fi + endchar; + beginchar(nopurlmid, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Middle no stitch"; + topbotgrid_charbox; + if fonttype = purltype: + fill + ( -nogrid_purlextend,-d)-- + (w+nogrid_purlextend,-d)-- + (w+nogrid_purlextend, h)-- + ( -nogrid_purlextend, h)--cycle; + fi + endchar; + beginchar(nopurlright, if fonttype = counttype: 0 else: wd# fi, ht#, dp#); "Right no stitch"; + rightgrid_charbox; + if fonttype = purltype: + fill + ( -nogrid_purlextend,-d)-- + (w,-d)-- + (w, h)-- + ( -nogrid_purlextend, h)--cycle; + fi + endchar; + + ligtable ".": "." =:| noknitleft; + ligtable noknitleft: "." |=: noknitright; + ligtable noknitright: "." =:| noknitmid; + ligtable noknitmid: "." |=: noknitright; + + ligtable ",": "," =:| nopurlleft; + ligtable nopurlleft: "," |=: nopurlright; + ligtable nopurlright: "," =:| nopurlmid; + ligtable nopurlmid: "," |=: nopurlright; +fi + +% Cable background blocks + +beginchar(cablebgblock, wd#, ht#, dp#); + addto currentpicture also errorsymbol1; + endchar; +beginchar(cablefgblock, wd#, ht#, dp#); + addto currentpicture also errorsymbol1; + endchar; +beginchar(cablebgblockright, wd#, ht#, dp#); endchar; +beginchar(cablefgblockright, wd#, ht#, dp#); endchar; +beginchar(cablebgblockleft, wd#, ht#, dp#); endchar; +beginchar(cablefgblockleft, wd#, ht#, dp#); endchar; + midhoriz := 20; righthoriz := 21; specialhoriz := ASCII"/"; -cabletopleft := 5; -cablebotleft := 6; +cabletopleft := 15; +cablebotleft := 16; cabletopright:= 7; cablebotright:= 8; @@ -65,21 +170,22 @@ beginchar("+",wd#,ht#,dp#); "Horizontal cable"; symbolpath1 := z.ll--z.lr; draw symbolpath0; draw symbolpath1; symbolpic0 := currentpicture; - charbox; endchar; + leftgrid_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; + topbotgrid_charbox; endchar; +beginchar(righthoriz,if fonttype = counttype: 0 else: wd# fi,ht#,dp#); "Right end of a horizontal cable"; + currentpicture := symbolpic0; + rightgrid_charbox; endchar; + +ligtable "+": specialhoriz: + "+" |=: righthoriz; +ligtable righthoriz: + "+" |=: righthoriz, + specialhoriz =:| midhoriz, + righthoriz =:| midhoriz; + beginchar(specialhoriz,wd#,ht#,dp#); "Special horizontal cable"; pickup symbol_pen; @@ -94,16 +200,25 @@ beginchar(specialhoriz,wd#,ht#,dp#); "Special horizontal cable"; draw lft (w/2-specialspread,y.lr)--z.ll; draw (w/2+specialspread,HCttop)--(w/2+specialspread,HCbbot); draw (w/2-specialspread,HCttop)--(w/2-specialspread,HCbbot); - charbox; endchar; + topbotgrid_charbox; endchar; beginchar("k",wd#,ht#,dp#); "Knit cable background"; pickup symbol_pen; + %if gridfont: + %drawdot (w/2, 0.5[botcableheight+cablevertgap,h-topgap]); + %else: draw top (w/2, botcableheight+cablevertgap)--bot(w/2,h-topgap); + %fi charbox; symbolpic0 := currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar("c",wd#,ht#,dp#); "Knit cable background"; currentpicture := symbolpic0; + addto currentpicture also errorsymbol1; + endchar; +beginchar(kleft,wd#,ht#,dp#); "Knit cable background"; + currentpicture := symbolpic0; endchar; beginchar(kright,wd#,ht#,dp#); "Knit cable background"; currentpicture := symbolpic0; @@ -111,17 +226,24 @@ beginchar(kright,wd#,ht#,dp#); "Knit cable background"; beginchar("p",wd#,ht#,dp#); "Purl cable background"; pickup symbol_pen; + %if gridfont: + %drawdot (w/2, 0.5[botcableheight+cablevertgap,h-topgap]); + %else: draw purlbar; - purlbox; + %fi + charbox; purlfill; symbolpic0 := currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar("g",wd#,ht#,dp#); "Purl cable background"; currentpicture := symbolpic0; - purlbox; + addto currentpicture also errorsymbol1; endchar; beginchar(pright,wd#,ht#,dp#); "Purl cable background"; currentpicture := symbolpic0; - purlbox; + endchar; +beginchar(pleft,wd#,ht#,dp#); "Purl cable background"; + currentpicture := symbolpic0; endchar; beginchar("n",incrwidth(0,1),ht#,dp#); "Back make one"; @@ -129,81 +251,123 @@ beginchar("n",incrwidth(0,1),ht#,dp#); "Back make one"; drawM(h-topgap, botcableheight+cablevertgap, 0.5wd,symbolwidth); charbox; symbolpic0:=currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar(nright,incrwidth(0,1),ht#,dp#); "Back make one"; currentpicture := symbolpic0; endchar; +beginchar(nleft,incrwidth(0,1),ht#,dp#); "Back make one"; + currentpicture := symbolpic0; endchar; beginchar("e",incrwidth(0,1),ht#,dp#); "Back purlwise make one"; pickup purl_symbol_pen; drawM(h-topgap, botcableheight+cablevertgap, 0.5wd,purl_symbolwidth); - symbolpic0:=currentpicture; purlbox; + charbox; purlfill; + symbolpic0:=currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar(eright,incrwidth(0,1),ht#,dp#); "Back purlwise make one"; currentpicture := symbolpic0; - purlbox; +endchar; +beginchar(eleft,incrwidth(0,1),ht#,dp#); "Back purlwise make one"; + currentpicture := symbolpic0; endchar; beginchar("N",incrwidth(0,1),ht#,dp#); "Front make one"; pickup symbol_pen; drawM(topcableheight-cablevertgap, -d+bottomgap, 0.5wd,symbolwidth); + charbox; symbolpic0 := currentpicture; -charbox; endchar; + addto currentpicture also errorsymbol1; +endchar; beginchar(Nright,incrwidth(0,1),ht#,dp#); "Front make one"; currentpicture := symbolpic0; -charbox; endchar; +endchar; +beginchar(Nleft,incrwidth(0,1),ht#,dp#); "Front make one"; + currentpicture := symbolpic0; +endchar; beginchar("d",decrwidth(2,1),ht#,dp#); "Back decrease"; pickup symbol_pen; drawSSK(h-topgap, botcableheight+cablevertgap); - charbox; symbolpic0:=currentpicture; + charbox; + symbolpic0:=currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar(dright,decrwidth(2,1),ht#,dp#); "Back decrease"; fliphoriz(symbolpic0)(currentpicture); endchar; +beginchar(dleft,decrwidth(2,1),ht#,dp#); "Back decrease"; + currentpicture := symbolpic0; endchar; beginchar("o",decrwidth(2,1),ht#,dp#); "Back purl decrease"; pickup purl_symbol_pen; drawSSK(h-topgap, botcableheight+cablevertgap); - symbolpic0:=currentpicture; purlbox; + charbox; purlfill; + symbolpic0:=currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar(oright,decrwidth(2,1),ht#,dp#); "Back purl decrease"; fliphoriz(symbolpic0)(currentpicture); - purlbox; + endchar; +beginchar(oleft,decrwidth(2,1),ht#,dp#); "Back purl decrease"; + currentpicture := symbolpic0;; endchar; beginchar("D",decrwidth(2,1),ht#,dp#); "Front decrease"; pickup symbol_pen; drawSSK(topcableheight-cablevertgap,-d+bottomgap); - charbox; symbolpic0:=currentpicture; + charbox; + symbolpic0:=currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar(Dright,decrwidth(2,1),ht#,dp#); "Front decrease"; fliphoriz(symbolpic0)(currentpicture); endchar; +beginchar(Dleft,decrwidth(2,1),ht#,dp#); "Front decrease"; + currentpicture := symbolpic0; endchar; beginchar("K",wd#,ht#,dp#); "Knit cable foreground"; pickup symbol_pen; + %if gridfont: + %drawdot (w/2, 0.5[-d+bottomgap,topcableheight-cablevertgap]); + %else: draw top (w/2, -d+bottomgap)--bot(w/2,topcableheight-cablevertgap); + %fi charbox; symbolpic0 := currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar("C",wd#,ht#,dp#); "Knit cable foreground"; currentpicture := symbolpic0; + addto currentpicture also errorsymbol1; endchar; beginchar(Kright,wd#,ht#,dp#); "Knit cable foreground"; currentpicture := symbolpic0; endchar; +beginchar(Kleft,wd#,ht#,dp#); "Knit cable foreground"; + currentpicture := symbolpic0; + endchar; beginchar("P",wd#,ht#,dp#); "Purl cable foreground"; + %if gridfont: + %pickup dot_pen; + %drawdot (w/2, 0.5[-d+bottomgap,topcableheight-cablevertgap]); + %else: pickup symbol_pen; draw purlbar; - purlbox; + %fi + charbox; purlfill; symbolpic0 := currentpicture; + addto currentpicture also errorsymbol1; endchar; beginchar("G",wd#,ht#,dp#); "Purl cable foreground"; currentpicture := symbolpic0; + addto currentpicture also errorsymbol1; endchar; beginchar(Pright,wd#,ht#,dp#); "Purl cable foreground"; currentpicture := symbolpic0; - purlbox; + endchar; +beginchar(Pleft,wd#,ht#,dp#); "Purl cable foreground"; + currentpicture := symbolpic0; endchar; beginchar("_",0,ht#,dp#); "Cable bottom connector"; @@ -281,10 +445,24 @@ beginchar(cableleftbackslash,0,ht#,dp#); "Cable slash connector"; beginchar(cablerightslash,0,ht#,dp#); "Cable slash connector"; currentpicture := symbolpic0 reflectedabout ((0,0),(0,h)); endchar; + +if gridfont: +beginchar(left_cable_grid,wd#,ht#,dp#); "Left-end cable outlines"; + leftgrid_charbox; endchar; +beginchar(mid_cable_grid,wd#,ht#,dp#); "Cable outlines"; + topbotgrid_charbox; endchar; +beginchar(mid_cable_grid_rt,wd#,ht#,dp#); "Cable outlines"; + topbotgrid_charbox; endchar; +beginchar(right_cable_grid_bg,wd#,ht#,dp#); "Right-end cable outlines"; + rightgrid_charbox; endchar; +beginchar(right_cable_grid_fg,wd#,ht#,dp#); "Right-end cable outlines"; + rightgrid_charbox; endchar; +beginchar(right_cable_grid_rt,wd#,ht#,dp#); "Right-end cable outlines"; + rightgrid_charbox; endchar; +fi -if fonttype = foretype: - -ligtable +if fonttype = gridtype: +ligtable "k": "p": "c": @@ -293,6 +471,119 @@ ligtable "e": "n": "d": +cablebgblock: + "k" |=: right_cable_grid_bg, + "c" |=: right_cable_grid_bg, + "n" |=: right_cable_grid_bg, + "d" |=: right_cable_grid_bg, + "p" |=: right_cable_grid_bg, + "g" |=: right_cable_grid_bg, + "e" |=: right_cable_grid_bg, + "o" |=: right_cable_grid_bg, + cablebgblock |=: right_cable_grid_bg, + "K" |=: right_cable_grid_rt, + "P" |=: right_cable_grid_rt, + "C" |=: right_cable_grid_rt, + "G" |=: right_cable_grid_rt, + "N" |=: right_cable_grid_rt, + "D" |=: right_cable_grid_rt, + cablefgblock |=: right_cable_grid_rt, + right_cable_grid_rt =:| left_cable_grid, + right_cable_grid_bg =:| left_cable_grid; + +ligtable +"K": +"P": +"C": +"G": +"N": +"D": +cablefgblock: + "k" |=: right_cable_grid_rt, + "c" |=: right_cable_grid_rt, + "n" |=: right_cable_grid_rt, + "d" |=: right_cable_grid_rt, + "p" |=: right_cable_grid_rt, + "g" |=: right_cable_grid_rt, + "e" |=: right_cable_grid_rt, + "o" |=: right_cable_grid_rt, + cablebgblock |=: right_cable_grid_rt, + "K" |=: right_cable_grid_fg, + "P" |=: right_cable_grid_fg, + "C" |=: right_cable_grid_fg, + "G" |=: right_cable_grid_fg, + "N" |=: right_cable_grid_fg, + "D" |=: right_cable_grid_fg, + cablefgblock |=: right_cable_grid_fg, + right_cable_grid_rt =:| left_cable_grid, + right_cable_grid_fg =:| left_cable_grid; + +ligtable +right_cable_grid_fg: + "k" |=: right_cable_grid_rt, + "n" |=: right_cable_grid_rt, + "d" |=: right_cable_grid_rt, + "p" |=: right_cable_grid_rt, + "e" |=: right_cable_grid_rt, + "o" |=: right_cable_grid_rt, + cablebgblock |=: right_cable_grid_rt, + "K" |=: right_cable_grid_fg, + "P" |=: right_cable_grid_fg, + "C" |=: right_cable_grid_fg, + "G" |=: right_cable_grid_fg, + "N" |=: right_cable_grid_fg, + "D" |=: right_cable_grid_fg, + cablefgblock |=: right_cable_grid_fg, + right_cable_grid_rt =:| mid_cable_grid, + right_cable_grid_fg =:| mid_cable_grid; +ligtable +right_cable_grid_bg: + "k" |=: right_cable_grid_bg, + "c" |=: right_cable_grid_bg, + "n" |=: right_cable_grid_bg, + "d" |=: right_cable_grid_bg, + "p" |=: right_cable_grid_bg, + "g" |=: right_cable_grid_bg, + "e" |=: right_cable_grid_bg, + "o" |=: right_cable_grid_bg, + cablebgblock |=: right_cable_grid_bg, + "K" |=: right_cable_grid_rt, + "P" |=: right_cable_grid_rt, + "N" |=: right_cable_grid_rt, + "D" |=: right_cable_grid_rt, + cablefgblock |=: right_cable_grid_rt, + right_cable_grid_rt =:| mid_cable_grid, + right_cable_grid_bg =:| mid_cable_grid; +ligtable +right_cable_grid_rt: + "k" |=: right_cable_grid_rt, + "n" |=: right_cable_grid_rt, + "d" |=: right_cable_grid_rt, + "p" |=: right_cable_grid_rt, + "e" |=: right_cable_grid_rt, + "o" |=: right_cable_grid_rt, + cablebgblock |=: right_cable_grid_rt, + "K" |=: right_cable_grid_rt, + "P" |=: right_cable_grid_rt, + "N" |=: right_cable_grid_rt, + "D" |=: right_cable_grid_rt, + cablefgblock |=: right_cable_grid_rt, + right_cable_grid_rt =:| mid_cable_grid; +fi + +if fonttype = foretype: + +for leftglyph = "k", "p", "o", "e", "n", "d", "c", "g", "cablebgblock": + if leftglyph = "cablebgblock": + leftglyphlig := cablebgblockleft; + elseif leftglyph = "c": + leftglyphlig := kleft; + elseif leftglyph = "g": + leftglyphlig := pleft; + else: + leftglyphlig := scantokens (leftglyph & "left"); + fi +ligtable if leftglyph = "cablebgblock": cablebgblock else: leftglyph fi: "k" |=:| cablebotleft, "c" |=:| cablebotleft, "n" |=:| cablebotleft, @@ -301,38 +592,53 @@ ligtable "g" |=:| cablebotleft, "e" |=:| cablebotleft, "o" |=:| cablebotleft, + cablebgblock |=:| cablebotleft, "K" |=:| rightslash, "P" |=:| rightslash, "N" |=:| rightslash, "D" |=:| rightslash, - rightslash |=:| cableleftslash; - -ligtable -"K": -"P": -"C": -"G": -"N": -"D": + cablefgblock |=:| rightslash, + rightslash |=:| cableleftslash, + cablebotleft =:| leftglyphlig, + cableleftslash =:| leftglyphlig; +endfor + +for leftglyph = "K", "P", "C", "G", "N", "D", "cablefgblock": + if leftglyph = "cablefgblock": + leftglyphlig := cablefgblockleft; + elseif leftglyph = "C": + leftglyphlig := Kleft; + elseif leftglyph = "G": + leftglyphlig := Pleft; + else: + leftglyphlig := scantokens (leftglyph & "left"); + fi +ligtable if leftglyph = "cablefgblock": cablefgblock else: leftglyph fi: "K" |=:| cabletopleft, "P" |=:| cabletopleft, "G" |=:| cabletopleft, "C" |=:| cabletopleft, "N" |=:| cabletopleft, "D" |=:| cabletopleft, + cablefgblock |=:| cabletopleft, "k" |=:| leftslash, "p" |=:| leftslash, "o" |=:| leftslash, "e" |=:| leftslash, "n" |=:| leftslash, "d" |=:| leftslash, - leftslash |=:| cableleftbackslash; - + cablebgblock |=:| leftslash, + leftslash |=:| cableleftbackslash, + cabletopleft =:| leftglyphlig, + cableleftbackslash =:| leftglyphlig; +endfor + ligtable Kright: Pright: Nright: Dright: +cablefgblockright: "K" |=: Kright, Kright |=:| cabletopright, "P" |=: Pright, @@ -340,7 +646,9 @@ Dright: "N" |=: Nright, Nright |=:| cabletopright, "D" |=: Dright, - Dright |=:| cabletopright; + Dright |=:| cabletopright, + cablefgblock |=: cablefgblockright, + cablefgblockright |=:| cabletopright; ligtable kright: @@ -349,6 +657,7 @@ oright: eright: nright: dright: +cablebgblockright: "k" |=: kright, kright |=:| cablebotright, "p" |=: pright, @@ -360,7 +669,9 @@ dright: "n" |=: nright, nright |=:| cablebotright, "d" |=: dright, - dright |=:| cablebotright; + dright |=:| cablebotright, + cablebgblock |=: cablebgblockright, + cablebgblockright |=:| cablebotright; ligtable rightslash: "K" |=: Kright, @@ -370,7 +681,9 @@ ligtable rightslash: "N" |=: Nright, Nright |=:| cablerightslash, "D" |=: Dright, - Dright |=:| cablerightslash; + Dright |=:| cablerightslash, + cablefgblock |=: cablefgblockright, + cablefgblockright |=:| cablerightslash; ligtable leftslash: "k" |=: kright, "p" |=: pright, @@ -378,11 +691,13 @@ ligtable leftslash: "e" |=: eright, "n" |=: nright, "d" |=: dright, + cablebgblock |=: cablebgblockright, kright |=:| cablerightbackslash, nright |=:| cablerightbackslash, dright |=:| cablerightbackslash, pright |=:| cablerightbackslash, eright |=:| cablerightbackslash, - oright |=:| cablerightbackslash; + oright |=:| cablerightbackslash, + cablebgblockright |=:| cablerightbackslash; fi 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 e39d923d6bd..e0fb61c80af 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knit_symbols.mf @@ -1,4 +1,4 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 % Don't flash pictures of the characters as you draw them. % This is dizzying, and UNIX can't do it anyway. @@ -29,41 +29,80 @@ enddef; purltype = 0; gridtype = 1; foretype = 2; -bothtype = 3; +bothtype = 3; % Both the grid and the symbols 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"; + % extra_endchar := extra_endchar & " pickup pencircle scaled 0.2pt; if w>0: draw (0,-d)--(0,h); draw (w,-d)--(w,h); fi "; fi +def nogrid_charbox = + if (fonttype = purltype) or (fonttype = gridtype): + currentpicture := nullpicture; + fi + enddef; + +def leftgrid_charbox = + if (fonttype = purltype): currentpicture := nullpicture; fi + if (fonttype = gridtype): currentpicture := nullpicture; fi + if (fonttype = gridtype) or (fonttype = bothtype): + pickup pensquare scaled gridwidth; + draw lft (w,h)--(0,h); + draw (0,h)--(0,-d); + draw (0,-d)--lft (w,-d); + fi +enddef; + +def rightgrid_charbox = + if (fonttype = purltype): currentpicture := nullpicture; fi + if (fonttype = gridtype): currentpicture := nullpicture; fi + if (fonttype = gridtype) or (fonttype = bothtype): + pickup pensquare scaled gridwidth; + draw (w,h)--rt (0,h); + draw (w,h)--(w,-d); + draw rt (0,-d)--(w,-d); + fi +enddef; + +def topbotgrid_charbox = + if (fonttype = purltype): currentpicture := nullpicture; fi + if (fonttype = gridtype): currentpicture := nullpicture; fi + if (fonttype = gridtype) or (fonttype = bothtype): + pickup pensquare scaled gridwidth; + draw (w,h)--(0,h); + draw (0,-d)--(w,-d); + fi +enddef; + if gridfont: def charbox = - if fonttype = purltype: - currentpicture := nullpicture; - else: - if fonttype = gridtype: currentpicture := nullpicture; fi - if (fonttype = gridtype) or (fonttype = bothtype): - 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; - 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; + if fonttype = purltype: + currentpicture := nullpicture; + fi + if fonttype = gridtype: currentpicture := nullpicture; fi + if (fonttype = gridtype) or (fonttype = bothtype): + 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; + 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 fi - fi enddef; else: -def charbox = - if fonttype = purltype: - currentpicture := nullpicture; - fi - enddef; +def charbox = nogrid_charbox enddef; fi def purlbox = charbox; purlfill; enddef; +% We don't need any symbols in the counting fonts because we will never +% actually show them and clearing them saves a bit of disk space. +if fonttype = counttype: + def charbox = currentpicture := nullpicture; enddef; + def purlbox = currentpicture := nullpicture; enddef; +fi + picture symbolpic[]; path symbolpath[]; @@ -86,7 +125,30 @@ def definearrow(text thepath, arrowlength, endpath) = --arrowpoint + ((1,0) rotated (arrowdir-150) scaled arrowlength) ; enddef; - + +% Error symbols (glyphs that should not happen) + +if known debugcables: else: boolean debugcables; debugcables = true; fi + +picture errorsymbol[]; +for k=1,2,3: + errorsymbol[k] = nullpicture; +endfor +if debugcables: + errorslashes = 4; + if (fonttype=foretype) or (fonttype=bothtype): + for j=1,2,3: + for k=(1/errorslashes) step (1/errorslashes) until 0.99: + addto errorsymbol[j] doublepath ((0,k[-dp,ht])--(k[wd,0],.001pt+ht)) withpen (pencircle scaled symbolwidth); + addto errorsymbol[j] doublepath ((j*wd,k[-dp,ht])--(k[j*wd,(j-1)*wd],.001pt-dp)) withpen (pencircle scaled symbolwidth); + endfor + for k=0 step (1/errorslashes) until (j-1): + addto errorsymbol[j] doublepath ((k*wd,-dp)--((k+1)*wd,ht)) withpen (pencircle scaled symbolwidth); + endfor + endfor + fi +fi + % Arrow symbols beginchar("s",wd#,ht#,dp#); "Slip one left"; @@ -164,7 +226,7 @@ beginchar("O",incrwidth(0,1),ht#,dp#); "Yarn over"; penpos3(symbolwidth,270); penpos4(symbolwidth,180); penstroke z1e..z2e..z3e..z4e..cycle; - charbox; endchar; + purlbox; endchar; beginchar("@",wd#,ht#,dp#); "Bead"; pickup symbol_pen; @@ -177,7 +239,6 @@ beginchar("@",wd#,ht#,dp#); "Bead"; charbox; endchar; 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; @@ -201,12 +262,12 @@ beginchar(ditto,incrwidth(0,0),ht#,dp#); "Wrap and turn"; definearrow(symbolpath0)((x4-x2)/2)(symbolpath1); draw symbolpath0; draw symbolpath1; - fi symbolpic0 := currentpicture; symbolpicwd0 := w; -endchar; + nogrid_charbox; endchar; beginchar(19,incrwidth(0,0),ht#,dp#); "Reverse wrap and turn"; - fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); - endchar; + fliphoriz(symbolpic0)(currentpicture); + currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); + nogrid_charbox; endchar; ligtable ditto: @@ -324,15 +385,12 @@ beginchar(4,wd#,ht#,dp#); "Purl make N from 1"; purlbox; endchar; beginchar("U",incrwidth(0,1),ht#,dp#); "Cast on"; - if fonttype <> purltype: pickup symbol_pen; bot y1 = bot y3 = -d+bottomgap; x1 = 0; x3 = w; x2 = w/2; top y2 = h-topgap; draw z1{right}..z2{left}..z3{right}; - fi - endchar; + nogrid_charbox; endchar; beginchar("f",decrwidth(1,0),ht#,dp#); "Bind off knitwise"; - if fonttype <> purltype: pickup symbol_pen; x3-x1=wd; 0.5[x1,x3]=w/2; x2 = 0.5[x1,x3]; y1 = y3 = (h-d)/2; top y2 = h-topgap; @@ -340,14 +398,13 @@ beginchar("f",decrwidth(1,0),ht#,dp#); "Bind off knitwise"; symbolpath0 := z1..z2{right}..z3; draw symbolpath0; %draw z4--bot z1; - fi - endchar; + nogrid_charbox; endchar; beginchar("F",decrwidth(1,0),ht#,dp#); "Bind off purlwise"; if fonttype <> purltype: pickup purl_symbol_pen; draw symbolpath0; fi - purlfill; endchar; + nogrid_charbox; purlfill; endchar; beginchar("Z",incrwidth(1,3),ht#,dp#); "Knit one doubly elongated"; pickup symbol_pen; 0.5[z1,z7] = top (w/2, -d+min_bottomgap); @@ -427,43 +484,26 @@ beginchar("9",incrwidth(1,2),ht#,dp#); "CYCA knit one elongated"; beginchar(25,wd#/2,ht#,dp#); "Left end of a wide increase"; - if fonttype <> purltype: pickup pensquare xscaled wideinctip yscaled wideincline; z1 = (w+cableextend,(h-topgap-d+bottomgap)/2); x2 = w/3; top y2 = h-min_topgap+o; fill bot lft z2{down}..bot z1{right}--top z1{left}..top rt z2{up}--top lft z2---cycle; - if gridfont: - if fonttype = gridtype: currentpicture := nullpicture; fi - if (fonttype = gridtype) or (fonttype = bothtype): - pickup pensquare scaled gridwidth; - draw lft (w,h)--(0,h); - draw (0,h)--(0,-d); - draw (0,-d)--lft (w,-d); - fi fi fi symbolpic0 := currentpicture; symbolpicwd0 := w; - endchar; + leftgrid_charbox; endchar; beginchar(22,wd#/2,ht#,dp#); "Extender for a wide increase/decrease"; - if fonttype <> purltype: z1 = (w+cableextend,(h-topgap-d+bottomgap)/2); x2 = 0-cableextend; y2 = y1; pickup pensquare scaled wideincline; draw rt z2 -- lft z1; - if gridfont: - if fonttype = gridtype: currentpicture := nullpicture; fi - if (fonttype = gridtype) or (fonttype = bothtype): - pickup pensquare scaled gridwidth; - draw lft (w,h) -- rt (0,h); draw rt (0,-d) -- lft (w,-d); - fi fi fi - endchar; + topbotgrid_charbox; endchar; beginchar(26,wd#/2,ht#,dp#); "Right end of a wide increase"; - fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); endchar; + fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); rightgrid_charbox; endchar; beginchar(27,wd#/2,ht#,dp#); "Left end of a wide decrease"; - flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); endchar; + flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); leftgrid_charbox; endchar; beginchar(28,wd#/2,ht#,dp#); "Right end of a wide decrease"; - fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); flipvert(currentpicture)(currentpicture);endchar; + fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); flipvert(currentpicture)(currentpicture); rightgrid_charbox; endchar; beginchar(29,wd#,ht#,dp#); "Middle of a wide increase"; - if fonttype <> purltype: pickup pensquare xscaled wideinctip yscaled wideincline; z1 = (-cableextend,(h-topgap-d+bottomgap)/2); z3 = (w+cableextend,(h-topgap-d+bottomgap)/2); @@ -472,16 +512,12 @@ beginchar(29,wd#,ht#,dp#); "Middle of a wide increase"; fill bot lft z2{up}..bot z1{left}--top z1{right}..top rt z2---bot rt z2--cycle; %draw z3{left}..z2{down}; fill bot rt z2{up}..bot z3{right}--top z3{left}..top lft z2---bot lft z2--cycle; - if gridfont: - if fonttype = gridtype: currentpicture := nullpicture; fi - if (fonttype = gridtype) or (fonttype = bothtype): - pickup pensquare scaled gridwidth; - draw lft (w,h) -- rt (0,h); draw rt (0,-d) -- lft (w,-d); - fi fi fi symbolpic0 := currentpicture; symbolpicwd0 := w; + topbotgrid_charbox; endchar; beginchar(30,wd#,ht#,dp#); "Middle of a wide decrease"; flipvert(symbolpic0)(currentpicture); currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); + topbotgrid_charbox; endchar; if 5*wd# < symbolmaxwd#: @@ -498,8 +534,7 @@ beginchar(31,if fonttype = counttype: decrwidth(5,1) else: 5wd# fi,ht#,dp#); "Ma fill bot lft z2---top lft z2..top z4{right}..top lft z1{up}--top rt z1---bot rt z1..bot z4{left }..bot rt z2{down}--cycle; fill bot rt z3---top rt z3..top z5{left }..top rt z1{up}--top lft z1---bot lft z1..bot z5{right}..bot lft z3{down}--cycle; - charbox; - endchar; + charbox; endchar; fi beginchar("~",incrwidth(0,0),ht#,dp#); "Empty box (spacer)"; endchar; @@ -554,11 +589,10 @@ beginchar("M",incrwidth(0,1),ht#,dp#); "Make one purlwise"; % purlbox; endchar; beginchar("|",if fonttype <> counttype: overlinewd# else: 0 fi,ht#,dp#); "Divider"; - if fonttype <> purltype: + if (fonttype = foretype) or (fonttype = bothtype): fill(0,-d-gridwidth/2-purlextend)--(0,h+gridwidth/2+purlextend) --(w,h+gridwidth/2+purlextend)--(w,-d-gridwidth/2-purlextend) --cycle; - if gridfont: if fonttype = gridtype: currentpicture := nullpicture; fi fi fi endchar; @@ -662,8 +696,18 @@ beginchar("<",decrwidth(2,1),ht#,dp#); "SSK or left-slant cable"; symbolpic0 := currentpicture; symbolpicwd0 := w; charbox; endchar; beginchar(">",decrwidth(2,1),ht#,dp#); "k2tog or right-slant cable"; - fliphoriz(symbolpic0)(currentpicture); currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); + fliphoriz(symbolpic0)(currentpicture); + currentpicture := currentpicture shifted (-(w-symbolpicwd0)/2,0); charbox; endchar; + +beginchar("0",incrwidth(1,2),ht#,dp#); "Make 2 from 1"; + flipvert(symbolpic0)(currentpicture); + charbox; endchar; +beginchar("#",incrwidth(1,2),ht#,dp#); "Make 2 from 1"; + flipvert(symbolpic0)(currentpicture); + fliphoriz(currentpicture)(currentpicture); + charbox; endchar; + beginchar(";",decrwidth(2,1),ht#,dp#); "P2tog"; pickup purl_symbol_pen; draw symbolpath0; @@ -811,9 +855,11 @@ beginchar("Y",incrwidth(1,3),ht#,dp#); "Make 3 from 1 with YO center"; beginchar("E",incrwidth(1,3),ht#,dp#); "make 3 from 1 with purl center"; pickup symbol_pen; - if fonttype <> purltype: - currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); - else: + if (fonttype = foretype) or (fonttype = bothtype): + currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); + fi + charbox; + if (fonttype = purltype): z1 = point 0 of symbolpath0; z2 = point 1 of symbolpath0; z3 = point 2 of symbolpath0; @@ -821,6 +867,21 @@ beginchar("E",incrwidth(1,3),ht#,dp#); "make 3 from 1 with purl center"; fi endchar; +beginchar("&",incrwidth(1,3),ht#,dp#); "make 3 from 1 with knit center"; + pickup symbol_pen; + if (fonttype = foretype) or (fonttype = bothtype): + currentpicture := symbolpic0; currentpicture := currentpicture shifted ((w-symbolpicwd0)/2,0); + fi + charbox; + if (fonttype = purltype): + z1 = point 0 of symbolpath0; + z2 = point 1 of symbolpath0; + z3 = point 2 of symbolpath0; + fill z1--z2--z3--%z1--(0,h)-- + (w,h)--(w,-d)--(0,-d)--(0,h)--cycle; + fi + endchar; + 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); @@ -940,7 +1001,7 @@ beginchar("a",decrwidth(3,1),ht#,dp#); "LRC"; trianglecharwd# = 19/3 pt#; beginchar("}", trianglecharwd#, 6.25pt#, 0); "Triangle pointing right"; - if (fonttype = foretype) or (fonttype = bothtype) or (fonttype = counttype): + if (fonttype = foretype) or (fonttype = bothtype): x1=x2=w-x3-max(purlextend, 0.5gridwidth)=4/3pt; y3=.5h; y1-y3=y3-y2; y1-y2 = 1.3*(x3-x1); @@ -1084,3 +1145,19 @@ ligtable 18: "1" |=: 18, 18 =:| 17; +% Outlines + +if gridfont: + +beginchar(5,wd#,ht#,dp#); "Top and bottom outlines"; + topbotgrid_charbox; endchar; + +beginchar(6,0,ht#,dp#); "Vertical grid line"; + pickup pensquare scaled gridwidth; + if (fonttype = gridtype) or (fonttype = bothtype): + draw (0,-d)--(0,h); + fi +endchar; + +fi + 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 index b0af5c39aa4..c5df48332be 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_in.mf @@ -1,10 +1,9 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := true; -boolean slantlines; slantlines = false; -fonttype = counttype; +fonttype = counttype; % Count stitches only -- don't draw anything def incrwidth (expr stsin, stsout) = stsin*wd# enddef; def decrwidth (expr stsin, stsout) = stsin*wd# enddef; 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 index 1166146ffcd..3aa0c481f84 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitg_sc_out.mf @@ -1,10 +1,9 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := true; -boolean slantlines; slantlines = false; -fonttype = counttype; +fonttype = counttype; % Count stitches only -- don't draw anything def incrwidth (expr stsin, stsout) = stsout*wd# enddef; def decrwidth (expr stsin, stsout) = stsout*wd# enddef; diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf b/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf index 627630fd076..329b3d60dfa 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitgg.mf @@ -1,8 +1,9 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := true; +slantcutoff = 2; % Draw slant lines if there are 1 or 2 background cables fonttype = gridtype; % Show grid only input knit_dimens; diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf b/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf index c47ef4dc985..0b61cc263c7 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitgn.mf @@ -1,9 +1,8 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := true; -boolean slantlines; slantlines = false; fonttype = foretype; % Show symbols only - no grid input knit_dimens; diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitmg.mf b/Master/texmf-dist/fonts/source/public/knitting/knitmg.mf new file mode 100644 index 00000000000..c02a442a5f8 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knitting/knitmg.mf @@ -0,0 +1,22 @@ +% Date: 2019/04/05 + +mode_setup; + +boolean gridfont; gridfont := true; +fonttype = gridtype; % Show grid only + +input knit_dimens; + +if known ps_output: + font_identifier := "KnittingSymbols-mixed-grid"; +fi + +string Vtitle; Vtitle := "Knit font with grid and stylized cables"; + +input knit_symbols; + +input knit_nogrid_cables; + +end + + diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitml.mf b/Master/texmf-dist/fonts/source/public/knitting/knitml.mf new file mode 100644 index 00000000000..8fc86426168 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knitting/knitml.mf @@ -0,0 +1,27 @@ +% Date: 2019/04/05 + +mode_setup; + +boolean gridfont; gridfont := true; +boolean debugcables; debugcables := false; +fonttype = foretype; % Show symbols + +bottomgap# = standardgap#; +topgap# = ht#-topcableheight#+cablevertgap#; + +input knit_dimens; + +if known ps_output: + font_identifier :="KnittingSymbols-nogrid-lowered"; +fi + +string Vtitle; Vtitle := "Knit font, grid and stylized cable symbols"; + +input knit_symbols; + +pickup symbol_pen; + +input knit_nogrid_cables; + + +end diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitmn.mf b/Master/texmf-dist/fonts/source/public/knitting/knitmn.mf new file mode 100644 index 00000000000..c3832f75826 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knitting/knitmn.mf @@ -0,0 +1,22 @@ +% Date: 2019/04/05 + +mode_setup; + +boolean gridfont; gridfont := true; +fonttype = foretype; % Show symbols only - no grid + +input knit_dimens; + +if known ps_output: + font_identifier := "KnittingSymbols-mixed-foreground"; +fi + +string Vtitle; Vtitle := "Knit font with grid and stylized cables"; + +input knit_symbols; + +input knit_nogrid_cables; + +end + + diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitmp.mf b/Master/texmf-dist/fonts/source/public/knitting/knitmp.mf new file mode 100644 index 00000000000..f7cce6c2208 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knitting/knitmp.mf @@ -0,0 +1,23 @@ +% Date: 2019/04/05 + +mode_setup; + +boolean gridfont; gridfont := true; +boolean gridcables; gridcables := false; +fonttype = purltype; % Gray purl background + +input knit_dimens; + +if known ps_output: + font_identifier := "KnittingSymbols-mixed-purl"; +fi + +string Vtitle; Vtitle := "Knit font with grid and stylized cables"; + +input knit_symbols; + +input knit_nogrid_cables; + +end + + diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitmr.mf b/Master/texmf-dist/fonts/source/public/knitting/knitmr.mf new file mode 100644 index 00000000000..fb8ec620389 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/knitting/knitmr.mf @@ -0,0 +1,27 @@ +% Date: 2019/04/05 + +mode_setup; + +boolean gridfont; gridfont := true; +boolean debugcables; debugcables := false; +fonttype = foretype; % Show symbols + +bottomgap# = dp#+botcableheight#+cablevertgap#; +topgap# = standardgap#; + +input knit_dimens; + +if known ps_output: + font_identifier := "KnittingSymbols-mixed-raised"; +fi + +string Vtitle; Vtitle := "Knit font, grid and stylized cable symbols"; + +input knit_symbols; + +pickup symbol_pen; + +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 6e04a8ee958..0097ee88ad3 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitnl.mf @@ -1,8 +1,9 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := false; +boolean debugcables; debugcables := false; fonttype = foretype; % Show symbols bottomgap# = standardgap#; diff --git a/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf b/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf index 081a17f3e2d..5d30c8d1297 100644 --- a/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf +++ b/Master/texmf-dist/fonts/source/public/knitting/knitnr.mf @@ -1,8 +1,9 @@ -% Date: 2010/08/10 +% Date: 2019/04/05 mode_setup; boolean gridfont; gridfont := false; +boolean debugcables; debugcables := false; fonttype = foretype; % Show symbols bottomgap# = dp#+botcableheight#+cablevertgap#; 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 deleted file mode 100644 index c7f4cb7534e..00000000000 --- a/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_in.mf +++ /dev/null @@ -1,25 +0,0 @@ -% 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 deleted file mode 100644 index 9a0dd7c60bc..00000000000 --- a/Master/texmf-dist/fonts/source/public/knitting/knitw_sc_out.mf +++ /dev/null @@ -1,25 +0,0 @@ -% 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/tfm/public/knitting/knitg_sc_in.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm Binary files differindex 49c0da3a07e..13cc414a548 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_in.tfm 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 Binary files differindex 802c5232784..a785635cc92 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitg_sc_out.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm Binary files differindex 77262c7bdbe..b21143314d7 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgg.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm Binary files differindex 77262c7bdbe..b21143314d7 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgn.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm Binary files differindex 77262c7bdbe..b21143314d7 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitgp.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitmg.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitmg.tfm Binary files differnew file mode 100644 index 00000000000..67daa9dfc82 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitmg.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitml.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitml.tfm Binary files differnew file mode 100644 index 00000000000..e284b443bc4 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitml.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitmn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitmn.tfm Binary files differnew file mode 100644 index 00000000000..cf308be91f1 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitmn.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitmp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitmp.tfm Binary files differnew file mode 100644 index 00000000000..5e28f762cad --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitmp.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitmr.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitmr.tfm Binary files differnew file mode 100644 index 00000000000..c24600544be --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitmr.tfm 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 Binary files differindex fa5c2d6fee6..2736a0c7fcb 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_in.tfm 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 Binary files differindex 8c617c9a2f7..e7ebab32116 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitn_sc_out.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm Binary files differindex d6906e22e46..2c07d5a8f9c 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnl.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm Binary files differindex 5bce8e5e278..1f12e780007 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnn.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm Binary files differindex fa6d0f9f467..b4fa72e03d5 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnp.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm Binary files differindex 834647d22c3..f27bf5875b7 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitnr.tfm 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 Binary files differdeleted file mode 100644 index b2fe229faac..00000000000 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_in.tfm +++ /dev/null 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 Binary files differdeleted file mode 100644 index cc893d64225..00000000000 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitw_sc_out.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm Binary files differindex 779e4dede72..35078f184a1 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwg.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm Binary files differindex 779e4dede72..35078f184a1 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwn.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm b/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm Binary files differindex 779e4dede72..35078f184a1 100644 --- a/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm +++ b/Master/texmf-dist/fonts/tfm/public/knitting/knitwp.tfm 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 Binary files differindex bfdd320cfca..3816553bedd 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_in.pfb 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 Binary files differindex a6e3b0e7e63..654b8cc935d 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitg_sc_out.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb Binary files differindex 2dce948a1e5..51f0f871d8e 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgg.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb Binary files differindex 034eb86655d..f7b2e08583d 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgn.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb Binary files differindex 419bebb5029..3ea57a2dab3 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitgp.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitmg.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitmg.pfb Binary files differnew file mode 100644 index 00000000000..028fdce8586 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitmg.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitml.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitml.pfb Binary files differnew file mode 100644 index 00000000000..3bf9a5664a4 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitml.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitmn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitmn.pfb Binary files differnew file mode 100644 index 00000000000..436adc7c415 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitmn.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitmp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitmp.pfb Binary files differnew file mode 100644 index 00000000000..3e56d3bd1e7 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitmp.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitmr.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitmr.pfb Binary files differnew file mode 100644 index 00000000000..db44617d310 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitmr.pfb 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 Binary files differindex 09fbb76e866..90cb3d56154 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_in.pfb 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 Binary files differindex 39b0db6024b..08b9379f3fb 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitn_sc_out.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb Binary files differindex 567eec256d1..3386bdc0dab 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnl.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb Binary files differindex 903ba909cb6..b2b124c5a87 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnn.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb Binary files differindex 375508e755f..25f216050f5 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnp.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb Binary files differindex badc1df682c..1cce62cd2bb 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitnr.pfb 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 Binary files differdeleted file mode 100644 index ab0b55b26a4..00000000000 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_in.pfb +++ /dev/null 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 Binary files differdeleted file mode 100644 index ec559203d2b..00000000000 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitw_sc_out.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb Binary files differindex dd6da7fe8d5..46e4283e449 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwg.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb Binary files differindex 668f09a7ee0..5caa6cfc9de 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwn.pfb diff --git a/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb b/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb Binary files differindex 9a9f7e31c4b..208bcf86854 100644 --- a/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb +++ b/Master/texmf-dist/fonts/type1/public/knitting/knitwp.pfb diff --git a/Master/texmf-dist/tex/latex/knitting/knitting.sty b/Master/texmf-dist/tex/latex/knitting/knitting.sty index 7a8410c8791..2a73d0224c5 100644 --- a/Master/texmf-dist/tex/latex/knitting/knitting.sty +++ b/Master/texmf-dist/tex/latex/knitting/knitting.sty @@ -22,31 +22,46 @@ % 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 +% Version: 3 -\ProvidesPackage{knitting}[2010/08/29] +\ProvidesPackage{knitting}[2019/04/03] %\pdfmapfile{+knitfont.map} +% +% Boolean variables +% + \newif \ifchartsonly \chartsonlyfalse \newif \ifgrid +\newif \ifknitsymbol \newif \ifresetrn \resetrntrue \newif \ifleftrn@knit \newif \ifshowrn@knit \showrn@knittrue \newif \ifpdf@knit \newif \ifcountingout@knit +\newif \ifCountStsThisRow@knit \CountStsThisRow@knittrue \pdf@knittrue \ifx \pdfoutput \undefined \pdf@knitfalse \fi \ifx \pdfoutput \relax \pdf@knitfalse \fi +% +% Color commands +% + \RequirePackage{color} \definecolor{purlgray}{gray}{0.65} \definecolor{knitlinecolor}{rgb}{0.7,0,0} \definecolor{gridcolor}{gray}{0.3} +\definecolor{forecolor}{gray}{0} \definecolor{rncolor}{rgb}{0.6,0,0} \definecolor{rnarrowcolor}{rgb}{0.45,0,0} +% +% LaTeX-only material (options and fullpages) +% + \DeclareOption{chartsonly}{\chartsonlytrue} \ProcessOptions @@ -71,7 +86,7 @@ \addtolength{\textheight}{-2in} \setlength{\textwidth}{\paperwidth} \addtolength{\textwidth}{-2in} - % This bit is borrowed from Peter Wilson's chngpage.sty + % This next 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 @@ -87,6 +102,10 @@ } {\clearpage} +% +% Dimensions +% + \newlength \leftgap@knit \newlength \bgshift@knit \newlength \chartwidth@knit @@ -98,15 +117,18 @@ \newbox\fgbox@knit \newbox\ggbox@knit -\newcounter{rownumber} +\newcounter{rownumber} \newcounter{tempcount@knit} -\newcounter{rownumberskip} \setcounter{rownumberskip}{1} +\newcounter{rownumberskip} \c@rownumberskip = 1 \newcounter{stitchcountin} \newcounter{stitchcountinprev} \newcounter{stitchcountout} +\newcounter{shortrowstsin@knit} +\newcounter{shortrowstsout@knit} \newcommand \passnum@knit{2} \newcommand \stitchwd{\fontdimen6\csname U/knit/\series@knit/n/\f@size\endcsname} +\newcommand \stitchwd@count@knit{\fontdimen6\csname U/knit/\series@knit/out/\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} @@ -117,36 +139,54 @@ \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 +% +% Fonts +% + \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} +\newcommand \raiseff@knit{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{r}\selectfont} +\newcommand \lowerff@knit{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{l}\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} +% 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 \knitnogrid{\gridfalse\knitsymboltrue \def\series@knit{n}{\ff@knit}} +\newcommand \knitgrid{\gridtrue \knitsymbolfalse\def\series@knit{g}{\ff@knit}} +\newcommand \knitwide{\gridtrue \knitsymbolfalse\def\series@knit{w}{\ff@knit}} +\newcommand \knitmixed{\gridtrue \knitsymboltrue \def\series@knit{m}{\ff@knit}} + +\knitgrid + +% +% Single-pass commands +% + \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 \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 +% +% Text knit +% -\newcommand \textknit[1]{\mbox{\ff@knit +\newcommand \textknit[1]{\mbox{\let\|\bar@knit\let\!\barthin@knit + \ff@knit \color{forecolor}% \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}} \newcommand \do@endofpar@knit[1]{\def\par{#1\endgraf\let\par\endgraf}} +% % Special symbols +% \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}} @@ -155,24 +195,24 @@ \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} + \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} + \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} + \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 @@ -181,7 +221,7 @@ {\catcode`\^^M = \active \catcode`\| = \active \global\def\commands@knit{% - \setlength{\fboxsep}{0pt}% + \setlength{\fboxsep}{0pt}% \let\[\pnarrowincrease \let\]\pnarrowdecrease \let\<\narrowincrease @@ -190,9 +230,9 @@ \let \! \barthin@knit \let \| \bar@knit \let | \bar@knit - \let \_ \horizline@knit + \let \_ \horizlinenarrow@knit \let \= \horizlinewide@knit - \let \- \horizlinenarrow@knit + \let \- \horizline@knit \let\overline\overline@knit \let\underline\underline@knit \let\rn\rn@knit @@ -215,19 +255,21 @@ % Drawing lines on the chart -\newcommand \horizline@knit{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd +\newcommand \horizlinenarrow@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\fi} +\newcommand \horizline@knit{\@ifstar \horizlinestar@knit \horizlinenostar@knit} + +\newcommand \horizlinestar@knit[1]{\nonumber\nostitchcount\overlinestar@knit{\hskip#1\stitchwd}} +\newcommand \horizlinenostar@knit[1]{\nonumber\nostitchcount\overlinenostar@knit{\hskip#1\stitchwd}} + + \newcommand \bar@knit{\ifnum\passnum@knit < 3 \leavevmode \ifgrid \ifnum \passnum@knit = 0 @@ -248,7 +290,8 @@ \newcommand \barthin@knit{\leavevmode\strut@knit \ifnum \passnum@knit = 2 - \dimen2 = \stitchht \advance \dimen2 \barthintop@knit \advance \dimen2 \barthinbot@knit + \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} @@ -273,7 +316,7 @@ \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 @@ -287,64 +330,73 @@ \setbox0 = \hbox{#1}% \ifgrid \ifnum \passnum@knit = 0 - \dimen1=\wd0 \advance\dimen1 by \gridwidth - \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-\knitlinewd]{\dimen1}{\knitlinewd}\hskip -0.5\gridwidth}}% + \dimen1=\wd0 \advance\dimen1 by \gridwidth + \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}}% + \rlap{\raisebox{-\dp0}{\vrule width 0pt height 0pt depth \knitlinewd}}% \fi \else \ifnum \passnum@knit = 2 - \dimen1=\wd0 \advance\dimen1 by \gridwidth - \rlap{\raisebox{-\dp0}{\hskip -0.5\gridwidth\color{knitlinecolor}\rule[-\knitlinewd]{\dimen1}{\knitlinewd}\hskip -0.5\gridwidth}}% + \dimen1=\wd0 \advance\dimen1 by \gridwidth + \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}}% + \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}}% + \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 -\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 +% \ifnum \passnum@knit = 3 \leavevmode \fi causes problems +% due to the weird things we do automatically at the start of a paragraph +\def\doifcounting@knit#1{} + +\def\cablebackground#1{\doifcounting@knit{\leavevmode}% + \ifnum \passnum@knit = 0 \leavevmode \hbox to \stitchwd{#1\hss {\raiseff@knit \def\passnum@knit{2}\color{forecolor}#1}}\else \char255 \fi} +\def\cableforeground#1{\doifcounting@knit{\leavevmode}% + \ifnum \passnum@knit = 0 \leavevmode \hbox to \stitchwd{#1\hss {\lowerff@knit \def\passnum@knit{2}\color{forecolor}#1}}\else \char254 \fi} + +\def\orphancablewarning@knit{\typeout{Package knit warning: Orphaned half cable on input line \the\inputlineno.}} + +\newcommand \cableleft[2]{\leavevmode{\ifgrid\knitmixed\fi \ifcase\passnum@knit - \hbox{\pf@knit #1#2} + \hbox{\pf@knit #1#2}% \or - \setbox0=\hbox{\pf@knit #1#2} - \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0 + \setbox0=\hbox{\pf@knit #1#2}% + \hbox to \wd0{\char6\leaders\hbox{\char5}\hfil\char6}% \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}}} + \hbox{\let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit % + \setbox1=\hbox{#1}% + \setbox2=\hbox{#2}% + \ifdim \wd1 = 0pt \orphancablewarning@knit \fi + \ifdim \wd2 = 0pt \orphancablewarning@knit \fi + {\lowerff@knit \rlap{#1}\hbox to \wd1{\leaders\hbox to \stitchwd{\hfil\char15}\hfil\ifdim\wd1>0pt \hskip\stitchwd\char10\fi}% + \ifdim\wd1>0pt \ifdim \wd2>0pt \char13\fi \fi }% + {\raiseff@knit \rlap{#2}\hbox to \wd2{\ifdim\wd2>0pt \char12\hskip\stitchwd\fi\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}}% \else #1#2\fi}} -\newcommand \cableright[2]{\leavevmode{\knitnogrid +\newcommand \cableright[2]{\leavevmode{\ifgrid\knitmixed\fi \ifcase\passnum@knit - \hbox{\pf@knit #1#2} + \hbox{\pf@knit #1#2}% \or - \setbox0=\hbox{\pf@knit #1#2} \rule{\wd0}{0pt} \vrule width 0pt height \ht0 depth \dp0 + \setbox0=\hbox{\pf@knit #1#2}% + \hbox to \wd0{\char6\leaders\hbox{\char5}\hfil\char6}% \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}}} + \hbox{\let\textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit % + \setbox1=\hbox{#1}% + \setbox2=\hbox{#2}% + \ifdim \wd1 = 0pt \orphancablewarning@knit \fi + \ifdim \wd2 = 0pt \orphancablewarning@knit \fi + {\raiseff@knit \rlap{#1}\hbox to \wd1{\leaders\hbox to \stitchwd{\hfil\char16}\hfil\ifdim\wd1>0pt \hskip\stitchwd\char9\fi}% + \ifdim\wd1>0pt \ifdim \wd2>0pt \char14\fi \fi }% + {\lowerff@knit \rlap{#2}\hbox to \wd2{\ifdim\wd2>0pt \char11\hskip\stitchwd \fi\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}}% \else #1#2\fi}} @@ -366,15 +418,27 @@ \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}% + \ifknitsymbol + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}% + \else + \hbox{\hbox to #3\stitchwd{% + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil + \hskip \wd0 + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil}% + \hskip -#3\stitchwd + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}}% + \fi \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}}% + {\knitboxforeground\leaders\hbox{-}% + \ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + }% + \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss} + {\knitboxforeground \count255 = -#1 \leaders\hbox{-}% + \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi + }}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \Knitstitchcount{#2}{#3}\stitchwd{\hfil} \fi} \newcommand \Purl[3][0]{\strut@knit% \setbox0 = \hbox{\fontseries{m}\fontshape{n}\textsf{#2}}% @@ -384,17 +448,34 @@ \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}% + \ifknitsymbol + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}% + \else + \hbox{\hbox to #3\stitchwd{% + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil + \hskip \wd0 + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil}% + \hskip -#3\stitchwd + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}}% + \fi \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}}% + {\purlboxforeground\leaders\hbox{=}% + \ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + }% + \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\fontseries{m}\fontshape{n}\textsf{#2}}\vss} + {\purlboxforeground \count255 = -#1 \leaders\hbox{=}% + \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi + }}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \Purlstitchcount{#2}{#3}\stitchwd{\hfil} \fi} +\newcommand \Knitstitchcount[2]{#2} +\newcommand \Purlstitchcount[2]{#2} +\newcommand \knitboxstitchcount[2]{#2} +\newcommand \purlboxstitchcount[2]{#2} + \newcommand \knitbox[3][0]{\strut@knit% \ifcase \passnum@knit \ifx \empty@knit \knitboxbackground @@ -404,9 +485,14 @@ \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}% + \lower\stitchdp\vbox to\stitchht{% + \vss\vskip\fontvoffset@knit + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + {\fontseries{m}\fontshape{n}\textsf{#2}}% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}% + \vss}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \knitboxstitchcount{#2}{#3}\stitchwd{\hfil} \fi} \newcommand \purlbox[3][0]{\strut@knit% \ifcase \passnum@knit @@ -417,9 +503,14 @@ \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}% + \lower\stitchdp\vbox to\stitchht{% + \vss\vskip\fontvoffset@knit + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + {\fontseries{m}\fontshape{n}\textsf{#2}}% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}% + \vss}% \or - \hbox to #3\stitchwd{\hfil}% + \hbox to \purlboxstitchcount{#2}{#3}\stitchwd{\hfil}% \fi} \newcommand \purlbackground[1]{\leavevmode\setbox0=\hbox{#1}% @@ -432,10 +523,21 @@ \kern-\purlextend@knit \else\box0\fi} +\newcommand \widesymbol[3][0]{\strut@knit + \ifcase \passnum@knit + \knitbox{}{#3}\or + \knitbox{}{#3}\or + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + #2% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}\else + \widesymbolspacer{#2}{#3}\relax\fi} + +\newcommand \widesymbolspacer[2]{#1} + % Row number commands \newcommand \numberrow[3]{\ifnum\passnum@knit=3 \ifvmode\vskip\stitchht\fi\else - \ifvmode\nonumber\leavevmode\fi + \ifvmode\nonumber\leavevmode\fi \strut@knit \count255=#1 \hbox to \stitchwd{\hss\ifnum \passnum@knit = 2 \color{rncolor}\textnormal{#1}\fi\hss}% @@ -469,15 +571,15 @@ \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 \rnoddonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\c@rownumber \csname print##1rownumber\endcsname{\therownumber}\fi\fi}} +\newcommand \rnevenonly{\def\rncore@knit##1{\ifshowrn@knit \ifodd\c@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} + \ifnum \passnum@knit = 2 \global\advance\c@rownumber -\c@rownumberskip \relax\fi + \ifnum \passnum@knit = 0 \global\advance\c@rownumber -\c@rownumberskip \relax\fi + \else\global\showrn@knittrue\fi} \newcommand \printrownumber[1]{{\color{rncolor}\textnormal{#1}}} \newcommand \printrightrownumber[1]{\knitleftarrowhead{\color{rncolor}\textnormal{#1}}} @@ -499,7 +601,7 @@ \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 + \ifchartsonly\advance \dimen0 1pt\fi \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi \hbox to 0pt{\box0\hss}\fi} @@ -520,7 +622,7 @@ % The chart commands -\newcommand \chart[1][]{\smallpage@knit\obeylines \catcode`\|=\active \chart@knit{#1}} +\newcommand \chart[1][]{\smallpage@knit\obeylines \catcode`\|=\active \catcode`\# = 12 \catcode`\& = 12 \chart@knit{#1}} % Some special stuff for chartsonly mode \let\extracommands@knit\relax @@ -530,7 +632,7 @@ % The chart command proper \newcommand \chart@knit[2]{% \global \chartwidth@knit = 0pt - \ifresetrn \setcounter{rownumber}{0}\else \setcounter{tempcount@knit}{\value{rownumber}}\fi + \ifresetrn \c@rownumber = 0 \else \c@tempcount@knit = \c@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 @@ -546,7 +648,7 @@ \commands@knit\extracommands@knit \def\nonumber{\global\showrn@knitfalse}% \csname auto#1@knit\endcsname #2\par}% - \ifresetrn \setcounter{tempcount@knit}{-\value{rownumber}}\fi + \ifresetrn \c@tempcount@knit = -\c@rownumber \fi \ifgrid \setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen \gf@knit @@ -562,11 +664,12 @@ \def\nonumber{\global\showrn@knitfalse}% \csname auto#1@knit\endcsname #2\par}% \fi - \setcounter{rownumber}{\value{tempcount@knit}}% + \c@rownumber = \c@tempcount@knit % \global \rnleftwd@knit = 0pt \global \rnrightwd@knit = 0pt \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen \ff@knit + \color{forecolor} \lineskip=0pt \parskip=0pt \baselineskip=0pt @@ -601,7 +704,7 @@ % Special charts only macros \ifchartsonly - \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi% + \ifpdf@knit\else\errmessage{Package knit error: \chartsonly should only be used with pdfTeX.}\fi% \hoffset=-1in \voffset=-1in \oddsidemargin=0pt @@ -611,11 +714,12 @@ \headsep=0pt \footskip=0pt \textheight=120in + \topskip = 0pt % Causes problems in one-row charts if this isn't present \newenvironment{smallpage}{\clearpage - \hsize=\textwidth \columnwidth = \textwidth + \hsize=\textwidth \columnwidth = \textwidth \global\chartwidth@knit=0pt \setbox0 = \vbox\bgroup - \def\smallpage@knit{\let\endsmallpage@knit\egroup \noindent \hbox\bgroup}% + \def\smallpage@knit{\let\endsmallpage@knit\egroup \noindent \hbox\bgroup}% } {\egroup% % @@ -653,15 +757,15 @@ \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}} + \ifodd \c@rownumber % + \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}% + \ifodd \c@rownumber %\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}}} +\newcommand \autoboth@knit{\everypar={\everypar@knit\rnleft@knit\global\advance\c@rownumber 1 \do@endofpar@knit{\rnright@knit\adjustchartwidth@knit}}} \let\autoevenleft@knit\autooddright@knit \let\autoevenright@knit\autooddleft@knit @@ -674,31 +778,34 @@ % Stitch-counting macros \newcommand \adjuststitchcount[2][\temp@knit]{\def\temp@knit{#2}% - \leavevmode\ifnum\passnum@knit=3 \null + \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 \stitchcountwarningbar{% + \ifnum \c@stitchcountinprev = \c@stitchcountout \else + \ifnum \c@stitchcountinprev > -99 + \vrule width \overfullrule + \typeout{Package knit warning: Stitch count mismatch on input line \the\inputlineno.} + \fi \fi} \newcommand \countstitches[1]{% \global\c@stitchcountinprev = \c@stitchcountin - \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \fontshape{out}\selectfont #1}% + \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \let\stitchwd\stitchwd@count@knit \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}% + \dimen0 = 0.5\stitchwd@count@knit \advance \c@stitchcountout \dimen0 + \global\divide \c@stitchcountout \stitchwd@count@knit + \setbox1 = \hbox{\def\passnum@knit{3}\countingout@knitfalse \let\stitchwd\stitchwd@count@knit \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 + \dimen1 = 0.5\stitchwd@count@knit \advance \c@stitchcountin \dimen1 + \global\divide \c@stitchcountin \stitchwd@count@knit } -\newcommand \stitchcountchart[1][]{\begingroup \catcode`\|=\active \def\chartrn@knit{#1}\obeylines \afterassignment \printstitchcountchart@knit \toks0 =} +\newcommand \stitchcountchart[1][]{\begingroup \catcode`\|=\active \catcode`\# = 12 \catcode`\& = 12 \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 + \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 @@ -708,34 +815,85 @@ {\obeylines \gdef\countstitcheseachrow@knit#1^^M{% + \setbox1 = \hbox{#1}% + \ifCountStsThisRow@knit% \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 + \setstitchcountlabel@knit% + \else% + \global\CountStsThisRow@knittrue% + \setbox0=\hbox{}% + \fi% + \printstitchcountlabel@knit} +\gdef\shortrows@countstitcheseachrow@knit#1^^M{\countstitches{#1} % + \ifx \relax \shortrowrowcount@knit % + \global\advance \c@shortrowstsin@knit \c@stitchcountin \global\advance \c@shortrowstsout@knit \c@stitchcountout % + \global\let \shortrowrowcount@knit 2 + % For some reason, we MUST NOT have a % after the 2. + \else% + \global\advance \c@shortrowstsin@knit -\c@stitchcountout \global\advance \c@shortrowstsout@knit -\c@stitchcountin % + \global\let \shortrowrowcount@knit \relax + \fi% + \global\c@stitchcountin = \c@stitchcountinprev % + } +\gdef\shortrows@printstitchcountlabel@knit#1^^M{\setbox1 = \hbox{#1}\printstitchcountlabel@knit\setbox0=\hbox{}} +\gdef\shortrows#1{\ifnum \passnum@knit = 3 + \c@shortrowstsin@knit = 0 \c@shortrowstsout@knit = 0 \global\let \shortrowrowcount@knit \relax % + \setbox2 = \vbox{\everypar = {\shortrows@countstitcheseachrow@knit}% + #1 + }% + \ifx \shortrowrowcount@knit \relax \advance \c@stitchcountin \c@shortrowstsin@knit \advance \c@stitchcountin -\c@shortrowstsout@knit % + \else + \c@stitchcountinprev = \c@stitchcountin \c@stitchcountin = \c@shortrowstsin@knit \c@stitchcountout = \c@shortrowstsout@knit % + \fi % + \setstitchcountlabel@knit% + \vbox{\everypar = {\shortrows@printstitchcountlabel@knit}% + \ifx \shortrowrowcount@knit \relax \setbox0=\hbox{} \else + \ifCountStsThisRow@knit\else \setbox0=\hbox{} \global\CountStsThisRow@knittrue \fi \fi + % If there are an even number of short rows, we don't know the stitch count, + % so we don't print it + #1 + }% + \else% + #1 + \fi% + \par} + } + +\def\setstitchcountlabel@knit{\setbox0=\hbox{\def\passnum@knit{2}\strut@knit \printstitchcount@knit\stitchcountwarningbar}} +\def\printstitchcountlabel@knit{\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}} + \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 +\def\makestitchcounts@knit{\hbox{\setbox1=\vbox{\c@stitchcountin = -1001 + \global\stitchcountwidth@knit=0pt + \global\CountStsThisRow@knittrue \parindent=0pt \def\passnum@knit{3} + \def\doifcounting@knit##1{##1} \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 + }% + \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 +\def\nostitchcount{\ifnum \passnum@knit = 3 \global \CountStsThisRow@knitfalse \fi} \newcommand \printleftstitchcount{{\color{rncolor}\textnormal{(\thestitchcountout\ sts) }}} \newcommand \printrightstitchcount{} +\newcommand \knitdebug{\renewcommand \printleftstitchcount{{\color{rncolor}\textnormal{(\thestitchcountout\ out, \thestitchcountin\ in) }}}} + + + +\newcommand \empty@knit{} +% This is needed because the plain TeX \empty is +% defined with \def and not \newcommand + diff --git a/Master/texmf-dist/tex/latex/knitting/uknit.fd b/Master/texmf-dist/tex/latex/knitting/uknit.fd index 4291ea68280..afa6358a784 100644 --- a/Master/texmf-dist/tex/latex/knitting/uknit.fd +++ b/Master/texmf-dist/tex/latex/knitting/uknit.fd @@ -1,4 +1,4 @@ -\ProvidesFile{T1knit.fd}[2010/08/09 Knit fonts] +\ProvidesFile{T1knit.fd}[2019/04/03 Knit fonts] \DeclareFontFamily{U}{knit}{} @@ -9,6 +9,14 @@ \DeclareFontShape{U}{knit}{n}{in}{<-> knitn_sc_in}{} \DeclareFontShape{U}{knit}{n}{out}{<-> knitn_sc_out}{} +\DeclareFontShape{U}{knit}{m}{n}{<-> knitmn}{} +\DeclareFontShape{U}{knit}{m}{p}{<-> knitmp}{} +\DeclareFontShape{U}{knit}{m}{r}{<-> knitmr}{} +\DeclareFontShape{U}{knit}{m}{l}{<-> knitml}{} +\DeclareFontShape{U}{knit}{m}{g}{<-> knitmg}{} +\DeclareFontShape{U}{knit}{m}{in}{<-> knitn_sc_in}{} +\DeclareFontShape{U}{knit}{m}{out}{<-> knitn_sc_out}{} + \DeclareFontShape{U}{knit}{g}{n}{<-> knitgn}{} \DeclareFontShape{U}{knit}{g}{p}{<-> knitgp}{} \DeclareFontShape{U}{knit}{g}{g}{<-> knitgg}{} @@ -18,5 +26,5 @@ \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}{} +\DeclareFontShape{U}{knit}{w}{in}{<-> knitg_sc_in}{} +\DeclareFontShape{U}{knit}{w}{out}{<-> knitg_sc_out}{} diff --git a/Master/texmf-dist/tex/plain/knitting/knitting.tex b/Master/texmf-dist/tex/plain/knitting/knitting.tex index 509d291a7ca..17b6a0c242e 100644 --- a/Master/texmf-dist/tex/plain/knitting/knitting.tex +++ b/Master/texmf-dist/tex/plain/knitting/knitting.tex @@ -20,9 +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 +% Version: 3 -% Date: 2010/08/29 +% Date: 2019/04/03 %\pdfmapfile{+knitfont.map} @@ -31,24 +31,37 @@ \catcode`@=11 \fi +% +% Boolean variables +% + \newif \ifchartsonly \chartsonlyfalse \newif \ifgrid +\newif \ifknitsymbol \newif \ifresetrn \resetrntrue \newif \ifleftrn@knit \newif \ifshowrn@knit \showrn@knittrue \newif \ifpdf@knit \newif \ifcountingout@knit +\newif \ifCountStsThisRow@knit \CountStsThisRow@knittrue \pdf@knittrue \ifx \pdfoutput \undefined \pdf@knitfalse \fi \ifx \pdfoutput \relax \pdf@knitfalse \fi -% This defines pdfTeX-friendly or dvips-friendly grays. +% +% Color commands +% + +% This defines pdfTeX-friendly or dvips-friendly color. % Change them to use your driver's syntax if you insist on % not using pdfTeX. -% For black lines, just say \let\knitlinecolor \relax +% For black lines, just say \let \knitlinecolor \relax +% If grayscale really just isn't working at all, +% go down and redefine \changeknitsize \ifpdf@knit \ifnum \pdftexversion < 140 + \def\forecolor {\pdfliteral {0 g 0 G}\aftergroup\makenormalcolorknit} \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} @@ -56,6 +69,7 @@ \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\forecolor {\pdfcolorstack 0 push {0 g 0 G}\aftergroup\makenormalcolorknit} \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} @@ -64,6 +78,7 @@ \def\makenormalcolorknit{\pdfcolorstack 0 pop} \fi \else + \def\forecolor {\special{color push gray 0}\aftergroup\makenormalcolorknit} \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} @@ -71,40 +86,11 @@ \def\rnarrowcolor{\special{color push rgb 0.35 0 0}\aftergroup\makenormalcolorknit} \def\makenormalcolorknit{\special{color pop}} \fi +\def\knitoverlinecolor{\knitlinecolor} -% If grayscale really just isn't working at all, -% go down and redefine \changeknitsize - -\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 -\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} +% +% Plain TeX-only material (change knit size) +% \def \changeknitsize#1{\fontsize@knit = #1 \font\knitsf = cmss10 at \fontsize@knit @@ -118,23 +104,35 @@ \font\gff@knit = knitgn at \fontsize@knit \font\wff@knit = knitwn at \fontsize@knit \font\nff@knit = knitnn at \fontsize@knit + \font\mff@knit = knitmn 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\mgf@knit = knitmg 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\mpf@knit = knitmp at \fontsize@knit + % + \font\raisen@knit = knitnr at \fontsize@knit + \font\lowern@knit = knitnl at \fontsize@knit + \font\raisem@knit = knitmr at \fontsize@knit + \font\lowerm@knit = knitml at \fontsize@knit + \let \raiseg@knit \raisem@knit + \let \raisew@knit \raisem@knit + \let \lowerg@knit \lowerm@knit + \let \lowerw@knit \lowerm@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 - % + \let \wstsout@knit \gstsout@knit + \let \wstsin@knit \gstsin@knit + \let \mstsout@knit \nstsout@knit + \let \mstsin@knit \nstsin@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 @@ -144,12 +142,71 @@ } \let \ngf@knit \nullfont + +% +% Dimensions +% + +\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 +\newcount \stitchcountin +\newcount \stitchcountinprev +\newcount \stitchcountout +\newcount \shortrowstsin@knit +\newcount \shortrowstsout@knit + +\def \passnum@knit{2} +\def \stitchwd{\fontdimen6\ff@knit} +\def \stitchwd@count@knit{\fontdimen6\stsout@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} +% The rest of them aren't \the\font because I want them to still work outside of a chart + +% +% Fonts +% + \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 \raiseff@knit{\csname raise\series@knit @knit\endcsname} +\def \lowerff@knit{\csname lower\series@knit @knit\endcsname} \def \stsout@knit{\csname \series@knit stsout@knit\endcsname} \def \stsin@knit{\csname \series@knit stsin@knit\endcsname} +\def \knitnogrid{\gridfalse\knitsymboltrue \def\series@knit{n}} +\def \knitgrid{\gridtrue \knitsymbolfalse\def\series@knit{g}} +\def \knitwide{\gridtrue \knitsymbolfalse\def\series@knit{w}} +\def \knitmixed{\gridtrue \knitsymboltrue \def\series@knit{m}} + +\changeknitsize{10pt} + +\knitgrid + +% +% Single-pass commands +% + \def \purlpass{\futurelet\next@knit\purlpass@@knit} \def \gridpass{\futurelet\next@knit\gridpass@@knit} \def \mainpass{\futurelet\next@knit\mainpass@@knit} @@ -158,52 +215,55 @@ \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 \def\nextstep@@knit{#2}\else \def\nextstep@@knit{#1}\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 +% +% Text knit +% -\def \textknit#1{\leavevmode\hbox{\ff@knit +\def \textknit#1{\leavevmode\hbox{\let\|\bar@knit\let\!\barthin@knit + \ff@knit \forecolor \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}} +% % Special symbols +% -\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\narrowincreasestartnumber{1} +\def\narrowdecreaseendnumber{1} + +\def \narrowdecrease#1{\genbobble@knit{#1}{1}{-\narrowincraise@knit}\adjuststitchcount[#1]{\narrowdecreaseendnumber}\adjuststitchcount[-1]{-1}} +\def \pnarrowdecrease#1{\genbobble@knit{#1}{2}{-\narrowincraise@knit}\adjuststitchcount[#1]{\narrowdecreaseendnumber}\adjuststitchcount[-1]{-1}} +\def \narrowincrease#1{\genbobble@knit{#1}{3}{\narrowincraise@knit}\adjuststitchcount[\narrowincreasestartnumber]{#1}\adjuststitchcount[-1]{-1}} +\def \pnarrowincrease#1{\genbobble@knit{#1}{4}{\narrowincraise@knit}\adjuststitchcount[\narrowincreasestartnumber]{#1}\adjuststitchcount[-1]{-1}} \def \bobble#1{\genbobble@knit{#1}{0}{0pt}} -\def\genbobble@knit#1#2#3{\char#2 \ifnum \passnum@knit = 2 +\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} + \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} + \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 @@ -220,9 +280,9 @@ \let \! \barthin@knit \let \| \bar@knit \let | \bar@knit - \let \_ \horizline@knit + \let \_ \horizlinenarrow@knit \let \= \horizlinewide@knit - \let \- \horizlinenarrow@knit + \let \- \horizline@knit \let\overline\overline@knit \let\underline\underline@knit \let\rn\rn@knit @@ -245,23 +305,27 @@ % Drawing lines on the chart -\def \horizline@knit{\ifnum\passnum@knit<3 \ifvmode\nonumber\leavevmode\fi \dimen0 = \stitchwd \advance \dimen0 \knitlinewd +\def \horizlinenarrow@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 + \hskip -0.5\knitlinewd\smash{{\knitoverlinecolor \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}} + \smash{{\knitoverlinecolor \vrule width \dimen0 height 0.5\knitlinewd depth 0.5\knitlinewd}} \else\hskip \dimen0 \fi\fi} +\def \horizline@knit{\futurelet\next@knit\horizline@@knit} +\def \horizline@@knit{\ifx\next@knit*% + \def\nextstep@knit{\horizlinestar@knit}\else + \def\nextstep@knit{\horizlinenostar@knit}\fi\nextstep@knit} + +\def \horizlinestar@knit#1{\nonumber\nostitchcount\overlinestar@knit{\hskip#1\stitchwd}} +\def \horizlinenostar@knit#1{\nonumber\nostitchcount\overlinenostar@knit{\hskip#1\stitchwd}} + \def \bar@knit{\ifnum\passnum@knit < 3 \leavevmode \ifgrid \ifnum \passnum@knit = 0 - \hbox{\knitlinecolor \vrule width \knitlinewd depth \stitchdp height \stitchht}% + \hbox{{\knitlinecolor \vrule width \knitlinewd depth \stitchdp height \stitchht}}% \else \kern \knitlinewd \fi @@ -293,14 +357,14 @@ \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}}}% + {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \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}}}% + {\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \vrule width \dimen1 height \knitlinewd depth 0pt}}}% \else \dimen0=\ht0 \advance \dimen0 \knitlinewd \vrule width 0pt height \dimen0 depth 0pt @@ -311,7 +375,7 @@ \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}}}% + \smash{\rlap{\raise\ht0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \vrule width \dimen1 height 0.5\knitlinewd depth 0.5\knitlinewd}}}% \fi #2}} @@ -325,14 +389,14 @@ \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}}% + \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \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}}% + \rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \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 @@ -342,46 +406,55 @@ \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}}}% + \smash{\rlap{\raise-\dp0\hbox{\hskip -0.5\gridwidth\knitoverlinecolor \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{\leavevmode{\knitnogrid +% \ifnum \passnum@knit = 3 \leavevmode \fi causes problems +% due to the weird things we do automatically at the start of a paragraph +\def\doifcounting@knit#1{} + +\def\cablebackground#1{\doifcounting@knit{\leavevmode}% + \ifnum \passnum@knit = 0 \leavevmode \hbox to \stitchwd{#1\hss {\raiseff@knit \def\passnum@knit{2}\forecolor#1}}\else \char255 \fi} +\def\cableforeground#1{\doifcounting@knit{\leavevmode}% + \ifnum \passnum@knit = 0 \leavevmode \hbox to \stitchwd{#1\hss {\lowerff@knit \def\passnum@knit{2}\forecolor#1}}\else \char254 \fi} + +\def\orphancablewarning@knit{\message{Package knit warning: Orphaned half cable on input line \the\inputlineno.}} + +\def \cableleft#1#2{\leavevmode{\ifgrid\knitmixed\fi \ifcase\passnum@knit - \hbox{\pf@knit #1#2} + \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 + \setbox0=\hbox{\pf@knit #1#2}% + \hbox to \wd0{\char6\leaders\hbox{\char5}\hfil\char6}% \or - \hbox{\let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\lowerff@knit \overcableleft@knit{#1}}{\raiseff@knit \undercableright@knit{#2}}} + \hbox{\let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit % + \setbox1=\hbox{#1}% + \setbox2=\hbox{#2}% + \ifdim \wd1 = 0pt \orphancablewarning@knit \fi + \ifdim \wd2 = 0pt \orphancablewarning@knit \fi + {\lowerff@knit \rlap{#1}\hbox to \wd1{\leaders\hbox to \stitchwd{\hfil\char15}\hfil\ifdim\wd1>0pt \hskip\stitchwd\char10\fi}% + \ifdim\wd1>0pt \ifdim \wd2>0pt \char13\fi \fi }% + {\raiseff@knit \rlap{#2}\hbox to \wd2{\ifdim\wd2>0pt \char12\hskip\stitchwd\fi\leaders\hbox to \stitchwd{\char8\hfil}\hfil}}}% \else #1#2\fi}} -\def \cableright#1#2{\leavevmode{\knitnogrid +\def \cableright#1#2{\leavevmode{\ifgrid\knitmixed\fi \ifcase\passnum@knit - \hbox{\pf@knit #1#2} + \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 + \setbox0=\hbox{\pf@knit #1#2}% + \hbox to \wd0{\char6\leaders\hbox{\char5}\hfil\char6}% \or - \hbox{\let \knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\raiseff@knit \undercableleft@knit{#1}}{\lowerff@knit \overcableright@knit{#2}}} + \hbox{\let\knitsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit % + \setbox1=\hbox{#1}% + \setbox2=\hbox{#2}% + \ifdim \wd1 = 0pt \orphancablewarning@knit \fi + \ifdim \wd2 = 0pt \orphancablewarning@knit \fi + {\raiseff@knit \rlap{#1}\hbox to \wd1{\leaders\hbox to \stitchwd{\hfil\char16}\hfil\ifdim\wd1>0pt \hskip\stitchwd\char9\fi}% + \ifdim\wd1>0pt \ifdim \wd2>0pt \char14\fi \fi }% + {\lowerff@knit \rlap{#2}\hbox to \wd2{\ifdim\wd2>0pt \char11\hskip\stitchwd \fi\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}}% \else #1#2\fi}} @@ -407,15 +480,27 @@ \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}% + \ifknitsymbol + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}% + \else + \hbox{\hbox to #3\stitchwd{% + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil + \hskip \wd0 + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil}% + \hskip -#3\stitchwd + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}}% + \fi \or \hbox to #3\stitchwd{% - {\knitboxforeground\leaders\hbox{-}\hskip #1\stitchwd plus 1fil }% + {\knitboxforeground\leaders\hbox{-}% + \ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + }% \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp} - {\knitboxforeground\leaders\hbox{-}\hfil}}% + {\knitboxforeground \count255 = -#1 \leaders\hbox{-}% + \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi + }}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \Knitstitchcount{#2}{#3}\stitchwd{\hfil} \fi} \def \Purl{\futurelet\next@knit\Purl@knit} \def \Purl@knit{\ifx\next@knit[% @@ -429,17 +514,34 @@ \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}% + \ifknitsymbol + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}% + \else + \hbox{\hbox to #3\stitchwd{% + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil + \hskip \wd0 + \leaders \hbox to \stitchwd{\char6\hfil\char6}\hfil}% + \hskip -#3\stitchwd + \hbox to #3\stitchwd{\char6\leaders\hbox{\char5}\hfil\char6}}% + \fi \or \hbox to #3\stitchwd{% - {\purlboxforeground\leaders\hbox{=}\hskip #1\stitchwd plus 1fil }% + {\purlboxforeground\leaders\hbox{=}% + \ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + }% \lower\stitchdp\vbox to\stitchht{\vss\vskip\fontvoffset@knit\hbox{\knitsf #2}\vss\vskip\stitchdp} - {\purlboxforeground\leaders\hbox{=}\hfil}}% + {\purlboxforeground \count255 = -#1 \leaders\hbox{=}% + \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi + }}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \Purlstitchcount{#2}{#3}\stitchwd{\hfil} \fi} +\def \Knitstitchcount#1#2{#2} +\def \Purlstitchcount#1#2{#2} +\def \knitboxstitchcount#1#2{#2} +\def \purlboxstitchcount#1#2{#2} + \def \knitbox{\futurelet\next@knit\knitbox@knit} \def \knitbox@knit{\ifx\next@knit[% \def\nextstep@knit{\knitbox@@knit}\else @@ -453,9 +555,14 @@ \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} + \lower\stitchdp\vbox to\stitchht{% + \vss\vskip\fontvoffset@knit + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + {\knitsf #2}% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}% + \vss\vskip\stitchdp}% \or - \hbox to #3\stitchwd{\hfil} + \hbox to \knitboxstitchcount{#2}{#3}\stitchwd{\hfil} \fi} \def \purlbox{\futurelet\next@knit\purlbox@knit} \def \purlbox@knit{\ifx\next@knit[% @@ -470,21 +577,43 @@ \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}% + \lower\stitchdp\vbox to\stitchht{% + \vss\vskip\fontvoffset@knit + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + {\knitsf #2}% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}% + \vss\vskip\stitchdp}% \or - \hbox to #3\stitchwd{\hfil}% + \hbox to \purlboxstitchcount{#2}{#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 +\def \purlbackground#1{% + \ifnum\passnum@knit=0 + \setbox0=\hbox{#1}% + \dimen0 = \wd0 \advance\dimen0 2\purlextend@knit + \dimen1 = \stitchht \advance\dimen1 \purlextend@knit + \dimen2 = \stitchdp \advance\dimen2 \purlextend@knit \vrule width 0pt height \ht0 depth \dp0 \smash{\vrule width \dimen0 height \dimen1 depth \dimen2}% \kern-\purlextend@knit - \else\box0\fi} - + \else#1\fi} + +\def \widesymbol{\futurelet\next@knit\widesymbol@knit} +\def \widesymbol@knit{\ifx\next@knit[% + \def\nextstep@knit{\widesymbol@@knit}\else + \def\nextstep@knit{\widesymbol@@knit[0]}\fi\nextstep@knit} +\def \widesymbol@@knit[#1]#2#3{\strut@knit + \ifcase \passnum@knit + \knitbox{}{#3}\or + \knitbox{}{#3}\or + \hbox to #3\stitchwd{\ifnum #1>0 \hskip #1\stitchwd plus 1fil minus #1\stitchwd \else\hfil\fi + #2% + \count255 = -#1 \ifnum #1<0 \hskip \count255\stitchwd plus 1fil minus \count255\stitchwd \else\hfil\fi}\else + \widesymbolspacer{#2}{#3}\relax\fi} + +\def\widesymbolspacer#1#2{#1} + + % Row number commands \def \numberrow#1#2#3{\ifnum\passnum@knit=3 \ifvmode\vskip\stitchht\fi\else @@ -522,15 +651,15 @@ \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 \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} + \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}} @@ -569,13 +698,17 @@ \ifchartsonly \advance \dimen0 1pt \fi \ifdim \dimen0 > \rnrightwd@knit \global\rnrightwd@knit = \dimen0 \fi \hbox to 0pt{\box0\hss}\fi} + +% Title for the chart +\def\charttitle@knit{} +\def\titlechart#1{\def\charttitle@knit{#1}} % 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\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \catcode`\# = 12 \chart@knit}\else + \def\nextstep@knit{\smallpage@knit\obeylines \catcode`\|=\active \catcode`\# = 12 \chart@knit[]}\fi\nextstep@knit} % Some special stuff for chartsonly mode \let\extracommands@knit\relax @@ -616,7 +749,7 @@ \def\nonumber{\global\showrn@knitfalse}% \csname auto#1@knit\endcsname #2\par}% \fi - \rownumber = \tempcount@knit + \rownumber = \tempcount@knit % \global \rnleftwd@knit = 0pt \global \rnrightwd@knit = 0pt \setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen @@ -634,9 +767,11 @@ \csname auto#1@knit\endcsname #2\par}% \global\advance \chartwidth@knit \rnleftwd@knit \global\advance \chartwidth@knit \rnrightwd@knit + \ifchartsonly \global\advance \chartwidth@knit 0.5\gridwidth \fi \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 @@ -647,37 +782,73 @@ % 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% + \vbox{% + \ifx\empty\charttitle@knit\empty\else + \hbox to \chartwidth@knit{\hskip \rnleftwd@knit\printcharttitle{\charttitle@knit}\hskip \rnrightwd@knit}\fi + \box\fgbox@knit}% \hss}% \endsmallpage@knit + \gdef\charttitle@knit{} } +\def\printcharttitle#1{\hfil\vrule depth 3pt height 9pt width 0pt \relax #1\hfil} + % Special charts only macros +\newif \ifchartsonlysideways \chartsonlysidewaysfalse + \def \chartsonly{\chartsonlytrue - \ifpdf@knit\else\errmessage{\chartsonly should only be used with pdfTeX.}\fi% + \ifpdf@knit\else\errmessage{Package knit error: \chartsonly should only be used with pdfTeX.}\fi% \hoffset=-1in \voffset=-1in \vsize = 120in + \topskip = 0pt % Causes problems in one-row charts if this isn't present \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 + \ifchartsonlysideways + % + \pdfpageheight=\wd0 + % + \dimen0=\ht0 \advance \dimen0 by \dp0 + \pdfpagewidth=\dimen0 + % + \ifdim \pdfpagewidth > \vsize + %{\newlinechar=`| + %\message{||The chart ending on line \the\inputlineno\space is too big.} + %\message{|Compensate by increasing \string\vsize\space or by breaking the chart into pieces.}% + %\message{|What do you want such a big chart for, anyway?||}}% + \fi + % + % Commands borrowed from samplepdf.tex + \setbox1=\hbox{\copy0}% + \wd1 = 0pt + \ht1 = 0pt + \dp1 = 0pt + \vtop{\vskip\wd0 + \leftline{\hskip-2pt\hskip\ht0\hskip\dp0% + \pdfliteral{q 0 1 -1 0 0 0 cm}% + \box1 + \pdfliteral{Q}}} + \else + % + \pdfpagewidth=\wd0 + % + \dimen0=\ht0 \advance \dimen0 by \dp0 + \pdfpageheight=\dimen0 + % + \ifdim \pdfpageheight > \vsize + %{\newlinechar=`| + %\message{||The chart ending on line \the\inputlineno\space is too big.} + %\message{Compensate by increasing \string\vsize\space or by breaking the chart into pieces.}% + %\message{What do you want such a big chart for, anyway?||}}% + \fi + % + \box0 + \fi \vfil\break } \let\smallpage@knit\smallpage @@ -685,6 +856,7 @@ \def\extracommands@knit{% \leftskip = 0.5\gridwidth \rightskip = 0.5\gridwidth + %\vskip \gridwidth } } \let\smallpage\begingroup @@ -698,13 +870,13 @@ \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}} + \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}% + \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 @@ -726,28 +898,30 @@ \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 \stitchcountwarningbar{% + \ifnum \stitchcountinprev = \stitchcountout \else + \ifnum \stitchcountinprev > -99 + \vrule width \overfullrule + \message{Package knit warning: Stitch count mismatch on input line \the\inputlineno.} + \fi \fi} \def \countstitches#1{% \global\stitchcountinprev = \stitchcountin - \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \stsout@knit #1}% + \setbox0 = \hbox{\def\passnum@knit{3}\countingout@knittrue \let\stitchwd\stitchwd@count@knit \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}% + \dimen0 = 0.5\stitchwd@count@knit \advance \stitchcountout \dimen0 + \global\divide \stitchcountout \stitchwd@count@knit + \setbox1 = \hbox{\def\passnum@knit{3}\countingout@knitfalse \let\stitchwd\stitchwd@count@knit \stsin@knit #1}% \stitchcountin = \wd1 - \dimen1 = 0.5\stitchwd \advance \stitchcountin \dimen1 - \global\divide \stitchcountin \stitchwd - \ifnum\stitchcountinprev < -99 - \global\stitchcountinprev = \stitchcountout - \fi + \dimen1 = 0.5\stitchwd@count@knit \advance \stitchcountin \dimen1 + \global\divide \stitchcountin \stitchwd@count@knit } \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 \stitchcountchart@@knit[#1]{\begingroup \catcode`\|=\active \catcode`\# = 12 \def\chartrn@knit{#1}\obeylines \afterassignment \printstitchcountchart@knit \toks0 =} \def \printstitchcountchart@knit{\smallpage@knit\hbox{% \ifx\relax\printleftstitchcount\else\ifx \empty \printleftstitchcount\else @@ -762,18 +936,63 @@ {\obeylines \gdef\countstitcheseachrow@knit#1^^M{% + \setbox1 = \hbox{#1}% + \ifCountStsThisRow@knit% \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 + \setstitchcountlabel@knit% + \else% + \global\CountStsThisRow@knittrue% + \setbox0=\hbox{}% + \fi% + \printstitchcountlabel@knit} +\gdef\shortrows@countstitcheseachrow@knit#1^^M{\countstitches{#1} % + \ifx \relax \shortrowrowcount@knit % + \global\advance \shortrowstsin@knit \stitchcountin \global\advance \shortrowstsout@knit \stitchcountout % + \global\let \shortrowrowcount@knit 2 + % For some reason, we MUST NOT have a % after the 2. + \else% + \global\advance \shortrowstsin@knit -\stitchcountout \global\advance \shortrowstsout@knit -\stitchcountin % + \global\let \shortrowrowcount@knit \relax + \fi% + \global\stitchcountin = \stitchcountinprev % + } +\gdef\shortrows@printstitchcountlabel@knit#1^^M{\setbox1 = \hbox{#1}\printstitchcountlabel@knit\setbox0=\hbox{}} +\gdef\shortrows#1{% + \ifnum \passnum@knit = 3 + \shortrowstsin@knit = 0 \shortrowstsout@knit = 0 \global\let \shortrowrowcount@knit \relax % + \setbox2 = \vbox{\everypar = {\shortrows@countstitcheseachrow@knit}% + #1 + }% + \ifx \shortrowrowcount@knit \relax + \advance \stitchcountin \shortrowstsin@knit \advance \stitchcountin -\shortrowstsout@knit % + \else + \stitchcountinprev = \stitchcountin \stitchcountin = \shortrowstsin@knit \stitchcountout = \shortrowstsout@knit % + \fi % + \setstitchcountlabel@knit% + \vbox{\everypar = {\shortrows@printstitchcountlabel@knit}% + \ifx \shortrowrowcount@knit \relax \setbox0=\hbox{} \else + \ifCountStsThisRow@knit\else \setbox0=\hbox{} \global\CountStsThisRow@knittrue \fi \fi + #1 + }% + \else% + #1 + \fi% + \par} + } + +\def\setstitchcountlabel@knit{\setbox0=\hbox{\def\passnum@knit{2}\strut@knit \printstitchcount@knit\stitchcountwarningbar}} +\def\printstitchcountlabel@knit{\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}} + \par} -\def\makestitchcounts@knit{\hbox{\setbox1=\vbox{\stitchcountin = -1001 \global\stitchcountwidth@knit=0pt +\def\makestitchcounts@knit{\hbox{\setbox1=\vbox{\stitchcountin = -1001 + \global\stitchcountwidth@knit=0pt + \global\CountStsThisRow@knittrue \parindent=0pt \def\passnum@knit{3} + \def\doifcounting@knit##1{##1} \ff@knit \commands@knit \everypar={\countstitcheseachrow@knit} \offinterlineskip @@ -786,8 +1005,14 @@ \fi }} +\def\nostitchcount{\ifnum \passnum@knit = 3 \global \CountStsThisRow@knitfalse \fi} + +\def \knitdebug{\def \printleftstitchcount{{\rncolor \knitrm(\the\stitchcountout\ out, \the\stitchcountin\ in) }}} + \def \printleftstitchcount{{\rncolor \knitrm(\the\stitchcountout\ sts) }} \def \printrightstitchcount{} +\def \knitdebugging{\def \printleftstitchcount{{\rncolor \knitrm(\the\stitchcountout\ out/\the\stitchcountin\ in) }}} + \catcode`\@=\catcountknit |