summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-03 23:25:37 +0000
committerKarl Berry <karl@freefriends.org>2009-07-03 23:25:37 +0000
commiteaa5409b8c62ca58fe6dc71c7f14b113047d7f7c (patch)
tree5b780017beb776976c9abfcf7927d012d62a9bbd
parent5000ffc09aa4ec0946b5009d554054b2dc9861b2 (diff)
circ update for inner bye (3jul09)
git-svn-id: svn://tug.org/texlive/trunk@14088 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/circ/COPYING (renamed from Master/texmf-dist/source/latex/circ/COPYING)0
-rw-r--r--Master/texmf-dist/doc/latex/circ/circ.dvibin75264 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circ/circ.pdfbin0 -> 273283 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circ/index.hlp (renamed from Master/texmf-dist/source/latex/circ/index.hlp)0
-rw-r--r--Master/texmf-dist/fonts/tfm/public/circ/cioptic.tfmbin868 -> 804 bytes
-rw-r--r--Master/texmf-dist/makeindex/circ/circ.ist6
-rw-r--r--Master/texmf-dist/source/latex/circ/circ.dtx6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
8 files changed, 6 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/circ/COPYING b/Master/texmf-dist/doc/latex/circ/COPYING
index d60c31a97a5..d60c31a97a5 100644
--- a/Master/texmf-dist/source/latex/circ/COPYING
+++ b/Master/texmf-dist/doc/latex/circ/COPYING
diff --git a/Master/texmf-dist/doc/latex/circ/circ.dvi b/Master/texmf-dist/doc/latex/circ/circ.dvi
deleted file mode 100644
index bcf26b5ea88..00000000000
--- a/Master/texmf-dist/doc/latex/circ/circ.dvi
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circ/circ.pdf b/Master/texmf-dist/doc/latex/circ/circ.pdf
new file mode 100644
index 00000000000..f2ab86d7e2e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/circ/circ.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/circ/index.hlp b/Master/texmf-dist/doc/latex/circ/index.hlp
index e5ef355c9fb..e5ef355c9fb 100644
--- a/Master/texmf-dist/source/latex/circ/index.hlp
+++ b/Master/texmf-dist/doc/latex/circ/index.hlp
diff --git a/Master/texmf-dist/fonts/tfm/public/circ/cioptic.tfm b/Master/texmf-dist/fonts/tfm/public/circ/cioptic.tfm
index 5f6e9637e04..996891405b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/circ/cioptic.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/circ/cioptic.tfm
Binary files differ
diff --git a/Master/texmf-dist/makeindex/circ/circ.ist b/Master/texmf-dist/makeindex/circ/circ.ist
deleted file mode 100644
index 06ae6db87b5..00000000000
--- a/Master/texmf-dist/makeindex/circ/circ.ist
+++ /dev/null
@@ -1,6 +0,0 @@
-%% LaTeX2e file `circ.ist'
-%% generated by the `filecontents' environment
-%% from source `circ' on 2003/07/28.
-%%
-delim_0 "\\hfill "
-delim_t "\\hbox to 7mm{\\hss}"
diff --git a/Master/texmf-dist/source/latex/circ/circ.dtx b/Master/texmf-dist/source/latex/circ/circ.dtx
index c8f1f8a7e7d..1316a676e6e 100644
--- a/Master/texmf-dist/source/latex/circ/circ.dtx
+++ b/Master/texmf-dist/source/latex/circ/circ.dtx
@@ -10,7 +10,7 @@
\expandafter\ifx\csname documentclass\endcsname\relax \input docstrip
\askforoverwritefalse\maxoutfiles{10} %<-- change this if you have problems
% CIRC is a LaTeX package to typeset circuit and optics diagrams.
-% Copyright (C) 1997,1998,2003 Sebastian Tannert and Andreas Tille
+% Copyright (C) 1997,1998,2003,2009 Sebastian Tannert and Andreas Tille
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -23,8 +23,7 @@
% GNU General Public License for more details.
%
% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+% along with this program; if not, see <http://www.gnu.org/licenses/>.
%
% For error reports concerning UNCHANGED versions of this file no
% more than one year old, see CIRC.DVI after installation.
@@ -3477,6 +3476,7 @@ message("CIRC %<+doc> \optionline "&optionname);
message("CIRC %<*"&font_identifier_&",doc>");
message("");
+inner bye;
def endCIRCfont =
message("CIRC %</"&font_identifier_&",doc>");
message("CIRC %<*"&font_identifier_&">");
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index aa76df59e17..6c333c33074 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -669,7 +669,7 @@ $standarddest = "texmf-dist";
'blacklettert1','fonts',
'blockdraw_mp','metapost',
'cb', 'fonts',
- 'cirth', 'fonts',
+ 'circ', 'latex',
'cirth', 'generic',
'cjhebrew', 'fonts',
'cmpica', 'fonts',
@@ -734,6 +734,7 @@ $standardsourcefmt='latex';
'barr', 'generic',
'bghyphen', 'generic',
'bidi', 'xelatex',
+ 'circ', 'latex',
'cirth', 'generic',
'dehyph-exptl','generic',
'dratex', 'generic',
@@ -978,6 +979,7 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'cbfonts', 'fonts',
'cc-pl', 'fonts',
'chicago-annote','bibtex',
+ 'circ', 'latex',
'cirth', 'fonts',
'cjhebrew', 'fonts',
'cm-super', 'fonts',