diff options
author | Mamoru Komachi <usata@gentoo.org> | 2003-09-08 23:49:48 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2003-09-08 23:49:48 +0000 |
commit | 066c8f7c5d33c353a8c88ffb65661f5ef8c8fa3a (patch) | |
tree | 6eb9b4ce4900b8302d3c6bf85d1c3f3aafa3d26a | |
parent | new local flag : xine for rhythmbox (diff) | |
download | historical-066c8f7c5d33c353a8c88ffb65661f5ef8c8fa3a.tar.gz historical-066c8f7c5d33c353a8c88ffb65661f5ef8c8fa3a.tar.bz2 historical-066c8f7c5d33c353a8c88ffb65661f5ef8c8fa3a.zip |
clean up patches. closing Bug #28136
-rw-r--r-- | app-text/tetex/ChangeLog | 10 | ||||
-rw-r--r-- | app-text/tetex/Manifest | 17 | ||||
-rw-r--r-- | app-text/tetex/files/tetex-1.0.7-dvips-secure.diff (renamed from app-text/tetex/files/tetex-1.0.7-r11-gentoo.diff) | 0 | ||||
-rw-r--r-- | app-text/tetex/files/tetex-1.0.7-r12-gentoo.diff | 34 | ||||
-rw-r--r-- | app-text/tetex/files/tetex-2.0-dont-run-config.diff | 33 | ||||
-rw-r--r-- | app-text/tetex/files/tetex-2.0.diff | 47 | ||||
-rw-r--r-- | app-text/tetex/files/texmf.dif | 942 | ||||
-rw-r--r-- | app-text/tetex/metadata.xml | 11 | ||||
-rw-r--r-- | app-text/tetex/tetex-1.0.7-r12.ebuild | 8 | ||||
-rw-r--r-- | app-text/tetex/tetex-1.0.7-r13.ebuild | 21 | ||||
-rw-r--r-- | app-text/tetex/tetex-2.0.2-r1.ebuild | 9 | ||||
-rw-r--r-- | app-text/tetex/tetex-2.0.2.ebuild | 8 |
12 files changed, 54 insertions, 1086 deletions
diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog index 8296ab432da7..edb21029d57b 100644 --- a/app-text/tetex/ChangeLog +++ b/app-text/tetex/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/tetex # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.44 2003/09/07 01:01:48 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.45 2003/09/08 23:49:43 usata Exp $ + + 09 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> tetex-1.0.7-r12.ebuild, + tetex-1.0.7-r13.ebuild, tetex-2.0.2-r1.ebuild, tetex-2.0.2.ebuild, + files/tetex-1.0.7-dvips-secure.diff, files/tetex-1.0.7-r11-gentoo.diff, + files/tetex-1.0.7-r12-gentoo.diff, files/tetex-2.0-dont-run-config.diff, + files/tetex-2.0.diff, files/texmf.dif: + Simplified tetex-1.0.7-r??-gentoo.diff. This closes Bug #28136. + Removed old unnecessary patches. 06 Sep 2003; Daniel Robbins <drobbins@gentoo.org> tetex-2.0.2-r1.ebuild, tetex-1.0.7-r13.ebuild: removed png, libwww and ncurses USE variables, which diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest index acacb206bb39..1d04c2eed36b 100644 --- a/app-text/tetex/Manifest +++ b/app-text/tetex/Manifest @@ -1,20 +1,17 @@ -MD5 06dafbfde07556563930349cbca4effa ChangeLog 8104 -MD5 fc241435526292f71de6d264d86d4b8f tetex-1.0.7-r12.ebuild 4841 -MD5 54266fdca91026ded5f015bd8dbc3736 tetex-2.0.2.ebuild 4539 -MD5 6041ae005d035be91659427abda37621 tetex-1.0.7-r13.ebuild 4632 -MD5 e6ae2734e65933ac0439cd7b5c48c09d tetex-2.0.2-r1.ebuild 4302 +MD5 b3d04ec0e38f3842576c5561cd36b8f5 ChangeLog 8536 +MD5 85a9d5eca55db15fdcd286988357e4da tetex-1.0.7-r12.ebuild 4870 +MD5 e3aa41742f9026aa3c4274d397fe311d tetex-2.0.2.ebuild 4557 +MD5 344ca64972a437dfb3ffaf5a5e812137 metadata.xml 282 +MD5 3a6aaa1f8eddc5b02ec660f931d8da8f tetex-1.0.7-r13.ebuild 4613 +MD5 342d0dff8e4cc84153079698fa8e1753 tetex-2.0.2-r1.ebuild 4313 MD5 eb29daccee75f5f007fa30e18ff0ccb8 files/digest-tetex-1.0.7-r12 1132 MD5 b8cb43e3d6ac916e7d69e843b43aafad files/digest-tetex-2.0.2 1068 MD5 4cefd677082951973c64809e5368874f files/teTeX-1.0-dvips.diff 389 MD5 f05081952fcd0ac7d776c04242a3f7d1 files/teTeX-1.0-gentoo.diff 1176 MD5 cc0a84367e8c96d736ca42ba162594dd files/teTeX-1.0.dif 50852 MD5 5fd1b7e5bf4c4d6705e7c365995d057d files/tetex-1.0.7-dont-run-config.diff 1305 -MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-r11-gentoo.diff 1693 -MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-r12-gentoo.diff 1693 -MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0-dont-run-config.diff 1243 MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243 MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010 -MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.diff 2010 -MD5 f7a5360e9a44fa9ad6d14bd00127e6a0 files/texmf.dif 37948 MD5 e25ee6dd9708723dc411b9acc3ec33db files/digest-tetex-1.0.7-r13 274 MD5 d17a70a33444ac4f10849dfb55af858c files/digest-tetex-2.0.2-r1 214 +MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-dvips-secure.diff 1693 diff --git a/app-text/tetex/files/tetex-1.0.7-r11-gentoo.diff b/app-text/tetex/files/tetex-1.0.7-dvips-secure.diff index b4ebc61103b8..b4ebc61103b8 100644 --- a/app-text/tetex/files/tetex-1.0.7-r11-gentoo.diff +++ b/app-text/tetex/files/tetex-1.0.7-dvips-secure.diff diff --git a/app-text/tetex/files/tetex-1.0.7-r12-gentoo.diff b/app-text/tetex/files/tetex-1.0.7-r12-gentoo.diff deleted file mode 100644 index b4ebc61103b8..000000000000 --- a/app-text/tetex/files/tetex-1.0.7-r12-gentoo.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- teTeX-1.0/texk/dvipsk/dvips.c.secure 2002-05-28 12:18:55.000000000 +0100 -+++ teTeX-1.0/texk/dvipsk/dvips.c 2002-05-28 12:26:38.000000000 +0100 -@@ -64,7 +64,7 @@ - Boolean cropmarks ; /* add cropmarks? */ - Boolean abspage = 0 ; /* are page numbers absolute? */ - Boolean tryepsf = 0 ; /* should we try to make it espf? */ --Boolean secure = 0 ; /* make safe for suid */ -+Boolean secure = 1 ; /* make safe for suid */ - int collatedcopies = 1 ; /* how many collated copies? */ - int sectioncopies = 1 ; /* how many times to repeat each section? */ - integer pagecopies = 1 ; /* how many times to repeat each page? */ -@@ -280,7 +280,7 @@ - "p # First page P s Load config.$s ", - #endif - "q* Run quietly ", --"r* Reverse order of pages R Run securely ", -+"r* Reverse order of pages R Run securely (default) ", - "s* Enclose output in save/restore S # Max section size in pages ", - "t s Paper format T c Specify desired page size ", - "u s PS mapfile U* Disable string param trick ", ---- teTeX-1.0/texk/dvipsk/dvips.1.secure 2002-05-28 12:28:59.000000000 +0100 -+++ teTeX-1.0/texk/dvipsk/dvips.1 2002-05-28 12:30:59.000000000 +0100 -@@ -328,7 +328,9 @@ - .I \\\special{psfile="`zcat foo.ps.Z"} - or - .I \epsffile[72 72 540 720]{"`zcat screendump.ps.gz"} --are not executed. -+are not executed. This is the default; to run insecurely use the -+.B -R0 -+option. - .TP - .B -s - Causes the entire global output to be enclosed in a save/restore pair. - diff --git a/app-text/tetex/files/tetex-2.0-dont-run-config.diff b/app-text/tetex/files/tetex-2.0-dont-run-config.diff deleted file mode 100644 index 6ab71bc5b229..000000000000 --- a/app-text/tetex/files/tetex-2.0-dont-run-config.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.in.orig 2003-01-13 00:34:32.000000000 -0600 -+++ Makefile.in 2003-01-13 00:35:42.000000000 -0600 -@@ -59,18 +59,18 @@ - done - $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c" - cd $(bindir); for i in $(ALLPROGS); do test -f $$i && echo strip $$i && strip $$i || true; done -- if test -f $(scriptdir)/mktexlsr; then \ -- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -- $(scriptdir)/mktexlsr; \ -- else :; fi -- if test -f $(scriptdir)/fmtutil; then \ -- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -- $(scriptdir)/fmtutil --all; \ -- else :; fi -- if test -f $(scriptdir)/texlinks; then \ -- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -- $(scriptdir)/texlinks; \ -- else :; fi -+ #if test -f $(scriptdir)/mktexlsr; then \ -+ # TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ # $(scriptdir)/mktexlsr; \ -+ #else :; fi -+ #if test -f $(scriptdir)/fmtutil; then \ -+ # TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ # $(scriptdir)/fmtutil --all; \ -+ #else :; fi -+ #if test -f $(scriptdir)/texlinks; then \ -+ # TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ # $(scriptdir)/texlinks; \ -+ #else :; fi - - install-exec: - for dir in $(ESUBDIRS); do \ diff --git a/app-text/tetex/files/tetex-2.0.diff b/app-text/tetex/files/tetex-2.0.diff deleted file mode 100644 index cc9f775e0e67..000000000000 --- a/app-text/tetex/files/tetex-2.0.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -ru tetex-src-2.0-orig/texk/kpathsea/texmf.in tetex-src-2.0/texk/kpathsea/texmf.in ---- tetex-src-2.0-orig/texk/kpathsea/texmf.in 2003-01-19 05:58:27.000000000 -0600 -+++ tetex-src-2.0/texk/kpathsea/texmf.in 2003-02-05 20:17:16.000000000 -0600 -@@ -58,7 +58,7 @@ - TEXMFMAIN = @texmf@ - - % A place for local additions to a "standard" texmf tree. For example: --TEXMFLOCAL = @texmf@-local -+TEXMFLOCAL = /usr/local/share/texmf - - % If defined, teTeX's texconfig stores modifications here (instead of the - % TEXMFMAIN tree). -diff -ru tetex-src-2.0-orig/texk/web2c/fmtutil.in tetex-src-2.0/texk/web2c/fmtutil.in ---- tetex-src-2.0-orig/texk/web2c/fmtutil.in 2003-01-26 16:24:30.000000000 -0600 -+++ tetex-src-2.0/texk/web2c/fmtutil.in 2003-02-05 20:17:44.000000000 -0600 -@@ -39,7 +39,7 @@ - - # Change "tex.ini -> bplain.ini" and "- -> language.dat" - # if you want babel support in tex: --tex @TEXBIN@ - tex.ini -+tex @TEXBIN@ language.dat bplain.ini - # Change "tex -> etex" and "latex.ini -> *latex.ini" to get an - # eTeX-2 enabled LaTeX format named latex. Or, don't change anything - # and use elatex which is just the same. -@@ -48,7 +48,7 @@ - @ETEX@elatex etex language.dat *elatex.ini - # Change "pdftex.ini -> pdfbplain.ini" and "- -> language.dat" - # if you want babel support in pdftex: --@PTEX@pdftex pdftex - pdftex.ini -+@PTEX@pdftex pdftex language.dat pdfbplain.ini - @PTEX@pdflatex pdftex language.dat pdflatex.ini - @PETEX@pdfetex pdfetex language.def *pdfetex.ini - @PETEX@pdfelatex pdfetex language.dat *pdfelatex.ini -@@ -59,11 +59,11 @@ - - # Change "amstex.ini -> bamstex.ini" and "- -> language.dat" - # if you want babel support in amstex: --#! amstex @TEXBIN@ - amstex.ini -+ amstex @TEXBIN@ language.dat bamstex.ini - - # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat" - # if you want babel support in pdfamstex: --#! pdfamstex pdftex - pdfamstex.ini -+ pdfamstex pdftex language.dat pdfbamstex.ini - - # Context formats: - #! cont-cz pdfetex cont-usr.tex *cont-cz.ini diff --git a/app-text/tetex/files/texmf.dif b/app-text/tetex/files/texmf.dif deleted file mode 100644 index a5c32328c2a2..000000000000 --- a/app-text/tetex/files/texmf.dif +++ /dev/null @@ -1,942 +0,0 @@ ---- doc/help/faq/de-tex-faq/part1 -+++ doc/help/faq/de-tex-faq/part1 Tue Feb 22 17:00:43 2000 -@@ -1,38 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed.ision.net!ision!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 1 of 11) --Supersedes: <de-tex-faq-1-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:07 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 724 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214687 9492 134.93.8.35 (18 Jan 2000 16:58:07 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:07 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27406 de.answers:4110 news.answers:175379 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part1 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 1 --- - - Fragen und Antworten (FAQ) über das Textsatzsystem TeX und DANTE, ---- doc/help/faq/de-tex-faq/part10 -+++ doc/help/faq/de-tex-faq/part10 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!netnews.com!newsfeed.icl.net!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 10 of 11) --Supersedes: <de-tex-faq-10-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:59:51 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 512 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-10-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214791 9507 134.93.8.35 (18 Jan 2000 16:59:51 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:59:51 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27415 de.answers:4119 news.answers:175388 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part10 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 10 --- - - ---- doc/help/faq/de-tex-faq/part11 -+++ doc/help/faq/de-tex-faq/part11 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!howland.erols.net!newsfeed.tli.de!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 11 of 11) --Supersedes: <de-tex-faq-11-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 17:00:07 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 600 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-11-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214807 9509 134.93.8.35 (18 Jan 2000 17:00:07 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 17:00:07 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27416 de.answers:4120 news.answers:175389 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part11 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 11 --- - - ---- doc/help/faq/de-tex-faq/part2 -+++ doc/help/faq/de-tex-faq/part2 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!howland.erols.net!news.maxwell.syr.edu!news-was.dfn.de!news-lei1.dfn.de!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 2 of 11) --Supersedes: <de-tex-faq-2-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:13 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 605 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-2-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214693 9493 134.93.8.35 (18 Jan 2000 16:58:13 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:13 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27407 de.answers:4111 news.answers:175380 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part2 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 2 --- - - ---- doc/help/faq/de-tex-faq/part3 -+++ doc/help/faq/de-tex-faq/part3 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!netnews.com!newsfeed.icl.net!newsfeed00.sul.t-online.de!t-online.de!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 3 of 11) --Supersedes: <de-tex-faq-3-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:16 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 796 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-3-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214696 9494 134.93.8.35 (18 Jan 2000 16:58:16 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:16 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27408 de.answers:4112 news.answers:175381 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part3 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 3 --- - - ---- doc/help/faq/de-tex-faq/part4 -+++ doc/help/faq/de-tex-faq/part4 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!howland.erols.net!newsfeed.tli.de!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 4 of 11) --Supersedes: <de-tex-faq-4-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:22 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 734 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-4-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214702 9495 134.93.8.35 (18 Jan 2000 16:58:22 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:22 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27409 de.answers:4113 news.answers:175382 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part4 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 4 --- - - ---- doc/help/faq/de-tex-faq/part5 -+++ doc/help/faq/de-tex-faq/part5 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!netnews.com!newsfeed.icl.net!colt.net!newsfeeds.belnet.be!news.belnet.be!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 5 of 11) --Supersedes: <de-tex-faq-5-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:36 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 755 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-5-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214716 9496 134.93.8.35 (18 Jan 2000 16:58:36 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:36 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27410 de.answers:4114 news.answers:175383 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part5 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 5 --- - - ---- doc/help/faq/de-tex-faq/part6 -+++ doc/help/faq/de-tex-faq/part6 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!netnews.com!newsfeed.icl.net!newsfeed00.sul.t-online.de!t-online.de!bignews.mediaways.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 6 of 11) --Supersedes: <de-tex-faq-6-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:58:50 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 794 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-6-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214730 9497 134.93.8.35 (18 Jan 2000 16:58:50 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:58:50 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27411 de.answers:4115 news.answers:175384 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part6 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 6 --- - - ---- doc/help/faq/de-tex-faq/part7 -+++ doc/help/faq/de-tex-faq/part7 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!newsswitch.lcs.mit.edu!netnews.com!newsfeed.icl.net!newsfeed00.sul.t-online.de!newsfeed01.sul.t-online.de!t-online.de!fu-berlin.de!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 7 of 11) --Supersedes: <de-tex-faq-7-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:59:07 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 669 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-7-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214747 9501 134.93.8.35 (18 Jan 2000 16:59:07 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:59:07 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27412 de.answers:4116 news.answers:175385 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part7 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 7 --- - - ---- doc/help/faq/de-tex-faq/part8 -+++ doc/help/faq/de-tex-faq/part8 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!howland.erols.net!newsfeed.nacamar.de!newsfeeds.belnet.be!news.belnet.be!newscore.gigabell.net!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 8 of 11) --Supersedes: <de-tex-faq-8-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:59:17 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 873 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-8-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214757 9502 134.93.8.35 (18 Jan 2000 16:59:17 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:59:17 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27413 de.answers:4117 news.answers:175386 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part8 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 8 --- - - ---- doc/help/faq/de-tex-faq/part9 -+++ doc/help/faq/de-tex-faq/part9 Tue Feb 22 17:00:43 2000 -@@ -1,39 +1,3 @@ --Path: senator-bedfellow.mit.edu!bloom-beacon.mit.edu!news-stl.cp.verio.net!news.verio.net!newshub.northeast.verio.net!verio!fu-berlin.de!news-fra1.dfn.de!news.Uni-Mainz.DE!german --From: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --Newsgroups: de.comp.text.tex,de.answers,news.answers --Subject: TeX, LaTeX, DANTE e.V.: FAQ - Fragen und Antworten (Part 9 of 11) --Supersedes: <de-tex-faq-9-945699165@dante.de> --Followup-To: de.comp.text.tex --Date: 18 Jan 2000 16:59:36 GMT --Organization: DANTE, Deutschsprachige Anwendervereinigung TeX e.V. --Lines: 501 --Approved: news-answers-request@MIT.EDU --Distribution: world --Expires: 03 Mar 00 17:58:47 --Message-ID: <de-tex-faq-9-948214727@dante.de> --References: <de-tex-faq-1-948214727@dante.de> --Reply-To: dantefaq@dante.de (DE-TeX-FAQ-Maintainer) --NNTP-Posting-Host: sun2.dante.de --Mime-Version: 1.0 --Content-Type: text/plain; charset=ISO-8859-1 --Content-Transfer-Encoding: 8bit --X-Trace: bambi.zdv.Uni-Mainz.DE 948214776 9506 134.93.8.35 (18 Jan 2000 16:59:36 GMT) --X-Complaints-To: usenet@mail.uni-mainz.de --NNTP-Posting-Date: 18 Jan 2000 16:59:36 GMT --Summary: This posting contains a list of Frequently Asked Questions -- (and their answers) about the typesetting system TeX and -- about DANTE e.V., the german-speaking TeX users group. -- It is in German and uses the ISO Latin-1 character set. --Keywords: FAQ TYPESETTING TeX USERGROUP DANTE --Originator: german@sun2.dante.de --Xref: senator-bedfellow.mit.edu de.comp.text.tex:27414 de.answers:4118 news.answers:175387 -- --Posted-By: auto-faq 3.3 (Perl 5.005) --Archive-name: de-tex-faq/part9 --Posting-Frequency: monthly --Copyright-Notice: siehe Abschnitt 1.1/see Section 1.1 --URL: http://www.dante.de/faq/de-tex-faq/ -- - --- DE-TeX-FAQ Beginn Teil 9 --- - - ---- pdftex/config/pdftex.cfg -+++ pdftex/config/pdftex.cfg Tue Feb 22 17:01:41 2000 -@@ -2,10 +2,10 @@ - output_format 1 - compress_level 9 - decimal_digits 3 --page_width 210mm --page_height 297mm --horigin 1in --vorigin 1in -+page_width 210truemm -+page_height 297truemm -+horigin 1truein -+vorigin 1truein - % pdftex.map is set up by texmf/dvips/config/updmap - map pdftex.map - % This shows how to add your own map file. ---- pdftex/texinfo/pdftexinfo.tex -+++ pdftex/texinfo/pdftexinfo.tex Wed May 31 10:54:26 2000 -@@ -5481,7 +5481,7 @@ - \fi - \endgroup - \else -- \centerline{\pdfimage #1.pdf}% -+ \centerline{\pdfimage{#1.pdf}}% - \fi - } - ---- tex/latex/misc/fancybox.sty -+++ tex/latex/misc/fancybox.sty Tue Feb 22 17:00:43 2000 -@@ -1,16 +1,11 @@ - %% BEGIN fancybox.sty --\def\fileversion{1.2} --\def\filedate{1998/02/27} -+\def\fileversion{1.3} -+\def\filedate{1998/09/17} - % DG/SR modification begin - May 16, 1997 --\providecommand\@begindvi{} % For rather old versions of LaTeX 2e --% Problem FancyBox 1.0 <-> LaTeX 2e with the \fancyput macro --% The following line solve several problems in `fancybox' macros, --% but has the bad side effect to inhibit the table of contents generation. --% If you really need the TOC, try to comment next line and to recompile. --% But if it doesn't work, there is no currently known solution in this case. --\newcount\c@tocdepth -+\providecommand\@begindvi{} % For rather old versions of LaTeX 2e -+\providecommand\normalsfcodes{} % For versions of LaTeX 2e before 06/97 - % DG/SR modification end --% DG/SR modification begin - Feb. 27, 1997 -+% DG/SR modification begin - Feb. 27, 1998 - % Now defined only in latex209.def - \def\@lquote{\leavevmode{\kern\z@}`} - % DG/SR modification end -@@ -357,39 +352,126 @@ - \@namedef{Beqnarray*}{\def\@eqncr{\nonumber\@seqncr}\Beqnarray} - \@namedef{endBeqnarray*}{\nonumber\endBeqnarray} - --% \fb@outputage -+% \fb@outputpage -+ -+% DG/SR modification begin - Oct. 1997 / Sep. 1998 -+% Problem FancyBox 1.0 <-> LaTeX 2e with the \fancypage, \fancyput, -+% etc. macros when using commands like \section -+% We reintroduce the changes of fancybox in the new LaTeX 2e code -+% for \@outputpage (06/98 release) - - % Here we insert various hooks for rotating or framing the page. - % Otherwise, it is the usual \@outputpage - -+%\def\fb@outputpage{% -+% \begingroup -+% \catcode`\ =10 -+% \let\-\@dischyph -+% \let\'\@acci -+% \let\`\@accii -+% \let\=\@acciii -+% \if@specialpage -+% \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% -+% \fi -+% \if@twoside -+% \ifodd\count\z@ -+% \let\@thehead\@oddhead -+% \let\@thefoot\@oddfoot -+% \let\@themargin\oddsidemargin -+% \else -+% \let\@thehead\@evenhead -+% \let\@thefoot\@evenfoot -+% \let\@themargin\evensidemargin -+% \fi -+% \fi -+% \csname reset@font\endcsname -+% \normalsize -+% \baselineskip\z@ -+% \lineskip\z@ -+% \let\par\@@par -+% \ifx\this@fancypage\@empty\else -+% \this@fancypage -+% \gdef\this@fancypage{}% -+% \fi -+% \ifx\the@fancypage\@empty\else -+% \setbox\@outputbox\hbox{\the@fancypage{\box\@outputbox}}% -+% \fi -+% \ifx\fb@@rotatepage\@empty\else -+% \setbox\@outputbox\hbox{\fb@@rotatepage{\box\@outputbox}}% -+% \fi -+% \setbox\@outputbox\vbox{% -+% \@tempdima=\wd\@outputbox -+% \setbox\@tempboxa=\hbox to\@tempdima{% -+% \let\label\@gobble -+% \let\index\@gobble -+% \let\glossary\@gobble -+% \@thehead}% -+% \ht\@tempboxa\headheight -+% \dp\@tempboxa\z@ -+% \box\@tempboxa -+% \vskip\headsep -+% \box\@outputbox -+% \baselineskip\footskip -+% \hbox to\@tempdima{% -+% \let\label\@gobble -+% \let\index\@gobble -+% \let\glossary\@gobble -+% \@thefoot}} -+% \ifx\the@@fancypage\@empty\else -+% \setbox\@outputbox\hbox{\the@@fancypage{\box\@outputbox}}% -+% \fi -+% \setbox\@outputbox\vbox{% -+% \ifnum\fancyput@flag>-1 \do@fancyput\fi -+% \vskip\topmargin -+% \moveright\@themargin\box\@outputbox}% -+% \ifx\fb@rotatepage\@empty\else -+% \setbox\@outputbox\hbox{\lower\ht\@outputbox\box\@outputbox}% -+% \dp\@outputbox\z@ -+% \wd\@outputbox\z@ -+% \setbox\@outputbox\hbox{\fb@rotatepage{\box\@outputbox}}% -+% \expandafter\fb@setoffsets\fb@theoffsets -+% \fi -+% \shipout\box\@outputbox -+% \global\@colht\textheight -+% \endgroup -+% \stepcounter{page}% -+% \let\firstmark\botmark} -+ - \def\fb@outputpage{% -- \begingroup -- \catcode`\ =10 -- \let\-\@dischyph -- \let\'\@acci -- \let\`\@accii -- \let\=\@acciii -- \if@specialpage -- \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% -- \fi -- \if@twoside -- \ifodd\count\z@ -- \let\@thehead\@oddhead -- \let\@thefoot\@oddfoot -- \let\@themargin\oddsidemargin -- \else -- \let\@thehead\@evenhead -- \let\@thefoot\@evenfoot -- \let\@themargin\evensidemargin -- \fi -+%% From LaTeX 2e code (with some changes) -+\begingroup % the \endgroup is put in by \aftergroup -+ \let \protect \noexpand -+ \@resetactivechars -+ \@parboxrestore -+%% -+ \global\setbox\@outputbox\vbox{% -+%% From LaTeX 2e code -+ \set@typeset@protect -+ \aftergroup \endgroup -+ \aftergroup \set@typeset@protect -+ % correct? or just restore by ending -+ % the group? -+ \if@specialpage -+ \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% -+ \fi -+ \if@twoside -+ \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot -+ \let\@themargin\oddsidemargin -+ \else \let\@thehead\@evenhead -+ \let\@thefoot\@evenfoot \let\@themargin\evensidemargin - \fi -- \csname reset@font\endcsname -- \normalsize -- \baselineskip\z@ -- \lineskip\z@ -- \let\par\@@par -+ \fi -+ \reset@font -+ \normalsize -+ \normalsfcodes -+ \let\label\@gobble -+ \let\index\@gobble -+ \let\glossary\@gobble -+ \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ -+ \@begindvi -+%% From original fancybox code - \ifx\this@fancypage\@empty\else -- \this@fancypage -+ \this@fancypage % - \gdef\this@fancypage{}% - \fi - \ifx\the@fancypage\@empty\else -@@ -398,43 +480,55 @@ - \ifx\fb@@rotatepage\@empty\else - \setbox\@outputbox\hbox{\fb@@rotatepage{\box\@outputbox}}% - \fi -- \setbox\@outputbox\vbox{% -- \@tempdima=\wd\@outputbox -- \setbox\@tempboxa=\hbox to\@tempdima{% -- \let\label\@gobble -- \let\index\@gobble -- \let\glossary\@gobble -- \@thehead}% -- \ht\@tempboxa\headheight -- \dp\@tempboxa\z@ -+%% From fancybox with changes -+ \ifnum\fancyput@flag>-1 -+ \do@fancyput % -+ \fi -+%% From LaTeX 2e code -+ \vskip\topmargin -+%% -+ \setbox\@outputbox \vbox{% -+%% From LaTeX 2e code -+ \setbox\@tempboxa=\vbox to\headheight{% -+ \vfil -+ \color@hbox -+ \normalcolor -+ \hb@xt@\textwidth{\@thehead}% -+ \color@endbox -+ }% %% 22 Feb 87 -+ \dp\@tempboxa \z@ - \box\@tempboxa - \vskip\headsep - \box\@outputbox -- \baselineskip\footskip -- \hbox to\@tempdima{% -- \let\label\@gobble -- \let\index\@gobble -- \let\glossary\@gobble -- \@thefoot}} -- \ifx\the@@fancypage\@empty\else -- \setbox\@outputbox\hbox{\the@@fancypage{\box\@outputbox}}% -- \fi -- \setbox\@outputbox\vbox{% -- \ifnum\fancyput@flag>-1 \do@fancyput\fi -- \vskip\topmargin -- \moveright\@themargin\box\@outputbox}% -- \ifx\fb@rotatepage\@empty\else -- \setbox\@outputbox\hbox{\lower\ht\@outputbox\box\@outputbox}% -- \dp\@outputbox\z@ -- \wd\@outputbox\z@ -- \setbox\@outputbox\hbox{\fb@rotatepage{\box\@outputbox}}% -- \expandafter\fb@setoffsets\fb@theoffsets -+ \baselineskip \footskip -+ \color@hbox -+ \normalcolor -+ \hb@xt@\textwidth{\@thefoot}% -+ \color@endbox -+ }% -+%% Changed from fancybox code -+ \ifx\the@@fancypage\@empty -+ \vbox{\moveright\@themargin\box\@outputbox}% -+ \else -+ \vbox{\moveright\@themargin\hbox{\the@@fancypage{\box\@outputbox}}}% - \fi -- \shipout\box\@outputbox -- \global\@colht\textheight -- \endgroup -+ }% At this point page is ready for shipping out -+ \ifx\fb@rotatepage\@empty\else -+ \setbox\@outputbox\hbox{\lower\ht\@outputbox\box\@outputbox}% -+ \dp\@outputbox\z@ -+ \wd\@outputbox\z@ -+ \setbox\@outputbox\hbox{\fb@rotatepage{\box\@outputbox}}% -+ \expandafter\fb@setoffsets\fb@theoffsets -+ \fi -+ % Avoid epxansion of internal macros -+ \let\protect\noexpand -+ \shipout\box\@outputbox -+%% From LaTeX 2e code -+ \global\@colht\textheight - \stepcounter{page}% -- \let\firstmark\botmark} -+ \let\firstmark\botmark -+} -+% DG/SR modification end - - % \fancypage - -@@ -443,17 +537,11 @@ - \def\this@fancypage{} - - \def\fancypage#1#2{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \def\the@fancypage{#1}% - \def\the@@fancypage{#2}% - \def\@outputpage{\fb@outputpage}} - - \def\thisfancypage#1#2{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \gdef\@outputpage{\fb@outputpage}% - \gdef\this@fancypage{\def\the@fancypage{#1}\def\the@@fancypage{#2}}} - -@@ -471,9 +559,6 @@ - % \fancyput@flag=-1 if no fancyput, 0 if regular fancyput, 1 if thisfancyput. - - \def\fancyput{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \def\@outputpage{\fb@outputpage} - \@ifstar{\@testtrue\@fancyput}{\@testfalse\@fancyput}} - \def\@fancyput{\@ifnextchar({\@@fancyput}{\@@fancyput(\z@,\z@)}} -@@ -486,9 +571,6 @@ - \gdef\fancyput@flag{\z@}} - - \def\thisfancyput{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \gdef\@outputpage{\fb@outputpage} - \@ifstar{\@testtrue\@thisfancyput}{\@testfalse\@thisfancyput}} - \def\@thisfancyput{\@ifnextchar({\@@thisfancyput}{\@@thisfancyput(\z@,\z@)}} -@@ -530,9 +612,6 @@ - - \def\Landscape{\@ifstar{\@testtrue\@Landscape}{\@testfalse\@Landscape}} - \def\@Landscape#1#2#3{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \clearpage - \def\fb@rotatepage{#3}% - \def\@outputpage{\fb@outputpage}% -@@ -564,9 +643,6 @@ - \def\fb@@rotatepage{} - - \def\LandScape#1{% --% DG/SR modification begin - May 16, 1997 -- \@begindvi % Need today by LaTeX 2e --% DG/SR modification end - \clearpage - \def\fb@@rotatepage{#1}% - \def\@outputpage{\fb@outputpage}% ---- tex/latex/misc/isolatin1.sty -+++ tex/latex/misc/isolatin1.sty Tue Feb 22 17:00:43 2000 -@@ -1,37 +1,40 @@ --% 1-Jun-1992 -+% 30-Mar-1995 - % --% File bases on iso1ibm.tex Version 1.0 of May, 9 1990 --\message{ISO-latin-1 input coding, version 0.9 of 1-Jun-1992.} -+% File bases on iso1ibm.tex Version 1.0pf of Mar, 30 1995 -+\message{ISO-latin-1 input coding, version 1.0pf of 30-Mar-1995.} - % - % For input of 8 bits character. - % This allows reading ISO-8859 Latin-1 codes. - % -+\def\registered{{{\ooalign{\hfil\raise.07ex\hbox{{\tiny\sf R}}% -+\hfil\crcr\mathhexbox20D}}}} -+% - \chardef \atcode = \the \catcode `\@ - \catcode `\@ = 11 - % --\catcode160=13 \def^^a0{{\bf?}} % 160 '240, "a0 --\catcode161=13 \def^^a1{!`} % 161 '241, "a1 --\catcode162=13 \def^^a2{{\bf?}} % 162 '242, "a2 --\catcode163=13 \def^^a3{\pounds{}} % 163 '243, "a3 --\catcode164=13 \def^^a4{{\bf?}} % 164 '244, "a4 --\catcode165=13 \def^^a5{{\bf?}} % 165 '245, "a5 --\catcode166=13 \def^^a6{$\vert$} % 166 '246, "a6 --\catcode167=13 \def^^a7{\S{}} % 167 '247, "a7 \S{} ISO-1, --\catcode168=13 \def^^a8{\"{ }} % 168 '250, "a8 -+\catcode160=13 \def^^a0{{\bf?}} % 160, '240, "a0 -+\catcode161=13 \def^^a1{!`} % 161, '241, "a1 -+\catcode162=13 \def^^a2{{\bf?}} % 162, '242, "a2 -+\catcode163=13 \def^^a3{\pounds{}} % 163, '243, "a3 -+\catcode164=13 \def^^a4{{\bf?}} % 164, '244, "a4 -+\catcode165=13 \def^^a5{{\bf?}} % 165, '245, "a5 -+\catcode166=13 \def^^a6{$\vert$} % 166, '246, "a6 -+\catcode167=13 \def^^a7{\S{}} % 167, '247, "a7 \S{} ISO-1, -+\catcode168=13 \def^^a8{\"{ }} % 168, '250, "a8 - \catcode169=13 \def^^a9{\copyright{}}% 169, '251, "a9 --\catcode170=13 \def^^aa{{\bf?}} % 170 '252, "aa --\catcode171=13 % 171 '253, "ab, -+\catcode170=13 \def^^aa{{\bf?}} % 170, '252, "aa -+\catcode171=13 % 171, '253, "ab, - \@ifundefined{lguill}{\def^^ab{$<<$}}{\def^^ab{\lguill}} --\catcode172=13 \def^^ac{{\bf?}} % 172 '254, "ac --\catcode173=13 \def^^ad{{\bf?}} % 173 '255 "ad --\catcode174=13 \def^^ae{{\bf?}} % 174 '256, "ae -+\catcode172=13 \def^^ac{{\bf?}} % 172, '254, "ac -+\catcode173=13 \def^^ad{{\bf?}} % 173, '255 "ad -+\catcode174=13 \def^^ae{\registered{}} % 174, '256, "ae registered trademark - \catcode175=13 \def^^af{{\bf?}} % 175 '257, "af --\catcode176=13 \def^^b0{{\bf?}} % 176 '260, "b0 ?? \No --\catcode177=13 \def^^b1{$\pm$} % 177 '261, "b1 ISO-1 plus-minus -+\catcode176=13 \def^^b0{${}^{\rm o}$} % 176, '260, "b0 degrees -+\catcode177=13 \def^^b1{$\pm$} % 177, '261, "b1 ISO-1 plus-minus - \catcode178=13 \def^^b2{${}^2$} % 178, '262, "b2 - \catcode179=13 \def^^b3{${}^3$} % 179, '263, "b3 - \catcode180=13 \def^^b4{\'{ }} % 180, '264, "b4 --\catcode181=13 \def^^b5{{\bf?}} % 181, '265, "b5 -+\catcode181=13 \def^^b5{$\mu$} % 181, '265, "b5 - \catcode182=13 \def^^b6{\P{}} % 182, '266, "b6 - \catcode183=13 \def^^b7{$\cdot$} % 183, '267, "b7 - \catcode184=13 \def^^b8{\c{ }} % 184, '270, "b8 ---- tex/latex/misc/picins.sty -+++ tex/latex/misc/picins.sty Tue Feb 22 17:00:43 2000 -@@ -576,4 +576,6 @@ - \put(\c@xoff,\c@yoff){\box\env@box}% - \end{picture}% - } -- -\ No newline at end of file -+\endinput -+%% -+%% End of file `picins.sty'. ---- tex/latex/seminar/semhelv.sty -+++ tex/latex/seminar/semhelv.sty Tue Feb 22 17:00:43 2000 -@@ -99,11 +99,11 @@ - \def\helv@scale{.82} - - \DeclareFontFamily{T1}{helvetica}{}% --\DeclareFontShape{T1}{helvetica}{m}{n}{<->s*[\helv@scale]phvr7t}{}% --\DeclareFontShape{T1}{helvetica}{m}{it}{<->s*[\helv@scale]phvro7t}{}% --\DeclareFontShape{T1}{helvetica}{m}{sc}{<->s*[\helv@scale]phvrc7t}{}% --\DeclareFontShape{T1}{helvetica}{b}{n}{<->s*[\helv@scale]phvb7t}{}% --\DeclareFontShape{T1}{helvetica}{b}{it}{<->s*[\helv@scale]phvbo7t}{}% -+\DeclareFontShape{T1}{helvetica}{m}{n}{<->s*[\helv@scale]phvr8t}{}% -+\DeclareFontShape{T1}{helvetica}{m}{it}{<->s*[\helv@scale]phvro8t}{}% -+\DeclareFontShape{T1}{helvetica}{m}{sc}{<->s*[\helv@scale]phvrc8t}{}% -+\DeclareFontShape{T1}{helvetica}{b}{n}{<->s*[\helv@scale]phvb8t}{}% -+\DeclareFontShape{T1}{helvetica}{b}{it}{<->s*[\helv@scale]phvbo8t}{}% - \DeclareFontShape{T1}{helvetica}{m}{sl}{<->ssub * helvetica/m/it}{}% - \DeclareFontShape{T1}{helvetica}{b}{sc}{<->sub * helvetica/m/sc}{}% - \DeclareFontShape{T1}{helvetica}{b}{sl}{<->ssub * helvetica/b/it}{}% -@@ -133,11 +133,11 @@ - % DG/SR modification end - - \DeclareFontFamily{T1}{courier}{\hyphenchar \font\m@ne}% --\DeclareFontShape{T1}{courier}{m}{n}{<->s*[\courier@scale]pcrr7t}{}% --\DeclareFontShape{T1}{courier}{m}{it}{<->s*[\courier@scale]pcrro7t}{}% --\DeclareFontShape{T1}{courier}{m}{sc}{<->s*[\courier@scale]pcrrc7t}{}% --\DeclareFontShape{T1}{courier}{b}{n}{<->s*[\courier@scale]pcrb7t}{}% --\DeclareFontShape{T1}{courier}{b}{it}{<->s*[\courier@scale]pcrbo7t}{}% -+\DeclareFontShape{T1}{courier}{m}{n}{<->s*[\courier@scale]pcrr8t}{}% -+\DeclareFontShape{T1}{courier}{m}{it}{<->s*[\courier@scale]pcrro8t}{}% -+\DeclareFontShape{T1}{courier}{m}{sc}{<->s*[\courier@scale]pcrrc8t}{}% -+\DeclareFontShape{T1}{courier}{b}{n}{<->s*[\courier@scale]pcrb8t}{}% -+\DeclareFontShape{T1}{courier}{b}{it}{<->s*[\courier@scale]pcrbo8t}{}% - \DeclareFontShape{T1}{courier}{m}{sl}{<->ssub * courier/m/it}{}% - \DeclareFontShape{T1}{courier}{b}{sc}{<->sub * courier/m/sc}{}% - \DeclareFontShape{T1}{courier}{b}{sl}{<->ssub * courier/b/it}{}% ---- tex/latex/tools/varioref.sty -+++ tex/latex/tools/varioref.sty Tue Feb 22 17:00:43 2000 -@@ -303,6 +303,17 @@ - \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}% - }} -+\DeclareOption{ngerman} -+ {\vref@addto\extrasgerman{% -+ \def\reftextfaceafter {auf der n\"achsten Seite}% -+ \def\reftextfacebefore{auf der vorherigen Seite}% -+ \let\reftextafter \reftextfaceafter -+ \let\reftextbefore \reftextfacebefore -+ \def\reftextcurrent {auf dieser Seite}% -+ \def\reftextfaraway#1{auf Seite~\pageref{#1}}% -+ \def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}% -+ \def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}% -+ }} - \DeclareOption{greek} - {\vref@addto\extrasgreek{% - \def\reftextfaceafter {sthn \reftextvario{paro'usa}% diff --git a/app-text/tetex/metadata.xml b/app-text/tetex/metadata.xml new file mode 100644 index 000000000000..37901dcd657b --- /dev/null +++ b/app-text/tetex/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> + <email>satai@gentoo.org</email> +</maintainer> +<maintainer> + <email>usata@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/app-text/tetex/tetex-1.0.7-r12.ebuild b/app-text/tetex/tetex-1.0.7-r12.ebuild index c353855169ed..4afd1b625072 100644 --- a/app-text/tetex/tetex-1.0.7-r12.ebuild +++ b/app-text/tetex/tetex-1.0.7-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r12.ebuild,v 1.12 2003/09/05 22:37:22 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r12.ebuild,v 1.13 2003/09/08 23:49:43 usata Exp $ inherit flag-o-matic filter-flags "-fstack-protector" @@ -26,7 +26,9 @@ DEPEND="sys-apps/ed ncurses? ( sys-libs/ncurses ) libwww? ( >=net-libs/libwww-5.3.2-r1 ) zlib? ( sys-libs/zlib )" -RDEPEND=">=dev-lang/perl-5.2 +RDEPEND="${DEPEND} + !virtual/tetex + >=dev-lang/perl-5.2 dev-util/dialog" PROVIDE="virtual/tetex" @@ -34,7 +36,7 @@ src_unpack() { unpack teTeX-src-${PV}.tar.gz cd ${S} - patch -p1 < ${FILESDIR}/${PF}-gentoo.diff + patch -p1 < ${FILESDIR}/${P}-dvips-secure.diff mkdir ${S}/texmf cd ${S}/texmf diff --git a/app-text/tetex/tetex-1.0.7-r13.ebuild b/app-text/tetex/tetex-1.0.7-r13.ebuild index afeb1175fb18..326c6f904573 100644 --- a/app-text/tetex/tetex-1.0.7-r13.ebuild +++ b/app-text/tetex/tetex-1.0.7-r13.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.2 2003/09/07 07:01:20 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.3 2003/09/08 23:49:43 usata Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils filter-flags "-fstack-protector" TEXMFSRC="teTeX-texmf-gg-1.0.3.tar.bz2" @@ -26,7 +26,9 @@ DEPEND="sys-apps/ed sys-libs/ncurses >=net-libs/libwww-5.3.2-r1 sys-libs/zlib" -RDEPEND="$DEPEND >=dev-lang/perl-5.2 +RDEPEND="${DEPEND} + !virtual/tetex + >=dev-lang/perl-5.2 dev-util/dialog" PROVIDE="virtual/tetex" @@ -34,7 +36,7 @@ src_unpack() { unpack teTeX-src-${PV}.tar.gz cd ${S} - patch -p1 < ${FILESDIR}/${PF}-gentoo.diff + epatch ${FILESDIR}/${P}-dvips-secure.diff mkdir ${S}/texmf cd ${S}/texmf @@ -49,15 +51,15 @@ src_unpack() { # Fixes from way back ... not sure even Achim will # still know why :/ cd ${WORKDIR} - patch -p0 < ${FILESDIR}/teTeX-1.0-gentoo.diff || die + epatch ${FILESDIR}/teTeX-1.0-gentoo.diff cd ${S} - patch -p0 < ${FILESDIR}/teTeX-1.0.dif || die + epatch ${FILESDIR}/teTeX-1.0.dif # Do not run config stuff - patch -p1 < ${FILESDIR}/${P}-dont-run-config.diff || die + epatch ${FILESDIR}/${P}-dont-run-config.diff # Fix for dvips to print directly. - patch -p1 < ${FILESDIR}/teTeX-1.0-dvips.diff || die + epatch ${FILESDIR}/teTeX-1.0-dvips.diff # Fix problem where the *.fmt files are not generated due to the LaTeX # source being older than a year. @@ -72,7 +74,6 @@ src_unpack() { # IMPORTANT! If you're having *.fmt problems, do this: # fmtutil --all # after the merge. - } src_compile() { @@ -102,7 +103,7 @@ src_compile() { ${myconf} || die "econf failed" # emake seems to not work (18 Jan 2003 agriffis) - make + make || die } src_install() { diff --git a/app-text/tetex/tetex-2.0.2-r1.ebuild b/app-text/tetex/tetex-2.0.2-r1.ebuild index 2f19d0678fc7..d2f50c17e4e1 100644 --- a/app-text/tetex/tetex-2.0.2-r1.ebuild +++ b/app-text/tetex/tetex-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.2 2003/09/07 07:01:20 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.3 2003/09/08 23:49:43 usata Exp $ inherit eutils flag-o-matic filter-flags "-fstack-protector" @@ -27,8 +27,11 @@ DEPEND="sys-apps/ed >=media-libs/libpng-1.2.1 sys-libs/ncurses >=net-libs/libwww-5.3.2-r1" -RDEPEND="$DEPEND >=dev-lang/perl-5.2 dev-util/dialog" -PROVIDE="virtual/tetex-2.0.2" +RDEPEND="${DEPEND} + !virtual/tetex + >=dev-lang/perl-5.2 + dev-util/dialog" +PROVIDE="virtual/tetex" src_unpack() { unpack ${TETEXSRC} diff --git a/app-text/tetex/tetex-2.0.2.ebuild b/app-text/tetex/tetex-2.0.2.ebuild index 93fbfe46fa93..036bd4dbfdd7 100644 --- a/app-text/tetex/tetex-2.0.2.ebuild +++ b/app-text/tetex/tetex-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2.ebuild,v 1.8 2003/09/05 22:37:22 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2.ebuild,v 1.9 2003/09/08 23:49:43 usata Exp $ inherit eutils flag-o-matic filter-flags "-fstack-protector" @@ -27,9 +27,11 @@ DEPEND="sys-apps/ed png? ( >=media-libs/libpng-1.2.1 ) ncurses? ( sys-libs/ncurses ) libwww? ( >=net-libs/libwww-5.3.2-r1 )" -RDEPEND=">=dev-lang/perl-5.2 +RDEPEND="${DEPEND} + !virtual/tetex + >=dev-lang/perl-5.2 dev-util/dialog" -PROVIDE="virtual/tetex-2.0.2" +PROVIDE="virtual/tetex" src_unpack() { unpack ${TETEXSRC} |