diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/pgf-soroban/Changes | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pgf-soroban/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.bib | 80 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.pdf | bin | 371241 -> 347332 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.tex | 34 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pgf-soroban/pgf-soroban.sty | 36 |
6 files changed, 79 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/latex/pgf-soroban/Changes b/Master/texmf-dist/doc/latex/pgf-soroban/Changes index d6ad0a43bf0..83813f8e537 100644 --- a/Master/texmf-dist/doc/latex/pgf-soroban/Changes +++ b/Master/texmf-dist/doc/latex/pgf-soroban/Changes @@ -1,5 +1,5 @@ pgf-soroban.sty -------- 2007-12-10 v1.00 first CTAN Version - +2013-11-27 v1.1 corrected version pgf-soroban-doc.tex -------- diff --git a/Master/texmf-dist/doc/latex/pgf-soroban/README b/Master/texmf-dist/doc/latex/pgf-soroban/README index 8766e8542c1..afc34680ca1 100644 --- a/Master/texmf-dist/doc/latex/pgf-soroban/README +++ b/Master/texmf-dist/doc/latex/pgf-soroban/README @@ -7,4 +7,4 @@ pgf-soroban-doc.bib - The documentation, bibfile This material is subject to The LaTeX Project Public License (lppl) -- -Alain Delmotte 2007-12-10 +Alain Delmotte 2013-11-27 (2007-12-10) diff --git a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.bib b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.bib index de92b83686e..3a982a0c906 100644 --- a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.bib +++ b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.bib @@ -1,52 +1,56 @@ -@Book{tlgc2, - author = {Goosens, Michel and Mittelbach, Frank and Rahtz, Sebastian and Roegel, Denis and Vo{\ss}, Herbert}, - title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, - edition = second, - year = {2007}, - address = {Reading, Mass.} +% This file was created with JabRef 2.9.2. +% Encoding: UTF8 + +@BOOK{fauskes1, + title = {PGF and Ti{\textit{k}}{Z} examples gallery}, + publisher = {\texttt{http://www.texample.net/tikz/examples/}}, + year = {2013}, + author = {Fauskes, Kjell Magne AND Kottwitz, Stefan} } -@BOOK{tikz, - author = {Tantau, Till}, - title = {Ti{\textit{k}}{Z} and {PGF}. {M}anual for version 1.18}, - publisher = {\texttt{http://sourceforge.net/projects/pgf}}, - year = {2007} +@BOOK{fauskes2, + title = {PGF and Ti{\textit{k}}{Z} resources}, + publisher = {\texttt{http://www.texample.net/tikz/resources/}}, + year = {2013}, + author = {Fauskes, Kjell Magne AND Kottwitz, Stefan} } -@BOOK{tikz2, - author = {Tantau, Till}, - title = {PGF and Ti{\textit{k}}{Z} -- Graphic systems for TeX}, - publisher = {\texttt{http://sourceforge.net/projects/pgf}}, - year = {2007} +@BOOK{tlgc2, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + year = {2007}, + author = {Goosens, Michel and Mittelbach, Frank and Rahtz, Sebastian and Roegel, + Denis and Vo{\ss}, Herbert}, + address = {Reading, Mass.}, + edition = second } -@book{fauskes1, - author = {Fauskes, Kjell Magne}, - title = {PGF and Ti{\textit{k}}{Z} examples gallery}, - publisher = {\texttt{http://www.fauskes.net/pgftikzexamples/}}, - year = {2007} +@BOOK{matthes, + title = {Ti{\textit{k}}{Z}/PGF}, + publisher = {\texttt{http://www.altermundus.fr/pages/pdflatex/tikz.html}}, + year = {2013}, + author = {Alain Matthes} } -@book{fauskes2, - author = {Fauskes, Kjell Magne}, - title = {PGF and Ti{\textit{k}}{Z} resources}, - publisher = {\texttt{http://www.fauskes.net/pgftikzexamples/resources/}}, - year = {2007} +@BOOK{mertz, + title = {Graphics with PGF and T{\textit{k}}{Z}}, + publisher = {\texttt{http://www.tug.org/pracjourn/2007-1/mertz/}}, + year = {2007}, + author = {Mertz, Andrew and Slough, William}, + journal = {The Prac{\TeX} {J}ournal} } -@book{matthes, - author = {Alain Matthes}, - title = {Ti{\textit{k}}{Z}/PGF}, - publisher = {\texttt{http://www.altermundus.fr/pages/pdflatex/tikz.html}}, - year = {2007} +@BOOK{tikz, + title = {Ti{\textit{k}}{Z} and {PGF}. {M}anual for version 2.10}, + publisher = {\texttt{http://sourceforge.net/projects/pgf}}, + year = {2013}, + author = {Tantau, Till} } -@book{mertz, - author = {Mertz, Andrew and Slough, William}, - title = {Graphics with PGF and T{\textit{k}}{Z}}, - publisher = {\texttt{http://www.tug.org/pracjourn/2007-1/mertz/}}, - journal = {The Prac{\TeX} {J}ournal}, - year = {2007} +@BOOK{tikz2, + title = {PGF and Ti{\textit{k}}{Z} -- Graphic systems for TeX}, + publisher = {\texttt{http://sourceforge.net/projects/pgf}}, + year = {2013}, + author = {Tantau, Till} } diff --git a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.pdf b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.pdf Binary files differindex 0bddca337e2..072e2815de0 100644 --- a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.pdf +++ b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.pdf diff --git a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.tex b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.tex index ef16b12416e..d85443290f6 100644 --- a/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.tex +++ b/Master/texmf-dist/doc/latex/pgf-soroban/pgf-soroban-doc.tex @@ -1,7 +1,7 @@ \documentclass[a4paper]{article} \usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} \usepackage{lmodern} \newcommand{\ttsl}[1]{\texttt{\textsl{#1}}} @@ -9,7 +9,7 @@ \title{SOROBAN abacus\\\ \\package \texttt{pgf-soroban}} \author{Alain Delmotte \texttt{esperanto@swing.be}} -\date{December 10, 2007} +\date{November 27, 2013} \begin{document} \maketitle @@ -122,27 +122,27 @@ Let's draw a soroban representing the number 321.45 in small size: 0.25. \hline \textbf{line}& \textbf{tikz/pgf} & \textbf{PStricks} \\ \hline -\verb§ 1§ & \verb§\ladj{0.25}§ & \verb§\psset{unit=0.25mm} §\\ -\verb§ 2§ & \verb§\begin{tikzpicture}§ & \verb§\begin{pspicture}(-2,-2)(122,76)§\\ -\verb§ 3§ & \verb§\tige{1}{0}{1} § & \verb§\tige{1}{0}{1} §\\ -\verb§ 4§ & \verb§\tige{2}{3}{0} § & \verb§\tige{2}{3}{0} §\\ -\verb§ 5§ & \verb§\tige{3}{2}{0} § & \verb§\tige{3}{2}{0} §\\ -\verb§ 6§ & \verb§\tige{4}{1}{1} § & \verb§\tige{4}{1}{1} §\\ -\verb§ 7§ & \verb§\tige{5}{4}{0} § & \verb§\tige{5}{4}{0} §\\ -\verb§ 8§ & \verb§\tige{6}{5}{0} § & \verb§\tige{6}{5}{0} §\\ -\verb§ 9§ & \verb§\cadre{6} § & \verb§\cadre{6} §\\ -\verb§10§ & \verb§\end{tikzpicture} § & \verb§\end{pspicture} §\\ +\verb| 1| & \verb|\ladj{0.25}| & \verb|\psset{unit=0.25mm} |\\ +\verb| 2| & \verb|\begin{tikzpicture}| & \verb|\begin{pspicture}(-2,-2)(122,76)|\\ +\verb| 3| & \verb|\tige{1}{0}{1} | & \verb|\tige{1}{0}{1} |\\ +\verb| 4| & \verb|\tige{2}{3}{0} | & \verb|\tige{2}{3}{0} |\\ +\verb| 5| & \verb|\tige{3}{2}{0} | & \verb|\tige{3}{2}{0} |\\ +\verb| 6| & \verb|\tige{4}{1}{1} | & \verb|\tige{4}{1}{1} |\\ +\verb| 7| & \verb|\tige{5}{4}{0} | & \verb|\tige{5}{4}{0} |\\ +\verb| 8| & \verb|\tige{6}{5}{0} | & \verb|\tige{6}{5}{0} |\\ +\verb| 9| & \verb|\cadre{6} | & \verb|\cadre{6} |\\ +\verb|10| & \verb|\end{tikzpicture} | & \verb|\end{pspicture} |\\ \hline \end{tabular} \vspace{6pt} -Line 1 defines the size, lines 2 and 10 create the picture environment, lines 3--8 draw the rods and line 9 creates the frame. +Line 1 defines the size, lines 2 and 10 create the picture environment, lines 3--8 draw the rods and line 9 creates the frame. Lines 3 and 6 specify a dotted rod (third argument = 1), the values (0, 3, 2, 1, 4 and 5) are in the second argument It is not necessary for tikz to specify the dimensions of the picture as the package reserves the area needed for the created graphic.~\footnote{\ For PStricks (\texttt{pst-soroban}), one has to give the dimensions of the picture, otherwise the drawing would have no size and would overlap the surrounding text. One gives some space before and below (\texttt{(-2,-2)}) and after above. The picture is 74.6 units hight and 20* number of rods wide (here \texttt{(122,76)}). Of course, if one adds something before, under, after or above the soroban, one has to adjust the corresponding part of the frame dimension.} To draw a rod, one uses the command \verb+\tige+. The syntax is: \begin{center} -\verb§\tige[§\ttsl{<st>}\verb§]{§\ttsl{<nu>}\verb§}{§\ttsl{<val>}\verb§}{§\ttsl{<un>}\verb§}§ +\verb|\tige[|\ttsl{<st>}\verb|]{|\ttsl{<nu>}\verb|}{|\ttsl{<val>}\verb|}{|\ttsl{<un>}\verb|}| \end{center} The \ttsl{<nu>} argument numbers the rods from left to right. \ttsl{<val>} is the number to be represented on the rod from 0 to 9. The \ttsl{<un>} argument tells that there is a dot on the central bar (1) or not (0); there is normally a dot for the unit, thousand, million,\dots ranks. @@ -177,14 +177,14 @@ The \ttsl{<st>} argument is optional and tells at which position the drawing is In this example, there is no frame but only parts of it above and below; this is created with the \verb+\barres+ command. The syntaxes for the frame and top/bottom lines are: \begin{center} -\verb§\cadre[§\ttsl{<st>}\verb§]{§\ttsl{<nb>}\verb§}§ and \verb§\barres[§\ttsl{<st>}\verb§]{§\ttsl{<nb>}\verb§}§. +\verb|\cadre[|\ttsl{<st>}\verb|]{|\ttsl{<nb>}\verb|}| and \verb|\barres[|\ttsl{<st>}\verb|]{|\ttsl{<nb>}\verb|}|. \end{center} The optional \ttsl{<st>} arguments are the same as the one of \verb+\tige+, the \ttsl{<nb>} argument tell how many rods have to be covered. If one wants to colour a specific bid , one can achieve this with \verb+\binoire+: \begin{center} -\verb§\binoire[§\ttsl{<st>}\verb§]{§\ttsl{<nu>}\verb§}{§\ttsl{<pos>}\verb§}{§\ttsl{<col>}\verb§}§ +\verb|\binoire[|\ttsl{<st>}\verb|]{|\ttsl{<nu>}\verb|}{|\ttsl{<pos>}\verb|}{|\ttsl{<col>}\verb|}| \end{center} \ttsl{<st>} and \ttsl{<nu>} arguments are the same as for \verb+\tige+; the \ttsl{<col>} argument defines the colour and the \ttsl{<pos>} argument tells which bid has to be coloured as shown in the following example. @@ -247,7 +247,7 @@ If one wants to colour a specific bid , one can achieve this with \verb+\binoire The \verb+\barbil+ command allows to cross a bid (see example below); the syntax is: \begin{center} -\verb§\barbil[§\ttsl{<st>}\verb§]{§\ttsl{<nu>}\verb§}{§\ttsl{<pos>}\verb§}§ +\verb|\barbil[|\ttsl{<st>}\verb|]{|\ttsl{<nu>}\verb|}{|\ttsl{<pos>}\verb|}| \end{center} The arguments \ttsl{<st>}, \ttsl{<nu>} and \ttsl{<pos>} have the same meaning as those of \verb+\binoire+. diff --git a/Master/texmf-dist/tex/latex/pgf-soroban/pgf-soroban.sty b/Master/texmf-dist/tex/latex/pgf-soroban/pgf-soroban.sty index b9c730f448a..43278e4b01e 100644 --- a/Master/texmf-dist/tex/latex/pgf-soroban/pgf-soroban.sty +++ b/Master/texmf-dist/tex/latex/pgf-soroban/pgf-soroban.sty @@ -4,11 +4,11 @@ %%% ==================================================================== %%% @LaTeX-file{ %%% filename = "pgf-soroban.sty", -%%% version = "1.0", -%%% date = "2007/12/10", +%%% version = "1.1", +%%% date = "2013/11/27", %%% author = "Alain Delmotte", %%% address = "Alain Delmotte, -%%% avenue du Marathon, 6, +%%% rampe du Couvent, 11a, %%% B-1348 Louvain-la-Neuve %%% BELGIUM", %%% email = "esperanto@swing.be", @@ -55,27 +55,27 @@ \newcommand{\tige}[4][1]{\setcounter{xx}{20*(#2-1+#1) - 10}% \support{\value{xx}} \ifthenelse{#3>4}{\bille{\value{xx},62}{\colbil}}{\bille{\value{xx},68.2}{\colbil}} -\ifthenelse{\(#3=0\)\or\(#3=5\)}{\foreach \m in {5.3,16,26.7,37.4} {\bille{\value{xx},\m}{\colbil};}}{% -\ifthenelse{\(#3=1\)\or\(#3=6\)}{\foreach \m in {5.3,16,26.7,46.9} {\bille{\value{xx},\m}{\colbil};}}{% -\ifthenelse{\(#3=2\)\or\(#3=7\)}{\foreach \m in {5.3,16,36.3,46.9} {\bille{\value{xx},\m}{\colbil};}}{% -\ifthenelse{\(#3=3\)\or\(#3=8\)}{\foreach \m in {5.3,25.6,36.3,46.9} {\bille{\value{xx},\m}{\colbil};}}{% -\ifthenelse{\(#3=4\)\or\(#3=9\)}{\foreach \m in {14.9,25.6,36.3,46.9} {\bille{\value{xx},\m}{\colbil};}}{% +\ifthenelse{\(#3=0\)\or\(#3=5\)}{\foreach \m in {5.3,16,26.7,37.4} {\bille{\value{xx},\m}{\colbil}}}{% +\ifthenelse{\(#3=1\)\or\(#3=6\)}{\foreach \m in {5.3,16,26.7,46.9} {\bille{\value{xx},\m}{\colbil}}}{% +\ifthenelse{\(#3=2\)\or\(#3=7\)}{\foreach \m in {5.3,16,36.3,46.9} {\bille{\value{xx},\m}{\colbil}}}{% +\ifthenelse{\(#3=3\)\or\(#3=8\)}{\foreach \m in {5.3,25.6,36.3,46.9} {\bille{\value{xx},\m}{\colbil}}}{% +\ifthenelse{\(#3=4\)\or\(#3=9\)}{\foreach \m in {14.9,25.6,36.3,46.9} {\bille{\value{xx},\m}{\colbil}}}{% }}}}} \ifthenelse{#4=1}{\draw[fill=black,x= \unba, y= \unba] (\value{xx},54.4) circle(\unba);}{} } \newcommand{\binoire}[4][1]{% \setcounter{xx}{20*(#2-1+#1)-10} -\ifthenelse{#3=1}{\bille{\value{xx},5.3}{#4};}{% 1 en bas xooo o -\ifthenelse{#3=2}{\bille{\value{xx},16}{#4};}{% 2 oxoo o -\ifthenelse{#3=3}{\bille{\value{xx},26.7}{#4};}{% 3 ooxo o -\ifthenelse{#3=4}{\bille{\value{xx},37.4}{#4};}{% 4 ooox o -\ifthenelse{#3=5}{\bille{\value{xx},46.9}{#4};}{% 6 ooo x o -\ifthenelse{#3=6}{\bille{\value{xx},36.3}{#4};}{% 7 oo xo o -\ifthenelse{#3=7}{\bille{\value{xx},25.6}{#4};}{% 8 o xoo o -\ifthenelse{#3=8}{\bille{\value{xx},14.9}{#4};}{% 9 xooo o -\ifthenelse{#3=9}{\bille{\value{xx},68.2}{#4};}{% 5 * 0 oooo x -\ifthenelse{#3=10}{\bille{\value{xx},62}{#4};}{% 5 * 1 oooo x +\ifthenelse{#3=1}{\bille{\value{xx},5.3}{#4}}{% 1 en bas xooo o +\ifthenelse{#3=2}{\bille{\value{xx},16}{#4}}{% 2 oxoo o +\ifthenelse{#3=3}{\bille{\value{xx},26.7}{#4}}{% 3 ooxo o +\ifthenelse{#3=4}{\bille{\value{xx},37.4}{#4}}{% 4 ooox o +\ifthenelse{#3=5}{\bille{\value{xx},46.9}{#4}}{% 6 ooo x o +\ifthenelse{#3=6}{\bille{\value{xx},36.3}{#4}}{% 7 oo xo o +\ifthenelse{#3=7}{\bille{\value{xx},25.6}{#4}}{% 8 o xoo o +\ifthenelse{#3=8}{\bille{\value{xx},14.9}{#4}}{% 9 xooo o +\ifthenelse{#3=9}{\bille{\value{xx},68.2}{#4}}{% 5 * 0 oooo x +\ifthenelse{#3=10}{\bille{\value{xx},62}{#4}}{% 5 * 1 oooo x }}}}}}}}}} } |