summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-18 23:41:42 +0000
committerKarl Berry <karl@freefriends.org>2010-01-18 23:41:42 +0000
commit45919681c5a1d4dd078abbabac51a5de84aa75b2 (patch)
tree86e8f0fec1474d3450d8eeb28802c20e3ceba895
parent1ae5f4b8a9fdc0dd87fe69949694e1748a360b87 (diff)
knitting update (18jan10)
git-svn-id: svn://tug.org/texlive/trunk@16778 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitexamples.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitkey.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdfbin333265 -> 314878 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex6
-rw-r--r--Master/texmf-dist/tex/latex/knitting/knitting.sty36
-rw-r--r--Master/texmf-dist/tex/latex/knitting/t1knit.fd16
-rw-r--r--Master/texmf-dist/tex/latex/knitting/uknit.fd16
-rw-r--r--Master/texmf-dist/tex/plain/knitting/knitting.tex2
8 files changed, 40 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
index 84c8127d30e..81c2d30fd2d 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitexamples.tex
@@ -24,7 +24,7 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-% Date: 2010/01/16
+% Date: 2010/01/17
\documentclass{article}
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
index 453eb2b68d6..01da46a6aa3 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitkey.tex
@@ -25,7 +25,7 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-% Date: 2010/01/16
+% Date: 2010/01/17
\documentclass{article}
\usepackage{knitting}
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
index 63e24f2292e..8c593980bc3 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
index d928ce51c77..e5095ae5652 100644
--- a/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
+++ b/Master/texmf-dist/doc/fonts/knitting/knitting-doc.tex
@@ -20,7 +20,7 @@
% The complete list of files considered part of this work is in
% the file `knitting-doc.pdf' and later in this file.
%
-% Date: 2010/01/16
+% Date: 2010/01/17
\documentclass{amsart}
@@ -119,7 +119,7 @@ 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
-\texttt{dragoncrafter@\allowbreak gmail.com}.
+\texttt{origamist@\allowbreak gmail.com}.
\section{Installation}
@@ -863,7 +863,7 @@ This package should have come with all the following files, organized into the d
\noindent knitting/tex/latex
\begin{itemize}
\item knitting.sty
- \item t1knit.fd
+ \item uknit.fd
\end{itemize}
\noindent knitting/tex/plain
\begin{itemize}
diff --git a/Master/texmf-dist/tex/latex/knitting/knitting.sty b/Master/texmf-dist/tex/latex/knitting/knitting.sty
index 6d5537be95e..b6912d21c4b 100644
--- a/Master/texmf-dist/tex/latex/knitting/knitting.sty
+++ b/Master/texmf-dist/tex/latex/knitting/knitting.sty
@@ -23,7 +23,7 @@
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-\ProvidesPackage{knitting}[2010/01/16]
+\ProvidesPackage{knitting}[2010/01/17]
%\pdfmapfile{+knitfont.map}
@@ -96,23 +96,23 @@
\newcounter{rownumberskip} \setcounter{rownumberskip}{1}
\def\passnum@knit{2}
-\newcommand\stitchwd{\fontdimen6\csname T1/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\stitchdp{\fontdimen8\csname T1/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\stitchht{\fontdimen9\csname T1/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\gridwidth{\fontdimen10\csname T1/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\knitlinewd{\fontdimen11\csname T1/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\stitchwd{\fontdimen6\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\stitchdp{\fontdimen8\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\stitchht{\fontdimen9\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\gridwidth{\fontdimen10\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\knitlinewd{\fontdimen11\csname U/knit/\series@knit/n/\f@size\endcsname}
\newcommand\narrowincraise@knit{\fontdimen12\the\font} % The rest of them aren't \the\font because I want them to still work outside of a chart
\newcommand\fontvoffset@knit{\fontdimen13\the\font}
-\newcommand\purlextend@knit{\fontdimen14\csname T1/knit/\series@knit/n/\f@size\endcsname}
-\newcommand\rownumberwd{\fontdimen6\csname T1/knit/\series@knit/n/10\endcsname}
+\newcommand\purlextend@knit{\fontdimen14\csname U/knit/\series@knit/n/\f@size\endcsname}
+\newcommand\rownumberwd{\fontdimen6\csname U/knit/\series@knit/n/10\endcsname}
\DeclareTextFontCommand {\knitsfsmall@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.8\dimen0}{\f@baselineskip}\selectfont}
\DeclareTextFontCommand {\cablesf@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.8\dimen0}{\f@baselineskip}\selectfont}
\DeclareTextFontCommand{\cablesfsmall@knit}{\dimen0=\f@size pt\fontfamily{cmss}\fontseries{m}\fontshape{n}\fontsize{0.6\dimen0}{\f@baselineskip}\selectfont}
-\newcommand\knitnogrid{\gridfalse\def\series@knit{n}{\fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
-\newcommand \knitgrid{\gridtrue \def\series@knit{g}{\fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
-\newcommand \knitwide{\gridtrue \def\series@knit{w}{\fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
+\newcommand\knitnogrid{\gridfalse\def\series@knit{n}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
+\newcommand \knitgrid{\gridtrue \def\series@knit{g}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
+\newcommand \knitwide{\gridtrue \def\series@knit{w}{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont}}
% Some extra effort is made to make sure that the fonts actually exist.
% This is done so that the fonts are defined before they are used,
% which is necessary to make \gridwidth work
@@ -123,7 +123,7 @@
\knitgrid
-\newcommand\textknit[1]{\mbox{\fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}%
+\newcommand\textknit[1]{\mbox{\fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}%
\rlap{\def\passnum@knit{0}\color{purlgray}\fontshape{n}\selectfont\fontshape{p}\selectfont#1}%
\ifgrid\rlap{\def\passnum@knit{1}\color{gridcolor}\fontshape{g}\selectfont#1}\fi
\def\passnum@knit{2}\fontshape{n}\selectfont#1}}
@@ -274,7 +274,7 @@
\rlap{#1}%
\hbox to \wd0{\char14\char11\hskip\stitchwd\leaders\hbox to \stitchwd{\char7\hfil}\hfil}}
-\newcommand\cableleft[2]{{\def\series@knit{n}\fontencoding{T1}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
+\newcommand\cableleft[2]{{\def\series@knit{n}\fontencoding{U}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
\ifcase\passnum@knit
\hbox{\gridfalse \fontshape{p}\selectfont #1#2}
\or
@@ -282,7 +282,7 @@
\else
\hbox{\gridfalse \let \textsf \cablesf@knit \let \knitsfsmall@knit \cablesfsmall@knit {\fontshape{l}\selectfont \overcableleft@knit{#1}}{\fontshape{r}\selectfont \undercableright@knit{#2}}}
\fi}}
-\newcommand\cableright[2]{{\def\series@knit{n}\fontencoding{T1}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
+\newcommand\cableright[2]{{\def\series@knit{n}\fontencoding{U}\fontfamily{knit}\fontseries{n}\ifvmode\leavevmode\fi
\ifcase\passnum@knit
\hbox{\gridfalse \fontshape{p}\selectfont #1#2}
\or
@@ -398,8 +398,8 @@
\setbox1=\hbox{\textnormal{5}}%
\edef\rnmiddle@knit{\hskip \the\wd1}%
\setbox\bgbox@knit=\vbox{\def\passnum@knit{0}\hsize=\maxdimen
- \fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont % This is kind of silly, but to make \stitchht work, we need to be sure that the foreground font exists.
- \fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{p}\selectfont
+ \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont % This is kind of silly, but to make \stitchht work, we need to be sure that the foreground font exists.
+ \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{p}\selectfont
\lineskip=0pt
\parskip=0pt
\baselineskip=0pt
@@ -417,7 +417,7 @@
\csname setbgshift#1@knit\endcsname
\ifgrid
\setbox\ggbox@knit=\vbox{\def\passnum@knit{1}\hsize=\maxdimen
- \fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{g}\selectfont
+ \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{g}\selectfont
\lineskip=0pt
\parskip=0pt
\baselineskip=0pt
@@ -430,7 +430,7 @@
\csname auto#1@knit\endcsname #2\par}%
\fi
\setbox\fgbox@knit=\vbox{\def\passnum@knit{2}\hsize=\maxdimen
- \fontencoding{T1}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont
+ \fontencoding{U}\fontfamily{knit}\fontseries{\series@knit}\fontshape{n}\selectfont
\lineskip=0pt
\parskip=0pt
\baselineskip=0pt
diff --git a/Master/texmf-dist/tex/latex/knitting/t1knit.fd b/Master/texmf-dist/tex/latex/knitting/t1knit.fd
deleted file mode 100644
index f182b91adba..00000000000
--- a/Master/texmf-dist/tex/latex/knitting/t1knit.fd
+++ /dev/null
@@ -1,16 +0,0 @@
-\ProvidesFile{T1knit.fd}[2010/1/16 Knit fonts]
-
-\DeclareFontFamily{T1}{knit}{}
-
-\DeclareFontShape{T1}{knit}{g}{n}{<-> knitgn}{}
-\DeclareFontShape{T1}{knit}{g}{p}{<-> knitgp}{}
-\DeclareFontShape{T1}{knit}{g}{g}{<-> knitgg}{}
-
-\DeclareFontShape{T1}{knit}{n}{n}{<-> knitnn}{}
-\DeclareFontShape{T1}{knit}{n}{p}{<-> knitnp}{}
-\DeclareFontShape{T1}{knit}{n}{r}{<-> knitnr}{}
-\DeclareFontShape{T1}{knit}{n}{l}{<-> knitnl}{}
-
-\DeclareFontShape{T1}{knit}{w}{n}{<-> knitwn}{}
-\DeclareFontShape{T1}{knit}{w}{p}{<-> knitwp}{}
-\DeclareFontShape{T1}{knit}{w}{g}{<-> knitwg}{}
diff --git a/Master/texmf-dist/tex/latex/knitting/uknit.fd b/Master/texmf-dist/tex/latex/knitting/uknit.fd
new file mode 100644
index 00000000000..31f05b0dd6d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/knitting/uknit.fd
@@ -0,0 +1,16 @@
+\ProvidesFile{T1knit.fd}[2010/1/17 Knit fonts]
+
+\DeclareFontFamily{U}{knit}{}
+
+\DeclareFontShape{U}{knit}{g}{n}{<-> knitgn}{}
+\DeclareFontShape{U}{knit}{g}{p}{<-> knitgp}{}
+\DeclareFontShape{U}{knit}{g}{g}{<-> knitgg}{}
+
+\DeclareFontShape{U}{knit}{n}{n}{<-> knitnn}{}
+\DeclareFontShape{U}{knit}{n}{p}{<-> knitnp}{}
+\DeclareFontShape{U}{knit}{n}{r}{<-> knitnr}{}
+\DeclareFontShape{U}{knit}{n}{l}{<-> knitnl}{}
+
+\DeclareFontShape{U}{knit}{w}{n}{<-> knitwn}{}
+\DeclareFontShape{U}{knit}{w}{p}{<-> knitwp}{}
+\DeclareFontShape{U}{knit}{w}{g}{<-> knitwg}{}
diff --git a/Master/texmf-dist/tex/plain/knitting/knitting.tex b/Master/texmf-dist/tex/plain/knitting/knitting.tex
index 0af576d6636..a78175d7935 100644
--- a/Master/texmf-dist/tex/plain/knitting/knitting.tex
+++ b/Master/texmf-dist/tex/plain/knitting/knitting.tex
@@ -21,7 +21,7 @@
% the file `knitting-doc.pdf' and its source code `knitting-doc.tex'.
%
-% Date: 2010/01/16
+% Date: 2010/01/17
%\pdfmapfile{+knitfont.map}